diff options
19 files changed, 151 insertions, 126 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index b9e789b6c86..0be0d1c0412 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,27 @@ +Sat Feb 21 19:53:18 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * ciao/ComponentServer/CIAO_Container_Impl.cpp: + * ciao/Containers/Session/Session_Container.cpp: + Small improvements to debug statements and nil usage + + * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl + * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl + * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl + * DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl + * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl + * examples/BasicSP/descriptors/run_test.pl + * examples/Display/descriptors/basicNodeDaemon.pl + * examples/Display/descriptors/run_NodeDaemons.pl + * examples/Display/descriptors/run_test_without_ns.pl + * examples/Hello/descriptors/DeploymentPlan.cdp + * examples/Hello/descriptors/run_NodeDaemons.pl + * examples/Hello/descriptors/run_test.pl + * examples/Hello/descriptors/run_test_without_ns.pl + * examples/Hello/descriptors_RTCCM/rt_run_test.pl + * examples/Null_Component/descriptors/run_test.pl + * tests/Bug_2130_Regression/descriptors/run_test.pl + Use DANCE_ROOT and dance_node_manager + Fri Feb 20 14:49:18 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ccm/CCM.mpc diff --git a/CIAO/DAnCE/TargetManager/descriptors/run_test_TargetManager.pl b/CIAO/DAnCE/TargetManager/descriptors/run_test_TargetManager.pl index 760a67d063b..4ea42376b98 100644 --- a/CIAO/DAnCE/TargetManager/descriptors/run_test_TargetManager.pl +++ b/CIAO/DAnCE/TargetManager/descriptors/run_test_TargetManager.pl @@ -8,7 +8,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{'ACE_ROOT'}/bin"; use PerlACE::Run_Test; $CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; -$DAnCE = "$ENV{'CIAO_ROOT'}/DAnCE"; +$DAnCE = "$ENV{'DANCE_ROOT'}"; $daemons_running = 0; $em_running = 0; @@ -58,7 +58,7 @@ sub run_node_daemons { $iiop = "iiop://localhost:$port"; $node_app = "$CIAO_ROOT/bin/NodeApplication"; - $d_cmd = "$CIAO_ROOT/bin/NodeManager"; + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile"; $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param); diff --git a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl index b738049952b..1d579a34e8e 100755 --- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl +++ b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl @@ -10,7 +10,7 @@ use PerlACE::Run_Test; $CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; $TAO_ROOT = "$ENV{'TAO_ROOT'}"; -$DAnCE = "$ENV{'CIAO_ROOT'}/DAnCE"; +$DAnCE = "$ENV{'DANCE_ROOT'}"; $daemons_running = 0; $em_running = 0; $ns_running = 0; @@ -104,12 +104,12 @@ if ($#ARGV == -1) foreach $file (@files) { print "Starting test for deployment $file\n"; delete_ior_files (); - + print STDERR "Starting Naming Service\n"; - + $NS = new PerlACE::Process ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 0 -ORBEndpoint iiop://localhost:60003 -o ns.ior"); $NS->Spawn (); - + if (PerlACE::waitforfile_timed ($nsior, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; @@ -120,8 +120,8 @@ foreach $file (@files) { # Set up NamingService environment $ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; - - + + # Invoke node daemons. print "Invoking node daemons\n"; $status = run_node_daemons (); @@ -131,15 +131,15 @@ foreach $file (@files) { kill_open_processes (); exit 1; } - + $daemons_running = 1; - + # Invoke execution manager. print "Invoking execution manager\n"; $EM = new PerlACE::Process ("$DAnCE/bin/dance_execution_manager", "-eEM.ior --domain-nc corbaloc:rir:/NameService"); $EM->Spawn (); - + if (PerlACE::waitforfile_timed ("EM.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR @@ -147,16 +147,16 @@ foreach $file (@files) { kill_open_processes (); exit 1; } - + $em_running = 1; - + # Invoke executor - start the application -. print "Invoking executor - start the application -\n"; $E = new PerlACE::Process ("simple_em_launcher", "file://EM.ior $file"); - + $status = $E->SpawnWaitKill (5000); - + if ($status != 0) { print "ERROR: simple_em_launcher returned an error code while deploying $file\n"; diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl index 27b9f7987e8..a2477861b7e 100755 --- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl +++ b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl @@ -10,7 +10,7 @@ use PerlACE::Run_Test; $CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; $TAO_ROOT = "$ENV{'TAO_ROOT'}"; -$DAnCE = "$ENV{'CIAO_ROOT'}/DAnCE"; +$DAnCE = "$ENV{'DANCE_ROOT'}"; $daemons_running = 0; $daemons = 1; @ports = ( 60001 ); @@ -82,11 +82,11 @@ foreach $file (@files) { delete_ior_files (); print "Running test for plan $file\n"; - + # Invoke node daemons. 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 (); @@ -94,19 +94,19 @@ foreach $file (@files) { } $daemons_running = 1; - + # Invoke executor - start the application -. print "Launching the plan. file://NodeApp1.ior \n"; $E = new PerlACE::Process ("simple_nm_launcher", "file://NodeApp1.ior $file"); $status = $E->SpawnWaitKill (5000); - + if ($status != 0) { print "ERROR: simple_nm_launcher returned error status $status\n"; } - + print "Test for plan $file succeeded\n"; kill_open_processes (); } diff --git a/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl b/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl index 1fb23e511a0..b5eea32ca38 100755 --- a/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl +++ b/CIAO/DAnCE/tests/scripts/BasicSP/basicNodeDaemon.pl @@ -34,23 +34,23 @@ unlink $iorfile5; $CIAO_ROOT=$ENV{'CIAO_ROOT'}; -$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", +$SV1 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager", "-ORBEndpoint iiop://localhost:10000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); -$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", +$SV2 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager", "-ORBEndpoint iiop://localhost:20000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); -$SV3 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", +$SV3 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager", "-ORBEndpoint iiop://localhost:30000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); -$SV4 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", +$SV4 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager", "-ORBEndpoint iiop://localhost:40000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); -$SV5 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", +$SV5 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager", "-ORBEndpoint iiop://localhost:50000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); $SV1->Spawn (); diff --git a/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp b/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp index 9614d290841..c60ee28c610 100644 --- a/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp +++ b/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp @@ -68,16 +68,16 @@ namespace CIAO const ::Components::ConfigValues & config) { CIAO_TRACE("CIAO_Container_i::install_component"); - + if (id == 0) { CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_Container_i::install_component - " "No home ID provided\n")); throw ::Components::Deployment::InvalidConfiguration (); } - + Components::CCMObject_var comp; - + if (this->component_map_.find (id, comp) == 0) { CIAO_ERROR ((LM_ERROR, CLINFO "CIAO_Container_i::install_component - " @@ -174,8 +174,8 @@ namespace CIAO "CIAO_Container_i::install_component - " "Unable to bind componnet into component map\n")); } - - + + return comp._retn (); } @@ -242,8 +242,7 @@ namespace CIAO } CIAO_DEBUG ((LM_INFO, CLINFO "CIAO_Container_i::install_home - " - "Attempting to install home with id [%C]\n", - id)); + "Attempting to install home with id [%C]\n", id)); CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_Container_i::install_home - " @@ -254,7 +253,7 @@ namespace CIAO CIAO::Utility::build_config_values_map (cm, config); CORBA::Any val; - const char *tmp; + const char *tmp = 0; CORBA::String_var exec_art, svnt_art, svnt_entry; if (cm.find (SVNT_ENTRYPT, val) == 0) { @@ -379,7 +378,7 @@ namespace CIAO { CIAO_TRACE("CIAO_Container_i::get_homes"); - ::Components::CCMHomes * tmp_homes; + ::Components::CCMHomes *tmp_homes = 0; ACE_NEW_THROW_EX (tmp_homes, ::Components::CCMHomes (this->home_map_.current_size ()), @@ -410,7 +409,6 @@ namespace CIAO "Attempting to remove container that still has %u homes and %u components installed\n", this->home_map_.current_size (), this->component_map_.current_size ())); - } //this->container_->_remove_ref (); diff --git a/CIAO/ciao/Containers/Session/Session_Container.cpp b/CIAO/ciao/Containers/Session/Session_Container.cpp index bdbf9ea0c5e..94d2fa899b5 100644 --- a/CIAO/ciao/Containers/Session/Session_Container.cpp +++ b/CIAO/ciao/Containers/Session/Session_Container.cpp @@ -189,7 +189,7 @@ namespace CIAO { CIAO_TRACE ("Session_Container::install_servant"); - PortableServer::POA_ptr tmp = 0; + PortableServer::POA_ptr tmp = PortableServer::POA::_nil(); if (t == Container_Types::COMPONENT_t || t == Container_Types::HOME_t) @@ -242,7 +242,7 @@ namespace CIAO servant_artifact, servant_entrypoint)); ACE_DLL executor_dll; - ACE_DLL servant_dll; + ACE_DLL servant_dll; if (primary_artifact == 0 || servant_artifact == 0) { @@ -259,8 +259,7 @@ namespace CIAO } CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container.cpp -" - "Session_Container::ciao_install_home -" + "Session_Container::install_home -" "ERROR: %C\n", exception.c_str ())); @@ -275,8 +274,7 @@ namespace CIAO error += primary_artifact; CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container.cpp -" - "Session_Container::ciao_install_home -" + "Session_Container::install_home -" "ERROR in opening the executor DLL [%C] \n", primary_artifact)); @@ -284,7 +282,8 @@ namespace CIAO } CIAO_DEBUG ((LM_TRACE, CLINFO - "Session_Container::install_home - Executor DLL successfully opened\n")); + "Session_Container::install_home - " + "Executor DLL successfully opened\n")); if (servant_dll.open (servant_artifact, ACE_DEFAULT_SHLIB_MODE, @@ -294,8 +293,7 @@ namespace CIAO error += servant_artifact; CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container.cpp -" - "Session_Container::ciao_install_home -" + "Session_Container::install_home -" "ERROR in opening the servant DLL [%C] \n", servant_artifact)); @@ -303,7 +301,8 @@ namespace CIAO } CIAO_DEBUG ((LM_TRACE, CLINFO - "Session_Container::install_home - Servant DLL successfully openend.\n")); + "Session_Container::install_home - " + "Servant DLL successfully openend.\n")); if (entry_point == 0 || servant_entrypoint == 0) { @@ -312,8 +311,7 @@ namespace CIAO if (entry_point == 0) { CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container.cpp -" - "Session_Container::ciao_install_home -" + "Session_Container::install_home -" "ERROR in opening the executor entry point " "for executor DLL [%C] \n", primary_artifact)); @@ -322,8 +320,7 @@ namespace CIAO else { CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container.cpp -" - "Session_Container::ciao_install_home -" + "Session_Container::install_home -" "ERROR in opening the servant entry point " "for servant DLL [%C] \n", servant_artifact)); @@ -347,7 +344,8 @@ namespace CIAO else { CIAO_DEBUG ((LM_DEBUG, CLINFO - "Session_Container::install_home - Loading statically linked home [%C]\n", + "Session_Container::install_home - " + "Loading statically linked home [%C]\n", name)); if (static_entrypts_maps_ == 0 @@ -365,8 +363,8 @@ namespace CIAO hcreator); ACE_CString servant_entrypoint_str (servant_entrypoint); - static_entrypts_maps_->home_servant_creator_funcptr_map_->find (servant_entrypoint_str, - screator); + static_entrypts_maps_->home_servant_creator_funcptr_map_->find ( + servant_entrypoint_str, screator); } if (hcreator == 0 || screator == 0) @@ -387,7 +385,7 @@ namespace CIAO } CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container::ciao_install_home - Error:%C\n", + "Session_Container::install_home - Error:%C\n", error.c_str ())); throw Components::Deployment::ImplEntryPointNotFound (); @@ -400,7 +398,8 @@ namespace CIAO if (CORBA::is_nil (home_executor.in ())) { CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container::ciao_install_hoe - Home executor factory failed. \n")); + "Session_Container::install_hoe - " + "Home executor factory failed. \n")); throw Components::Deployment::InstallationFailure (); } @@ -413,7 +412,8 @@ namespace CIAO if (home_servant == 0) { CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container::ciao_install_home - Home servant factory failed.\n")); + "Session_Container::install_home - " + "Home servant factory failed.\n")); throw Components::Deployment::InstallationFailure (); } @@ -480,8 +480,7 @@ namespace CIAO } CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container.cpp -" - "Session_Container::ciao_install_component -" + "Session_Container::install_component -" "ERROR: %C\n", exception.c_str ())); @@ -496,8 +495,7 @@ namespace CIAO error += primary_artifact; CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container.cpp -" - "Session_Container::ciao_install_component -" + "Session_Container::install_component -" "ERROR in opening the executor DLL [%C] \n", primary_artifact)); @@ -515,8 +513,7 @@ namespace CIAO error += servant_artifact; CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container.cpp -" - "Session_Container::ciao_install_component -" + "Session_Container::install_component -" "ERROR in opening the servant DLL [%C] \n", servant_artifact)); @@ -533,8 +530,7 @@ namespace CIAO if (entry_point == 0) { CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container.cpp -" - "Session_Container::ciao_install_component -" + "Session_Container::install_component -" "ERROR in opening the executor entry point " "for executor DLL [%C] \n", primary_artifact)); @@ -543,8 +539,7 @@ namespace CIAO else { CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container.cpp -" - "Session_Container::ciao_install_component -" + "Session_Container::install_component -" "ERROR in opening the servant entry point " "for servant DLL [%C] \n", servant_artifact)); @@ -569,7 +564,8 @@ namespace CIAO else { CIAO_DEBUG ((LM_DEBUG, CLINFO - "Session_Container::install_component - Loading statically linked component [%C]\n", + "Session_Container::install_component - " + "Loading statically linked component [%C]\n", name)); if (static_entrypts_maps_ == 0 @@ -577,7 +573,8 @@ namespace CIAO || static_entrypts_maps_->component_servant_creator_funcptr_map_ == 0) { CIAO_DEBUG ((LM_ERROR, CLINFO - "Session_Container::install_component - ERROR: Static entrypoint " + "Session_Container::install_component - " + "ERROR: Static entrypoint " "maps are null or imcomplete.\n")); throw Components::Deployment::ImplEntryPointNotFound (); } @@ -609,25 +606,28 @@ namespace CIAO } CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container::ciao_install_component - Error:%C\n", + "Session_Container::install_component - Error:%C\n", error.c_str ())); throw Components::Deployment::ImplEntryPointNotFound (); } CIAO_DEBUG ((LM_TRACE, CLINFO - "Session_Container::install_component - Loading component executor\n")); + "Session_Container::install_component - " + "Loading component executor\n")); Components::EnterpriseComponent_var component_executor = ccreator (); if (CORBA::is_nil (component_executor.in ())) { CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container::Ciao_install_hoe - Component executor factory failed. \n")); + "Session_Container::install_component - " + "Component executor factory failed. \n")); throw Components::Deployment::InstallationFailure (); } CIAO_DEBUG ((LM_TRACE, CLINFO - "Session_Container::install_component - Loading component servant\n")); + "Session_Container::install_component - " + "Loading component servant\n")); PortableServer::Servant component_servant = screator (component_executor.in (), this, name); @@ -635,14 +635,16 @@ namespace CIAO if (component_servant == 0) { CIAO_ERROR ((LM_ERROR, CLINFO - "Session_Container::ciao_install_component - Component servant factory failed.\n")); + "Session_Container::install_component - " + "Component servant factory failed.\n")); throw Components::Deployment::InstallationFailure (); } PortableServer::ServantBase_var safe (component_servant); CIAO_DEBUG ((LM_TRACE, CLINFO - "Session_Container::install_component - Installing component servant\n")); + "Session_Container::install_component - " + "Installing component servant\n")); PortableServer::ObjectId_var oid; @@ -653,7 +655,8 @@ namespace CIAO Components::CCMObject::_narrow (objref.in ()); CIAO_DEBUG ((LM_TRACE, CLINFO - "Session_Container::install_component - Component successfully created\n")); + "Session_Container::install_component - " + "Component successfully created\n")); return componentref._retn (); } @@ -798,7 +801,7 @@ namespace CIAO { CIAO_TRACE ("Session_Container::uninstall_servant"); - PortableServer::POA_ptr tmp = 0; + PortableServer::POA_ptr tmp = PortableServer::POA::_nil(); if ((t == Container_Types::COMPONENT_t) || (t == Container_Types::HOME_t)) @@ -872,7 +875,7 @@ namespace CIAO { CIAO_TRACE ("Session_Container::generate_reference"); - PortableServer::POA_ptr tmp = 0; + PortableServer::POA_ptr tmp = PortableServer::POA::_nil(); if (t == Container_Types::COMPONENT_t || t == Container_Types::HOME_t) diff --git a/CIAO/docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl b/CIAO/docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl index 695b1a602b6..1a3ba62f403 100644 --- a/CIAO/docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl +++ b/CIAO/docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl @@ -28,10 +28,10 @@ unlink $iorfile2; $CIAO_ROOT=$ENV{'CIAO_ROOT'}; -$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", +$SV1 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager", "-ORBEndpoint iiop://localhost:30000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication -d 1000"); -$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", +$SV2 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager", "-ORBEndpoint iiop://localhost:40000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication -d 1000"); $SV1->Spawn (); diff --git a/CIAO/examples/BasicSP/descriptors/run_test.pl b/CIAO/examples/BasicSP/descriptors/run_test.pl index 577f9d1432d..941e91d1ba3 100755 --- a/CIAO/examples/BasicSP/descriptors/run_test.pl +++ b/CIAO/examples/BasicSP/descriptors/run_test.pl @@ -10,7 +10,7 @@ use PerlACE::Run_Test; $CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; $TAO_ROOT = "$ENV{'TAO_ROOT'}"; -$DAnCE = "$ENV{'CIAO_ROOT'}/DAnCE"; +$DAnCE = "$ENV{'DANCE_ROOT'}"; $daemons_running = 0; $em_running = 0; $ns_running = 0; diff --git a/CIAO/examples/Display/descriptors/basicNodeDaemon.pl b/CIAO/examples/Display/descriptors/basicNodeDaemon.pl index 8a48fdd35dd..bd963c5d139 100755 --- a/CIAO/examples/Display/descriptors/basicNodeDaemon.pl +++ b/CIAO/examples/Display/descriptors/basicNodeDaemon.pl @@ -34,20 +34,20 @@ unlink $iorfile5; $CIAO_ROOT=$ENV{'CIAO_ROOT'}; -$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", +$SV1 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager", "-ORBEndpoint iiop://localhost:10000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); -$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", +$SV2 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager", "-ORBEndpoint iiop://localhost:20000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); -$SV3 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", +$SV3 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager", "-ORBEndpoint iiop://localhost:30000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); -$SV4 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", +$SV4 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager", "-ORBEndpoint iiop://localhost:40000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); - -$SV5 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", - "-ORBEndpoint iiop://localhost:50000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); + +$SV5 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager", + "-ORBEndpoint iiop://localhost:50000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); $SV1->Spawn (); $SV2->Spawn (); $SV3->Spawn (); diff --git a/CIAO/examples/Display/descriptors/run_NodeDaemons.pl b/CIAO/examples/Display/descriptors/run_NodeDaemons.pl index bc17b0972fd..3e01d7bc260 100755 --- a/CIAO/examples/Display/descriptors/run_NodeDaemons.pl +++ b/CIAO/examples/Display/descriptors/run_NodeDaemons.pl @@ -28,10 +28,10 @@ unlink $iorfile2; $CIAO_ROOT=$ENV{'CIAO_ROOT'}; -$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", +$SV1 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager", "-ORBEndpoint iiop://localhost:10001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); -$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", +$SV2 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager", "-ORBEndpoint iiop://localhost:20001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); $SV1->Spawn (); diff --git a/CIAO/examples/Display/descriptors/run_test_without_ns.pl b/CIAO/examples/Display/descriptors/run_test_without_ns.pl index f170e905fd3..bb090fceda1 100755 --- a/CIAO/examples/Display/descriptors/run_test_without_ns.pl +++ b/CIAO/examples/Display/descriptors/run_test_without_ns.pl @@ -61,7 +61,7 @@ sub run_node_daemons { $iiop = "iiop://localhost:$port"; $node_app = "$CIAO_ROOT/bin/NodeApplication"; - $d_cmd = "$CIAO_ROOT/bin/NodeManager"; + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile -d 30"; $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param); @@ -105,7 +105,7 @@ if (PerlACE::waitforfile_timed ("EM.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of execution manager could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } @@ -116,21 +116,21 @@ print "Invoking executor - start the application -\n"; $E = new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher", "-p flattened_deploymentplan.cdp -k file://EM.ior -o DAM.ior"); - + $E->SpawnWaitKill (5000); if (PerlACE::waitforfile_timed ( "GPS.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of GPS could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } if (PerlACE::waitforfile_timed ("RateGen.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of RateGen could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } diff --git a/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp b/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp index 8d22e0ea906..f61789b5558 100644 --- a/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp +++ b/CIAO/examples/Hello/descriptors/DeploymentPlan.cdp @@ -298,7 +298,7 @@ </value> </configProperty> </instance> - + <connection> <name>MessageConnection</name> <internalEndpoint> @@ -336,26 +336,26 @@ <name>Hello_Receiver_exec</name> <source/> <node/> - <location>Hello_Receiver_exec</location> + <location>../Receiver/Hello_Receiver_exec</location> </artifact> <artifact xmi:id="Hello_Receiver_SvntArtifact"> <name>Hello_Receiver_svnt</name> <source/> <node/> - <location>Hello_Receiver_svnt</location> + <location>../Receiver/Hello_Receiver_svnt</location> </artifact> <artifact xmi:id="Hello_Sender_ExecArtifact"> <name>Hello_Sender_exec</name> <source/> <node/> - <location>Hello_Sender_exec</location> + <location>../Sender/Hello_Sender_exec</location> </artifact> <artifact xmi:id="Hello_Sender_SvntArtifact"> <name>Hello_Sender_svnt</name> <source/> <node/> - <location>Hello_Sender_svnt</location> + <location>../Sender/Hello_Sender_svnt</location> </artifact> </Deployment:DeploymentPlan> diff --git a/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl b/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl index 5e9d3b95b46..e16b1c604c3 100644 --- a/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl +++ b/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl @@ -28,10 +28,10 @@ unlink $iorfile2; $CIAO_ROOT=$ENV{'CIAO_ROOT'}; -$SV1 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", +$SV1 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager", "-ORBEndpoint iiop://localhost:60001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication -d 1000"); -$SV2 = new PerlACE::Process ("$CIAO_ROOT/bin/NodeManager", +$SV2 = new PerlACE::Process ("$DANCE_ROOT/bin/dance_node_manager", "-ORBEndpoint iiop://localhost:60002 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication -d 1000"); $SV1->Spawn (); diff --git a/CIAO/examples/Hello/descriptors/run_test.pl b/CIAO/examples/Hello/descriptors/run_test.pl index 81811665eff..bb2aac25384 100755 --- a/CIAO/examples/Hello/descriptors/run_test.pl +++ b/CIAO/examples/Hello/descriptors/run_test.pl @@ -10,7 +10,7 @@ use PerlACE::Run_Test; $CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; $TAO_ROOT = "$ENV{'TAO_ROOT'}"; -$DAnCE = "$ENV{'CIAO_ROOT'}/DAnCE"; +$DAnCE = "$ENV{'DANCE_ROOT'}"; $daemons_running = 0; $em_running = 0; $ns_running = 0; diff --git a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl index 97fa00644b1..834ba2e87b1 100755 --- a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl +++ b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl @@ -8,7 +8,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' use lib "$ENV{'ACE_ROOT'}/bin"; use PerlACE::Run_Test; $CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; -$DAnCE = "$ENV{'CIAO_ROOT'}/DAnCE"; +$DAnCE = "$ENV{'DANCE_ROOT'}"; $daemons_running = 0; $em_running = 0; @@ -60,7 +60,7 @@ sub run_node_daemons { $iiop = "iiop://localhost:$port"; $node_app = "$CIAO_ROOT/bin/NodeApplication"; - $d_cmd = "$CIAO_ROOT/bin/NodeManager"; + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile -d 30"; $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param); diff --git a/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl b/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl index fa9c22c7345..114605639d5 100755 --- a/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl +++ b/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl @@ -60,7 +60,7 @@ sub run_node_daemons { $iiop = "iiop://localhost:$port"; $node_app = "$CIAO_ROOT/bin/NodeApplication"; - $d_cmd = "$CIAO_ROOT/bin/NodeManager"; + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; # NON-RT # $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile"; @@ -109,7 +109,7 @@ if (PerlACE::waitforfile_timed ("EM.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of execution manager could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } @@ -120,21 +120,21 @@ print "Invoking executor - start the application -\n"; $E = new PerlACE::Process ("$CIAO_ROOT/bin/plan_launcher", "-p rt-example.cdp -k file://EM.ior -o DAM.ior"); - + $E->SpawnWaitKill (5000); if (PerlACE::waitforfile_timed ( "Receiver.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of receiver could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } if (PerlACE::waitforfile_timed ("Sender.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of sender could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } diff --git a/CIAO/examples/Null_Component/descriptors/run_test.pl b/CIAO/examples/Null_Component/descriptors/run_test.pl index 76b37e5a3bf..4122f0c8304 100755 --- a/CIAO/examples/Null_Component/descriptors/run_test.pl +++ b/CIAO/examples/Null_Component/descriptors/run_test.pl @@ -10,7 +10,7 @@ use PerlACE::Run_Test; $CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; $TAO_ROOT = "$ENV{'TAO_ROOT'}"; -$DAnCE = "$ENV{'CIAO_ROOT'}/DAnCE"; +$DAnCE = "$ENV{'DANCE_ROOT'}"; $daemons_running = 0; $em_running = 0; $ns_running = 0; @@ -101,12 +101,12 @@ if ($#ARGV == -1) foreach $file (@files) { print "Starting test for deployment $file\n"; delete_ior_files (); - + print STDERR "Starting Naming Service\n"; - + $NS = new PerlACE::Process ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 0 -ORBEndpoint iiop://localhost:60003 -o ns.ior"); $NS->Spawn (); - + if (PerlACE::waitforfile_timed ($nsior, $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: cannot find naming service IOR file\n"; @@ -117,8 +117,8 @@ foreach $file (@files) { # Set up NamingService environment $ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; - - + + # Invoke node daemons. print "Invoking node daemons\n"; $status = run_node_daemons (); @@ -128,15 +128,15 @@ foreach $file (@files) { kill_open_processes (); exit 1; } - + $daemons_running = 1; - + # Invoke execution manager. print "Invoking execution manager\n"; $EM = new PerlACE::Process ("$DAnCE/bin/dance_execution_manager", "-eEM.ior --domain-nc corbaloc:rir:/NameService"); $EM->Spawn (); - + if (PerlACE::waitforfile_timed ("EM.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR @@ -144,7 +144,7 @@ foreach $file (@files) { kill_open_processes (); exit 1; } - + $em_running = 1; # Invoke executor - start the application -. @@ -152,22 +152,22 @@ foreach $file (@files) { $E = new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher", "-x $file -k file://EM.ior"); - + $E->SpawnWaitKill (5000); - + if ($status != 0) { print "ERROR: dance_plan_launcher returned an error code while deploying $file\n"; $retval = -1; } - + # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; $E = new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher", "-k file://EM.ior -x $file -q"); $E->SpawnWaitKill (3000); - + print "Executor returned.\n"; delete_ior_files (); diff --git a/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl b/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl index 733c3d7183c..70f32a78a9a 100644 --- a/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl +++ b/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl @@ -60,7 +60,7 @@ sub run_node_daemons { $iiop = "iiop://localhost:$port"; $node_app = "$CIAO_ROOT/bin/NodeApplication"; - $d_cmd = "$CIAO_ROOT/bin/NodeManager"; + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile -a \"-r\""; $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param); @@ -107,7 +107,7 @@ if (PerlACE::waitforfile_timed ("EM.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of execution manager could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } @@ -125,7 +125,7 @@ $E->SpawnWaitKill (5000); if (PerlACE::waitforfile_timed ("TSEC_CheckPoint.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of sender could not be found\n"; - kill_open_processes (); + kill_open_processes (); exit 1; } |