From ec7ccf7c9c7bea43821ede2b615b0b63385d2964 Mon Sep 17 00:00:00 2001 From: bala Date: Thu, 16 Sep 2004 16:05:33 +0000 Subject: ChangeLogTag:Thu Sep 16 11:03:47 2004 Balachandran Natarajan --- TAO/ChangeLog | 23 +++++++++++++++++++++++ TAO/orbsvcs/tests/Miop/McastHello/README | 4 ++-- TAO/orbsvcs/tests/Miop/McastHello/client.conf | 2 -- TAO/orbsvcs/tests/Miop/McastHello/client.cpp | 2 +- TAO/orbsvcs/tests/Miop/McastHello/run_test.pl | 9 +++------ TAO/orbsvcs/tests/Miop/McastHello/server.conf | 4 ---- TAO/orbsvcs/tests/Miop/McastHello/svc.conf | 4 ++++ 7 files changed, 33 insertions(+), 15 deletions(-) delete mode 100644 TAO/orbsvcs/tests/Miop/McastHello/client.conf delete mode 100644 TAO/orbsvcs/tests/Miop/McastHello/server.conf create mode 100644 TAO/orbsvcs/tests/Miop/McastHello/svc.conf diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9f69df84f57..3814099645a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,26 @@ +Thu Sep 16 11:03:47 2004 Balachandran Natarajan + + * orbsvcs/tests/Miop/McastHello/README: + + Upadted it again. + + * orbsvcs/tests/Miop/McastHello/client.conf: + * orbsvcs/tests/Miop/McastHello/server.conf: + + Removed them from the repo. We don't need two. + + * orbsvcs/tests/Miop/McastHello/client.cpp: + + Added MIOP.h + + * orbsvcs/tests/Miop/McastHello/run_test.pl: + + Removed references to the two conf files. + + * orbsvcs/tests/Miop/McastHello/svc.conf: + + Checked in a single svc.conf file. + Thu Sep 16 10:09:20 2004 Jeff Parsons * TAO_IDL/util/utl_scope.cpp (lookup_by_name_local): diff --git a/TAO/orbsvcs/tests/Miop/McastHello/README b/TAO/orbsvcs/tests/Miop/McastHello/README index 405dcc094cd..2b7205b555d 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/README +++ b/TAO/orbsvcs/tests/Miop/McastHello/README @@ -17,7 +17,7 @@ $ ./run_test.pl The test has some unique features that should be noted by users. Firstly, server.cpp includes MIOP.h, which has some magic for -loading MIOP protocol in static builds. Secondly, the server.conf has +loading MIOP protocol in static builds. Secondly, the svc.conf has a directive for loading the right protocol factory. Both of them are required for static builds in addition to linking with the TAO_PortableGroup library. @@ -28,7 +28,7 @@ However for dynamic builds things are different in the TAO_PortableGroup library . The entries in the svc.conf should have dynamic directives. In - server.conf you would be required to remove commented parts and run + svc.conf you would be required to remove commented parts and run the test. */ diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.conf b/TAO/orbsvcs/tests/Miop/McastHello/client.conf deleted file mode 100644 index 75accdd4d58..00000000000 --- a/TAO/orbsvcs/tests/Miop/McastHello/client.conf +++ /dev/null @@ -1,2 +0,0 @@ -dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() "" -static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory" diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp index c0fa7328e6a..10180538dbf 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp @@ -2,8 +2,8 @@ #include "TestC.h" #include "ace/Get_Opt.h" - #include "tao/Object_T.h" +#include "orbsvcs/PortableGroup/MIOP.h" ACE_RCSID(Hello, client, "$Id$") diff --git a/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl b/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl index ef87c284d2d..316cf14a560 100755 --- a/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl +++ b/TAO/orbsvcs/tests/Miop/McastHello/run_test.pl @@ -14,12 +14,9 @@ unlink $iorfile; unlink $iorfile_server2; $status = 0; -$server_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext"); -$client_conf = PerlACE::LocalFile ("client$PerlACE::svcconf_ext"); - -$SV1 = new PerlACE::Process ("server", "-o $iorfile -ORBsvcconf $server_conf"); -$SV2 = new PerlACE::Process ("server", "-o $iorfile_server2 -ORBsvcconf $server_conf"); -$CL = new PerlACE::Process ("client", " -k file://$iorfile -ORBsvcconf $client_conf"); +$SV1 = new PerlACE::Process ("server", "-o $iorfile"); +$SV2 = new PerlACE::Process ("server", "-o $iorfile_server2 "); +$CL = new PerlACE::Process ("client", " -k file://$iorfile "); $SV1->Spawn (); $SV2->Spawn (); diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.conf b/TAO/orbsvcs/tests/Miop/McastHello/server.conf deleted file mode 100644 index d509909846c..00000000000 --- a/TAO/orbsvcs/tests/Miop/McastHello/server.conf +++ /dev/null @@ -1,4 +0,0 @@ -#dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() "" -static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory" -#static PortableGroup_Loader "" -#dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() "" diff --git a/TAO/orbsvcs/tests/Miop/McastHello/svc.conf b/TAO/orbsvcs/tests/Miop/McastHello/svc.conf new file mode 100644 index 00000000000..d509909846c --- /dev/null +++ b/TAO/orbsvcs/tests/Miop/McastHello/svc.conf @@ -0,0 +1,4 @@ +#dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() "" +static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory" +#static PortableGroup_Loader "" +#dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() "" -- cgit v1.2.1