Fri Dec 9 10:17:37 UTC 2011 Marcel Smit <msmit@remedy.nl>

        * bin/ciao_tests.lst:
        * examples/Null_Component_Glfa:
        * examples/Null_Component_Glfa/Null_Component.idl:
        * examples/Null_Component_Glfa/Null_Component.mpc:
        * examples/Null_Component_Glfa/Null_Interface.idl:
        * examples/Null_Component_Glfa/Null_Interface.mpc:
        * examples/Null_Component_Glfa/descriptors:
        * examples/Null_Component_Glfa/descriptors/NodeMap.dat:
        * examples/Null_Component_Glfa/descriptors/Null_Homed.cdp:
        * examples/Null_Component_Glfa/descriptors/Null_Unhomed.cdp:
        * examples/Null_Component_Glfa/descriptors/run_test.pl:
          Removed this test. No need to test this anymore.

10 files changed, 15 insertions, 666 deletions

diff --git a/CIAO/ChangeLog.BRANCH b/CIAO/ChangeLog.BRANCH
index 33f4d7b87a8..8d0c0972e5a 100644
--- a/CIAO/ChangeLog.BRANCH
+++ b/CIAO/ChangeLog.BRANCH
@@ -1,3 +1,18 @@
+Fri Dec  9 10:17:37 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * bin/ciao_tests.lst:
+        * examples/Null_Component_Glfa:
+        * examples/Null_Component_Glfa/Null_Component.idl:
+        * examples/Null_Component_Glfa/Null_Component.mpc:
+        * examples/Null_Component_Glfa/Null_Interface.idl:
+        * examples/Null_Component_Glfa/Null_Interface.mpc:
+        * examples/Null_Component_Glfa/descriptors:
+        * examples/Null_Component_Glfa/descriptors/NodeMap.dat:
+        * examples/Null_Component_Glfa/descriptors/Null_Homed.cdp:
+        * examples/Null_Component_Glfa/descriptors/Null_Unhomed.cdp:
+        * examples/Null_Component_Glfa/descriptors/run_test.pl:
+          Removed this test. No need to test this anymore.
+
 Fri Dec  9 10:15:44 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
 
diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst
index d0ec5d72cbd..606775dcd2c 100644
--- a/CIAO/bin/ciao_tests.lst
+++ b/CIAO/bin/ciao_tests.lst
@@ -14,7 +14,6 @@ TAO/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl: !STATI
 TAO/CIAO/examples/BasicSP/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !CCM_NOEVENT
 TAO/CIAO/examples/Null_Component/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE
 TAO/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE
-TAO/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE
 TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !CCM_NOEVENT
 TAO/CIAO/examples/Display/descriptors/run_all_in_one.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !CCM_NOEVENT
 TAO/CIAO/tutorials/Quoter/Simple/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !CCM_NOEVENT
diff --git a/CIAO/examples/Null_Component_Glfa/Null_Component.idl b/CIAO/examples/Null_Component_Glfa/Null_Component.idl
deleted file mode 100644
index ffe48e9e91a..00000000000
--- a/CIAO/examples/Null_Component_Glfa/Null_Component.idl
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @file Null_Component.idl
- *
- * @author Abdul Sowayan <sowayan@gmail.com>
- *
- * $Id$
- */
-
-#ifndef NULL_COMPONENT_IDL
-#define NULL_COMPONENT_IDL
-
-#include <Components.idl>
-#include "Null_Interface.idl"
-
-/**
- * @class Null_Component
- *
- * This component is intentionally left blank. Its purpose
- * is to measure the footprint of a component in CIAO.
- */
-component Null_Component
-{
-  provides Null_Interface null_facet;
-};
-
-/**
- * @class Null_Component_Home
- *
- * @brief home for Null_Component
- */
-home Null_ComponentHome manages Null_Component
-{
-};
-
-#endif /* NULL_COMPONENT_IDL */
-
diff --git a/CIAO/examples/Null_Component_Glfa/Null_Component.mpc b/CIAO/examples/Null_Component_Glfa/Null_Component.mpc
deleted file mode 100644
index fea7a7dab9c..00000000000
--- a/CIAO/examples/Null_Component_Glfa/Null_Component.mpc
+++ /dev/null
@@ -1,112 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p Null_Interface Null_Component"
-
-project(Null_Component_Glfa_idl_gen) : componentidldefaults {
-  custom_only = 1
-  idlflags += -Glfa
-  idlflags += -Wb,stub_export_macro=NULL_COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Null_Component_stub_export.h \
-              -Wb,skel_export_macro=NULL_COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Null_Component_svnt_export.h \
-              -Wb,exec_export_macro=NULL_COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Null_Component_exec_export.h \
-              -Wb,svnt_export_macro=NULL_COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Null_Component_svnt_export.h \
-              -Gex
-
-  IDL_Files {
-    Null_Component.idl
-  }
-}
-
-project(Null_Component_Glfa_lem_gen) : ciaoidldefaults {
-  custom_only = 1
-  after += Null_Component_Glfa_idl_gen
-  idlflags += -Wb,export_macro=NULL_COMPONENT_EXEC_Export \
-              -Wb,export_include=Null_Component_exec_export.h \
-              -SS
-
-  IDL_Files {
-    Null_ComponentE.idl
-  }
-}
-
-project(Null_Component_Glfa_stub) : ccm_stub {
-  after += Null_Component_Glfa_idl_gen Null_Interface_Glfa_stub
-  libs  += Null_Interface_stub
-
-  sharedname = Null_Component_stub
-  dynamicflags += NULL_COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Null_ComponentC.cpp
-  }
-
-  Header_Files {
-    Null_ComponentC.h
-    Null_Component_stub_export.h
-  }
-
-  Inline_Files {
-    Null_ComponentC.inl
-  }
-}
-
-project(Null_Component_Glfa_exec) : ciao_executor {
-  after   += Null_Component_Glfa_lem_gen Null_Component_Glfa_stub
-  sharedname = Null_Component_exec
-  libs += Null_Component_stub Null_Interface_stub
-
-  dynamicflags += NULL_COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Null_ComponentEC.cpp
-    Null_Component_exec.cpp
-  }
-
-  Header_Files {
-    Null_ComponentEC.h
-    Null_Component_exec.h
-    Null_Component_exec_export.h
-  }
-
-  Inline_Files {
-    Null_ComponentEC.inl
-  }
-}
-
-project(Null_Component_Glfa_svnt) : ciao_servant {
-  after      += Null_Interface_Glfa_skel Null_Component_Glfa_exec
-  sharedname  = Null_Component_svnt
-  libs       += Null_Component_exec \
-                Null_Component_stub \
-                Null_Interface_skel \
-                Null_Interface_stub
-
-  dynamicflags += NULL_COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Null_ComponentS.cpp
-    Null_Component_svnt.cpp
-  }
-
-  Header_Files {
-    Null_ComponentS.h
-    Null_Component_svnt.h
-    Null_Component_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/examples/Null_Component_Glfa/Null_Interface.idl b/CIAO/examples/Null_Component_Glfa/Null_Interface.idl
deleted file mode 100644
index 1d1ae6f27c2..00000000000
--- a/CIAO/examples/Null_Component_Glfa/Null_Interface.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file Null_Interface.idl
- *
- * @author Abdul Sowayan <sowayan@gmail.com>
- *
- * $Id$
- */
-
-#ifndef NULL_INTERFACE_IDL
-#define NULL_INTERFACE_IDL
-
-/**
- * @interface Null_Interface
- *
- * @brief
- */
-interface Null_Interface
-{
-  void null_operation();
-};
-
-#endif /* NULL_INTERFACE_IDL */
-
diff --git a/CIAO/examples/Null_Component_Glfa/Null_Interface.mpc b/CIAO/examples/Null_Component_Glfa/Null_Interface.mpc
deleted file mode 100644
index 62e02a70b65..00000000000
--- a/CIAO/examples/Null_Component_Glfa/Null_Interface.mpc
+++ /dev/null
@@ -1,67 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -n Null_Interface"
-
-project(Null_Interface_Glfa_idl_gen) : componentidldefaults {
-  custom_only = 1
-  idlflags -= -Glem -Gxhex
-
-  idlflags += -Wb,stub_export_macro=NULL_INTERFACE_STUB_Export \
-              -Wb,stub_export_include=Null_Interface_stub_export.h \
-              -Wb,skel_export_macro=NULL_INTERFACE_SKEL_Export \
-              -Wb,skel_export_include=Null_Interface_skel_export.h
-
-  IDL_Files {
-    Null_Interface.idl
-  }
-}
-
-project(Null_Interface_Glfa_stub) : ccm_stub {
-  after += Null_Interface_Glfa_idl_gen
-  libs  +=
-
-  sharedname = Null_Interface_stub
-  dynamicflags += NULL_INTERFACE_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Null_InterfaceC.cpp
-  }
-
-  Header_Files {
-    Null_InterfaceC.h
-    Null_Interface_stub_export.h
-  }
-
-  Inline_Files {
-    Null_InterfaceC.inl
-  }
-}
-
-
-project(Null_Interface_Glfa_skel) : ciao_executor {
-  after      += Null_Interface_Glfa_stub
-  sharedname  = Null_Interface_skel
-  libs       += Null_Interface_stub
-
-
-  dynamicflags += NULL_INTERFACE_SKEL_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Null_InterfaceS.cpp
-  }
-
-  Header_Files {
-    Null_InterfaceS.h
-    Null_Interface_skel_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
diff --git a/CIAO/examples/Null_Component_Glfa/descriptors/NodeMap.dat b/CIAO/examples/Null_Component_Glfa/descriptors/NodeMap.dat
deleted file mode 100644
index c9e08ab3058..00000000000
--- a/CIAO/examples/Null_Component_Glfa/descriptors/NodeMap.dat
+++ /dev/null
@@ -1 +0,0 @@
-NodeOne corbaloc:iiop:localhost:10000/NodeOne.NodeManager
diff --git a/CIAO/examples/Null_Component_Glfa/descriptors/Null_Homed.cdp b/CIAO/examples/Null_Component_Glfa/descriptors/Null_Homed.cdp
deleted file mode 100644
index 95ebe2fb54e..00000000000
--- a/CIAO/examples/Null_Component_Glfa/descriptors/Null_Homed.cdp
+++ /dev/null
@@ -1,121 +0,0 @@
-<!-- $Id$ -->
-<Deployment:DeploymentPlan
-  xmlns:Deployment="http://www.omg.org/Deployment"
-  xmlns:xmi="http://www.omg.org/XMI"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Null_Homed</label>
-  <UUID>Null_Homed</UUID>
-<implementation xmi:id="Null_ComponentHomeImplementation">
-  <name>Null_ComponentHomeImplementation</name>
-  <source/>
-  <artifact xmi:idref="Null_Component_ExecArtifact" />
-  <artifact xmi:idref="Null_Component_SvntArtifact" />
-  <execParameter>
-    <!-- entrypoint as exec parameter (see 10.6.1) -->
-    <name>home factory</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_Null_ComponentHome_Impl</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_Null_ComponentHome_Servant</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Null_Component_svnt</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Null_Component_exec</string>
-      </value>
-    </value>
-  </execParameter>
-</implementation>
-<implementation xmi:id="Null_ComponentComponentImplementation">
-  <name>Null_ComponentComponentImplementation</name>
-  <source/>
-  <artifact xmi:idref="Null_Component_ExecArtifact" />
-  <artifact xmi:idref="Null_Component_SvntArtifact" />
-  <artifact xmi:idref="Null_Component_StubArtifact" />
-    <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="Null_ComponentHomeInstance">
-  <name>Null_ComponentHome</name>
-  <node>NodeOne</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Null_ComponentHomeImplementation" />
-</instance>
-  <instance xmi:id="Null_ComponentComponentInstance">
-  <name>Null_ComponentComponent</name>
-  <node>NodeOne</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Null_ComponentComponentImplementation" />
-  <configProperty>
-    <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Null_ComponentHome</string>
-      </value>
-    </value>
-  </configProperty>
-</instance>
-  <artifact xmi:id="Null_Component_ExecArtifact">
-  <name>Null_Component_exec</name>
-  <source/>
-  <node/>
-  <location>Null_Component_exec</location>
-</artifact>
-<artifact xmi:id="Null_Component_SvntArtifact">
-  <name>Null_Component_svnt</name>
-  <source/>
-  <node/>
-  <location>Null_Component_svnt</location>
-</artifact>
-<artifact xmi:id="Null_Component_StubArtifact">
-  <name>Null_Component_stub</name>
-  <source/>
-  <node/>
-  <location>Null_Component_stub</location>
-</artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/examples/Null_Component_Glfa/descriptors/Null_Unhomed.cdp b/CIAO/examples/Null_Component_Glfa/descriptors/Null_Unhomed.cdp
deleted file mode 100644
index f14b91c6e85..00000000000
--- a/CIAO/examples/Null_Component_Glfa/descriptors/Null_Unhomed.cdp
+++ /dev/null
@@ -1,86 +0,0 @@
-<!-- $Id$ -->
-<Deployment:DeploymentPlan
-  xmlns:Deployment="http://www.omg.org/Deployment"
-  xmlns:xmi="http://www.omg.org/XMI"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>Null_Homed</label>
-  <UUID>Null_Homed</UUID>
-
-<implementation xmi:id="Null_ComponentComponentImplementation">
-  <name>Null_ComponentComponentImplementation</name>
-  <source/>
-  <artifact xmi:idref="Null_Component_ExecArtifact" />
-  <artifact xmi:idref="Null_Component_SvntArtifact" />
-  <execParameter>
-    <!-- entrypoint as exec parameter (see 10.6.1) -->
-    <name>component factory</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_Null_Component_Impl</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_Null_Component_Servant</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Null_Component_svnt</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Null_Component_exec</string>
-      </value>
-    </value>
-  </execParameter>
-</implementation>
-<instance xmi:id="Null_ComponentComponentInstance">
-  <name>Null_ComponentComponent</name>
-  <node>NodeOne</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Null_ComponentComponentImplementation" />
-</instance>
-  <artifact xmi:id="Null_Component_ExecArtifact">
-  <name>Null_Component_exec</name>
-  <source/>
-  <node/>
-  <location>Null_Component_exec</location>
-</artifact>
-<artifact xmi:id="Null_Component_SvntArtifact">
-  <name>Null_Component_svnt</name>
-  <source/>
-  <node/>
-  <location>Null_Component_svnt</location>
-</artifact>
-<artifact xmi:id="Null_Component_StubArtifact">
-  <name>Null_Component_stub</name>
-  <source/>
-  <node/>
-  <location>Null_Component_stub</location>
-</artifact>
-</Deployment:DeploymentPlan>
\ No newline at end of file
diff --git a/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl b/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl
deleted file mode 100755
index 377d4010c32..00000000000
--- a/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl
+++ /dev/null
@@ -1,219 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::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 = ( "NodeOne" );
-
-# 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 ('..');
-    #   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 ('..');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('..');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('..');
-}
-
-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;
-}
-
-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", "-m 0 -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 $file -k file://$ior_emfile\n";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-x $file -k file://$ior_emfile");
-    $E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ());
-
-    # Invoke executor - stop the application -.
-    print "Invoking executor - stop the application -\n";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                                      "-k file://$ior_emfile -x $file -s");
-    $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
-
-    print "Executor returned.\n";
-
-    delete_ior_files ();
-    kill_open_processes ();
-}
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;