Wed Nov 25 08:47:31 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * tests/Bug_2130_Regression/descriptors/run_test.pl:
        * examples/Null_Component/descriptors/run_test.pl:
        * examples/Hello/descriptors_RTCCM/rt_run_test.pl:
        * examples/Hello/descriptors/run_test_without_ns.pl:
        * examples/Hello/descriptors/run_test_alias.pl:
        * examples/Display/descriptors/run_test_without_ns.pl:
        * examples/BasicSP/descriptors/run_test.pl:
        * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl:
        * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl:
          Use more realistic timeouts, this will shorten the test runs
          a lot at the moment a test or example is broken

        * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp
        * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h
        * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp
        * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h
        * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.h
        * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h
        * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.h
        * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.h
        * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.h
        * DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.h
        * DAnCE/tests/CIAO/Components/SimpleNull_exec.h
        * DAnCE/tests/CIAO/Components/SimpleProvider_exec.h
        * DAnCE/tests/CIAO/Components/SimplePublisher_exec.h
        * DAnCE/tests/CIAO/Components/SimpleUser_exec.h
          Removed generated headers from these files

24 files changed, 59 insertions, 282 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 966b9aa01c7..928f1c90114 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,33 @@
+Wed Nov 25 08:47:31 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2130_Regression/descriptors/run_test.pl:
+        * examples/Null_Component/descriptors/run_test.pl:
+        * examples/Hello/descriptors_RTCCM/rt_run_test.pl:
+        * examples/Hello/descriptors/run_test_without_ns.pl:
+        * examples/Hello/descriptors/run_test_alias.pl:
+        * examples/Display/descriptors/run_test_without_ns.pl:
+        * examples/BasicSP/descriptors/run_test.pl:
+        * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl:
+        * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl:
+          Use more realistic timeouts, this will shorten the test runs
+          a lot at the moment a test or example is broken
+
+        * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp
+        * docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h
+        * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp
+        * docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h
+        * DAnCE/tests/CIAO/Components/SimpleAttribute_exec.h
+        * DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h
+        * DAnCE/tests/CIAO/Components/SimpleEmitter_exec.h
+        * DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.h
+        * DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.h
+        * DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.h
+        * DAnCE/tests/CIAO/Components/SimpleNull_exec.h
+        * DAnCE/tests/CIAO/Components/SimpleProvider_exec.h
+        * DAnCE/tests/CIAO/Components/SimplePublisher_exec.h
+        * DAnCE/tests/CIAO/Components/SimpleUser_exec.h
+          Removed generated headers from these files
+
 Wed Nov 25 08:31:31 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * examples/Hello/Receiver/Receiver_exec.cpp
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.h b/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.h
index 3a7b3eff867..72a7805247f 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.h
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute_exec.h
@@ -1,22 +1,4 @@
 // $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
 
 #ifndef CIAO_SIMPLEATTRIBUTE_EXEC_H
 #define CIAO_SIMPLEATTRIBUTE_EXEC_H
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h b/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h
index fa2e39d384a..2069c87dbbb 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer_exec.h
@@ -1,22 +1,4 @@
 // $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
 
 #ifndef CIAO_SIMPLECONSUMER_EXEC_H
 #define CIAO_SIMPLECONSUMER_EXEC_H
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_exec.h b/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_exec.h
index 32bf579f4c7..0501bfb6977 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_exec.h
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter_exec.h
@@ -1,22 +1,4 @@
 // $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
 
 #ifndef CIAO_SIMPLEEMITTER_EXEC_H
 #define CIAO_SIMPLEEMITTER_EXEC_H
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.h b/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.h
index 9313dd2c074..3b61eba9571 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.h
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser_exec.h
@@ -1,22 +1,4 @@
 // $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
 
 #ifndef CIAO_SIMPLEMULTIPLEUSER_EXEC_H
 #define CIAO_SIMPLEMULTIPLEUSER_EXEC_H
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.h b/CIAO/DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.h
index 3feb16a04cf..8e2525029d2 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.h
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleNilFacetProvider_exec.h
@@ -1,22 +1,4 @@
 // $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
 
 #ifndef CIAO_SIMPLENILFACETPROVIDER_EXEC_H
 #define CIAO_SIMPLENILFACETPROVIDER_EXEC_H
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.h b/CIAO/DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.h
index 87381a6de5f..897acf3ba99 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.h
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleNilFacetUser_exec.h
@@ -1,22 +1,4 @@
 // $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
 
 #ifndef CIAO_SIMPLENILFACETUSER_EXEC_H
 #define CIAO_SIMPLENILFACETUSER_EXEC_H
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_exec.h b/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_exec.h
index 057981b9711..5f0cce9bfbb 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_exec.h
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleNull_exec.h
@@ -1,22 +1,4 @@
 // $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
 
 #ifndef CIAO_SIMPLENULL_EXEC_H
 #define CIAO_SIMPLENULL_EXEC_H
@@ -65,10 +47,10 @@ namespace CIAO_Simple_SimpleNull_Impl
     private:
     ::Simple::CCM_SimpleNull_Context_var context_;
   };
-  
+
   extern "C" SIMPLENULL_EXEC_Export ::Components::EnterpriseComponent_ptr
   create_Simple_SimpleNull_Impl (void);
-  
+
   class SIMPLENULL_EXEC_Export SimpleNullHome_exec_i
     : public virtual SimpleNullHome_Exec,
       public virtual ::CORBA::LocalObject
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.h b/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.h
index 183d94a8ab8..a0dda3db076 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.h
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider_exec.h
@@ -1,22 +1,4 @@
 // $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
 
 #ifndef CIAO_SIMPLEPROVIDER_EXEC_H
 #define CIAO_SIMPLEPROVIDER_EXEC_H
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.h b/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.h
index a0b187014ee..0f5ab965757 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.h
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher_exec.h
@@ -1,22 +1,4 @@
 // $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
 
 #ifndef CIAO_SIMPLEPUBLISHER_EXEC_H
 #define CIAO_SIMPLEPUBLISHER_EXEC_H
diff --git a/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec.h b/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec.h
index 0e5627cca4f..7041ae92ba4 100644
--- a/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec.h
+++ b/CIAO/DAnCE/tests/CIAO/Components/SimpleUser_exec.h
@@ -1,22 +1,4 @@
 // $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
 
 #ifndef CIAO_SIMPLEUSER_EXEC_H
 #define CIAO_SIMPLEUSER_EXEC_H
diff --git a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl
index 3c6d113f39a..0fcb1625f32 100755
--- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl
+++ b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl
@@ -156,7 +156,7 @@ foreach $file (@files) {
     $E = new PerlACE::Process ("simple_em_launcher",
                                "file://EM.ior $file");
 
-    $status = $E->SpawnWaitKill (5000);
+    $status = $E->SpawnWaitKill (60);
 
     if ($status != 0)
     {
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl
index 7035cec2bcf..250f021fd8c 100755
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl
+++ b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl
@@ -102,7 +102,7 @@ foreach $file (@files) {
     $E = new PerlACE::Process ("simple_nm_launcher",
                                "file://NodeApp1.ior $file");
 
-    $status = $E->SpawnWaitKill (5000);
+    $status = $E->SpawnWaitKill (60);
 
     if ($status != 0)
     {
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp b/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp
index f884a78e45c..bfba5b8888b 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp
+++ b/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.cpp
@@ -1,22 +1,4 @@
 // $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
 
 #include "StockBroker_exec.h"
 
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h b/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h
index 2ff9e2a03e3..679bb2c3f58 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h
+++ b/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker_exec.h
@@ -1,22 +1,4 @@
 // $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
 
 #ifndef CIAO_STOCKBROKER_EXEC_H
 #define CIAO_STOCKBROKER_EXEC_H
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp b/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp
index 07c212155f3..8f9c05f6cb3 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp
+++ b/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.cpp
@@ -1,22 +1,4 @@
 // $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
 
 #include "StockDistributor_exec.h"
 #include "ace/Reactor.h"
diff --git a/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h b/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h
index de159bca4eb..aaf500cdf34 100644
--- a/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h
+++ b/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h
@@ -1,22 +1,4 @@
 // $Id$
-//
-// ****              Code generated by the                 ****
-// ****  Component Integrated ACE ORB (CIAO) CIDL Compiler ****
-// CIAO has been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// CIDL Compiler has been developed by:
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about CIAO is available at:
-//    http://www.dre.vanderbilt.edu/CIAO
 
 #ifndef CIAO_STOCKDISTRIBUTOR_EXEC_H
 #define CIAO_STOCKDISTRIBUTOR_EXEC_H
diff --git a/CIAO/examples/BasicSP/descriptors/run_test.pl b/CIAO/examples/BasicSP/descriptors/run_test.pl
index 1e2c88135e1..c1a56e2f7b2 100755
--- a/CIAO/examples/BasicSP/descriptors/run_test.pl
+++ b/CIAO/examples/BasicSP/descriptors/run_test.pl
@@ -157,7 +157,7 @@ $E =
   new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher",
                         "-x $cdp_file -k file://EM.ior");
 
-$E->SpawnWaitKill (5000);
+$E->SpawnWaitKill (60);
 
 if (PerlACE::waitforfile_timed (
       "rategen.ior",
@@ -169,7 +169,7 @@ if (PerlACE::waitforfile_timed (
 
 print "Invoking the controller\n";
 $controller = new PerlACE::Process ("$controller_exec", "-o");
-$result = $controller->SpawnWaitKill (3000);
+$result = $controller->SpawnWaitKill (60);
 
 if ($result != 0) {
     print STDERR "ERROR: The controller returned $result\n";
@@ -182,7 +182,7 @@ print "Invoking executor - stop the application -\n";
 $E =
   new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher",
                         "-k file://EM.ior -x $cdp_file -q");
-$E->SpawnWaitKill (3000);
+$E->SpawnWaitKill (60);
 
 print "Executor returned.\n";
 print "Shutting down rest of the processes.\n";
diff --git a/CIAO/examples/Display/descriptors/run_test_without_ns.pl b/CIAO/examples/Display/descriptors/run_test_without_ns.pl
index bb090fceda1..a1cfb2d984b 100755
--- a/CIAO/examples/Display/descriptors/run_test_without_ns.pl
+++ b/CIAO/examples/Display/descriptors/run_test_without_ns.pl
@@ -117,7 +117,7 @@ $E =
   new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-p flattened_deploymentplan.cdp -k file://EM.ior -o DAM.ior");
 
-$E->SpawnWaitKill (5000);
+$E->SpawnWaitKill (60);
 
 if (PerlACE::waitforfile_timed (
       "GPS.ior",
@@ -136,7 +136,7 @@ if (PerlACE::waitforfile_timed ("RateGen.ior",
 
 print "Invoking the controller\n";
 $controller = new PerlACE::Process ("$controller_exec", "-k file://RateGen.ior");
-$result = $controller->SpawnWaitKill (3000);
+$result = $controller->SpawnWaitKill (60);
 if ($result != 0) {
     print STDERR "ERROR: The controller returned $result\n";
     $status = 1;
@@ -148,7 +148,7 @@ sleep (20);
 # invoking the controller again to stop the rategen
 print "Invoking the controller to stop RateGen\n";
 $controller = new PerlACE::Process ("$controller_exec", "-k file://RateGen.ior -f");
-$result = $controller->SpawnWaitKill (3000);
+$result = $controller->SpawnWaitKill (60);
 if ($result != 0) {
     print STDERR "ERROR: The controller returned $result\n";
     $status = 1;
@@ -162,7 +162,7 @@ print "Invoking executor - stop the application -\n";
 $E =
   new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-k file://EM.ior -i file://DAM.ior");
-$E->SpawnWaitKill (3000);
+$E->SpawnWaitKill (60);
 
 print "Executor returned.\n";
 print "Shutting down rest of the processes.\n";
diff --git a/CIAO/examples/Hello/descriptors/run_test_alias.pl b/CIAO/examples/Hello/descriptors/run_test_alias.pl
index 4d53ae417d4..bb0f23c8555 100755
--- a/CIAO/examples/Hello/descriptors/run_test_alias.pl
+++ b/CIAO/examples/Hello/descriptors/run_test_alias.pl
@@ -153,7 +153,7 @@ $E =
   new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher",
                         "-x DeploymentPlan.cdp -k file://EM.ior");
 
-$E->SpawnWaitKill (5000);
+$E->SpawnWaitKill (60);
 
 if (PerlACE::waitforfile_timed (
       "Receiver.ior",
@@ -172,7 +172,7 @@ if (PerlACE::waitforfile_timed ("Sender.ior",
 
 print "Invoking the controller\n";
 $controller = new PerlACE::Process ("$controller_exec", "-k file://Sender.ior");
-$result = $controller->SpawnWaitKill (3000);
+$result = $controller->SpawnWaitKill (60);
 
 if ($result != 0) {
     print STDERR "ERROR: The controller returned $result\n";
@@ -184,7 +184,7 @@ print "Invoking executor - stop the application -\n";
 $E =
   new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher",
                         "-k file://EM.ior -x DeploymentPlan.cdp -q");
-$E->SpawnWaitKill (3000);
+$E->SpawnWaitKill (60);
 
 print "Executor returned.\n";
 print "Shutting down rest of the processes.\n";
diff --git a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
index f973c3837dc..04e3fc18d52 100755
--- a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
+++ b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
@@ -86,8 +86,7 @@ sub run_node_daemons {
       $result = $Daemons[$i]->Spawn ();
       push(@processes, $Daemons[$i]);
 
-      if (PerlACE::waitforfile_timed ($iorfile,
-                                      30) == -1) {
+      if (PerlACE::waitforfile_timed ($iorfile, 30) == -1) {
           print STDERR
             "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
           for (; $i >= 0; --$i) {
@@ -99,7 +98,7 @@ sub run_node_daemons {
   return 0;
 }
 
-delete_ior_files ();  
+delete_ior_files ();
 
 # Invoke node daemons.
 print "Invoking node daemons\n";
@@ -137,7 +136,7 @@ $E =
   new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher",
                         "-x DeploymentPlan_without_ns.cdp -k file://EM.ior");
 
-$E->SpawnWaitKill (5000);
+$E->SpawnWaitKill (30);
 
 if (PerlACE::waitforfile_timed (
       "Receiver.ior",
@@ -156,7 +155,7 @@ if (PerlACE::waitforfile_timed ("Sender.ior",
 
 print "Invoking the controller ($controller_exec -k file://Sender.ior)\n";
 $controller = new PerlACE::Process ("$controller_exec", "-k file://Sender.ior");
-$result = $controller->SpawnWaitKill (3000);
+$result = $controller->SpawnWaitKill (120);
 
 if ($result != 0) {
     print STDERR "ERROR: The controller returned $result\n";
@@ -170,7 +169,7 @@ print "by running dance_plan_launcher.exe with -k file://EM.ior -x DeploymentPla
 $E =
   new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher",
                         "-k file://EM.ior -x DeploymentPlan.cdp -q");
-$E->SpawnWaitKill (3000);
+$E->SpawnWaitKill (30);
 
 print "Executor returned.\n";
 print "Shutting down rest of the processes.\n";
diff --git a/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl b/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
index ee8ec147df6..5a77db2b14f 100755
--- a/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
+++ b/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
@@ -123,7 +123,7 @@ $E =
   new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-p rt-example.cdp -k file://EM.ior -o DAM.ior");
 
-$E->SpawnWaitKill (5000);
+$E->SpawnWaitKill (60);
 
 if (PerlACE::waitforfile_timed (
       "Receiver.ior",
@@ -142,7 +142,7 @@ if (PerlACE::waitforfile_timed ("Sender.ior",
 
 print "Invoking the controller\n";
 $controller = new PerlACE::Process ("$controller_exec", "-k file://Sender.ior");
-$result = $controller->SpawnWaitKill (3000);
+$result = $controller->SpawnWaitKill (60);
 
 if ($result != 0) {
     print STDERR "ERROR: The controller returned $result\n";
@@ -154,7 +154,7 @@ print "Invoking executor - stop the application -\n";
 $E =
   new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-k file://EM.ior -i file://DAM.ior");
-$E->SpawnWaitKill (3000);
+$E->SpawnWaitKill (60);
 
 print "Executor returned.\n";
 print "Shutting down rest of the processes.\n";
diff --git a/CIAO/examples/Null_Component/descriptors/run_test.pl b/CIAO/examples/Null_Component/descriptors/run_test.pl
index fa318011c5e..01834d83718 100755
--- a/CIAO/examples/Null_Component/descriptors/run_test.pl
+++ b/CIAO/examples/Null_Component/descriptors/run_test.pl
@@ -155,7 +155,7 @@ foreach $file (@files) {
 	new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher",
 			      "-x $file -k file://EM.ior");
 
-    $E->SpawnWaitKill (5000);
+    $E->SpawnWaitKill (60);
 
     if ($status != 0)
     {
@@ -168,7 +168,7 @@ foreach $file (@files) {
     $E =
 	new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher",
 			      "-k file://EM.ior -x $file -q");
-    $E->SpawnWaitKill (3000);
+    $E->SpawnWaitKill (60);
 
     print "Executor returned.\n";
 
diff --git a/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl b/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl
index dccd19ae0d2..1907954a344 100755
--- a/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl
+++ b/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl
@@ -121,7 +121,7 @@ $E =
   new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-p DeploymentPlan.cdp -k file://EM.ior -o DAM.ior");
 
-$E->SpawnWaitKill (5000);
+$E->SpawnWaitKill (60);
 
 
 if (PerlACE::waitforfile_timed ("TSEC_CheckPoint.ior",
@@ -134,7 +134,7 @@ if (PerlACE::waitforfile_timed ("TSEC_CheckPoint.ior",
 print "Running testcase 1\n";
 
 $controller = new PerlACE::Process ("$controller_exec", "-i 1 -k file://TSEC_CheckPoint.ior -t 1 -l 100000");
-$result = $controller->SpawnWaitKill (3000);
+$result = $controller->SpawnWaitKill (60);
 
 if ($result != 0) {
     print STDERR "ERROR: The controller returned $result\n";
@@ -145,7 +145,7 @@ if ($result != 0) {
 print "Running testcase 2\n";
 
 $controller = new PerlACE::Process ("$controller_exec", "-i 2 -k file://TSEC_CheckPoint.ior -t 1 -l 100000");
-$result = $controller->SpawnWaitKill (3000);
+$result = $controller->SpawnWaitKill (60);
 
 if ($result != 0) {
     print STDERR "ERROR: The controller returned $result\n";
@@ -155,7 +155,7 @@ if ($result != 0) {
 print "Running testcase 3\n";
 
 $controller = new PerlACE::Process ("$controller_exec", "-k file://TSEC_CheckPoint.ior -t 2 -l 100000");
-$result = $controller->SpawnWaitKill (3000);
+$result = $controller->SpawnWaitKill (60);
 
 if ($result != 0) {
     print STDERR "ERROR: The controller returned $result\n";
@@ -168,7 +168,7 @@ print "Invoking executor - stop the application -\n";
 $E =
   new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher",
                         "-k file://EM.ior -i file://DAM.ior");
-$E->SpawnWaitKill (3000);
+$E->SpawnWaitKill (60);
 
 print "Executor returned.\n";
 print "Shutting down rest of the processes.\n";