diff options
| author | Steve Totten <tottens@users.noreply.github.com> | 2003-10-22 05:14:16 +0000 |
|---|---|---|
| committer | Steve Totten <tottens@users.noreply.github.com> | 2003-10-22 05:14:16 +0000 |
| commit | c8f786a991e3cfa8e527c7a0a85134ffd9e1c493 (patch) | |
| tree | 40cafe581b4a32a23a3acdc2e50ae237e0882698 | |
| parent | d419434398762b45b1753dd67e0e2789dcb9b3f6 (diff) | |
| download | ATCD-c8f786a991e3cfa8e527c7a0a85134ffd9e1c493.tar.gz | |
ChangeLogTag: Wed Oct 22 00:11:36 2003 Steve Totten <totten_s@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/FT_App/run_test_replication_mgr.pl | 11 |
2 files changed, 16 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5228df85a9f..c542a85598f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Wed Oct 22 00:11:36 2003 Steve Totten <totten_s@ociweb.com> + + * orbsvcs/tests/FT_App/run_test_replication_mgr.pl: + Modified command line of Replication Manager to use + -ORBEndpoint option and of clients of the Replication + Manager to use -ORBInitRef ReplicationManager=... + + These changes were made in the oci_haft branch. + Tue Oct 21 21:58:31 2003 Steve Totten <totten_s@ociweb.com> * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp: diff --git a/TAO/orbsvcs/tests/FT_App/run_test_replication_mgr.pl b/TAO/orbsvcs/tests/FT_App/run_test_replication_mgr.pl index 8d23d46c7f7..716808c9035 100755 --- a/TAO/orbsvcs/tests/FT_App/run_test_replication_mgr.pl +++ b/TAO/orbsvcs/tests/FT_App/run_test_replication_mgr.pl @@ -139,13 +139,16 @@ unlink $client_data; my($status) = 0; -my($REP1) = new PerlACE::Process (".$build_directory/ft_replica", "-o $factory1_ior -t $replica1_ior -l loc1 -i type1 -q -ORBInitRef ReplicationManager=file://$replmgr_ior"); -my($REP2) = new PerlACE::Process (".$build_directory/ft_replica", "-o $factory2_ior -t $replica2_ior -l loc2 -i type1 -q -ORBInitRef ReplicationManager=file://$replmgr_ior"); +# my($REP1) = new PerlACE::Process (".$build_directory/ft_replica", "-o $factory1_ior -t $replica1_ior -l loc1 -i type1 -q -ORBInitRef ReplicationManager=file://$replmgr_ior"); +# my($REP2) = new PerlACE::Process (".$build_directory/ft_replica", "-o $factory2_ior -t $replica2_ior -l loc2 -i type1 -q -ORBInitRef ReplicationManager=file://$replmgr_ior"); +my($REP1) = new PerlACE::Process (".$build_directory/ft_replica", "-o $factory1_ior -t $replica1_ior -l loc1 -i type1 -q -ORBInitRef ReplicationManager=corbaloc::localhost:2833/ReplicationManager"); +my($REP2) = new PerlACE::Process (".$build_directory/ft_replica", "-o $factory2_ior -t $replica2_ior -l loc2 -i type1 -q -ORBInitRef ReplicationManager=corbaloc::localhost:2833/ReplicationManager"); my($DET) = new PerlACE::Process ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Detector$build_directory/Fault_Detector", "-o $detector_ior -q"); my($NOT) = new PerlACE::Process ("$ENV{'TAO_ROOT'}/orbsvcs/Fault_Notifier$build_directory/Fault_Notifier", "-o $notifier_ior -v -q"); my($CONS) = new PerlACE::Process (".$build_directory/ft_fault_consumer", "-o $ready_file -n file://$notifier_ior -q -d file://$detector_ior -r file://$replica1_ior -r file://$replica2_ior"); -my($REPLM) = new PerlACE::Process ("$ENV{'TAO_ROOT'}/orbsvcs/FT_ReplicationManager$build_directory/FT_ReplicationManager", "-o $replmgr_ior -f file://$notifier_ior"); -my($REPLM_CTRL) = new PerlACE::Process (".$build_directory/replmgr_controller", "-k file://$replmgr_ior -x"); +my($REPLM) = new PerlACE::Process ("$ENV{'TAO_ROOT'}/orbsvcs/FT_ReplicationManager$build_directory/FT_ReplicationManager", "-o $replmgr_ior -f file://$notifier_ior -ORBEndpoint iiop://localhost:2833"); +# my($REPLM_CTRL) = new PerlACE::Process (".$build_directory/replmgr_controller", "-k file://$replmgr_ior -x"); +my($REPLM_CTRL) = new PerlACE::Process (".$build_directory/replmgr_controller", "-ORBInitRef ReplicationManager=corbaloc::localhost:2833/ReplicationManager -x"); my($CL); if (simulated) { |