diff options
Diffstat (limited to 'orbsvcs/tests/InterfaceRepo')
59 files changed, 190 insertions, 976 deletions
diff --git a/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am deleted file mode 100644 index 4aaef665047..00000000000 --- a/orbsvcs/tests/InterfaceRepo/Application_Test/Makefile.am +++ /dev/null @@ -1,118 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.IFR_Application_Test_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - ifr_dii_client.cpp \ - ifr_dii_client.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.IFR_Application_Test_Server.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp index e50a8aa33f6..c579d5e1fc3 100644 --- a/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp +++ b/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp @@ -3,10 +3,6 @@ #include "ifr_dii_client.h" -ACE_RCSID (Application_Test, - client, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp index 06b8431f84c..04f3971aef5 100644 --- a/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp +++ b/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp @@ -4,10 +4,6 @@ #include "ifr_dii_client.h" #include "ace/Get_Opt.h" -ACE_RCSID (Application_Test, - ifr_dii_client, - "$Id$") - IFR_DII_Client::IFR_DII_Client (void) : namespace_name (CORBA::string_dup ("warehouse")), interface_name (CORBA::string_dup ("inventory")), @@ -88,7 +84,7 @@ IFR_DII_Client::parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Get_Opt opts (argc, argv, ACE_TEXT("k:nd")); int c; - + while ((c = opts ()) != -1) switch (c) { @@ -325,7 +321,7 @@ IFR_DII_Client::invoke_and_display (void) ACE_ASSERT ((*args->item (2)->value () >>= price) == true); - ACE_ASSERT (price == 13.49f); + ACE_ASSERT (ACE::is_equal (price, 13.49f)); if (this->debug_) { diff --git a/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl index 883b60c38cc..59de7ee6a6c 100755 --- a/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl +++ b/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl @@ -57,7 +57,7 @@ my $client_ior2file = $client->LocalFile ($ior2file); $client->DeleteFile($ior1file); $client->DeleteFile($ior2file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service", +$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", "-o $server1_ior1file"); diff --git a/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp index 9407a53a1da..8470b696545 100644 --- a/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp +++ b/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp @@ -6,7 +6,7 @@ #include "orbsvcs/Shutdown_Utilities.h" #include "ace/Get_Opt.h" -ACE_RCSID(Application_Test, server, "$Id$") + static const ACE_TCHAR *ior_output_file = ACE_TEXT("iorfile"); diff --git a/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp b/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp index 08a803ea8d8..f8ba51d221b 100644 --- a/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp +++ b/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp @@ -5,12 +5,6 @@ #include "ace/SString.h" - -ACE_RCSID (Application_Test, - test_i, - "$Id$") - - CORBA::Boolean inventory_i::getCDinfo (const char * artist, char *& title, diff --git a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Makefile.am b/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Makefile.am deleted file mode 100644 index c997324070e..00000000000 --- a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_2962_Regression.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl b/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl index 89b8e9873c6..7183a29b2a1 100755 --- a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl +++ b/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl @@ -36,7 +36,7 @@ my $client_ior1file = $client->LocalFile ($ior1file); $client->DeleteFile($ior1file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service", +$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file"); diff --git a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl b/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl index d4637db8784..2704eabe9bf 100644 --- a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl +++ b/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/test.idl @@ -2,9 +2,10 @@ #ifndef __IFR_NESTING_ARRAY_TEST_DEFINED #define __IFR_NESTING_ARRAY_TEST_DEFINED +typedef short ShortArray_1[1]; struct MyStruct { - short innerArray[1]; // Must NOT be [2] to show up the problem. + ShortArray_1 innerArray; // Must NOT be [2] to show up the problem. }; typedef MyStruct arrayOfStruct[2]; // Must be arrayOfStruct[2] to pass client.cpp test diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Makefile.am b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Makefile.am deleted file mode 100644 index 73594351b9d..00000000000 --- a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_3155_Regression_Test_Idl.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = test_idl - -test_idl_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/include - -test_idl_SOURCES = \ - test_idl.cpp - -test_idl_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl index 964366267d1..904b0962e00 100755 --- a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl +++ b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl @@ -36,7 +36,7 @@ my $client_ior1file = $client->LocalFile ($ior1file); $client->DeleteFile($ior1file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service", +$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file"); diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl index 19207b58862..8230f0955fb 100644 --- a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl +++ b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl @@ -8,15 +8,15 @@ module C1 }; module M1 -{ +{ valuetype VT; // Forward declare }; module M1 -{ +{ valuetype VT : // Full definition ::C1::EB - { + { public long id; }; }; diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp index 851a4413e21..ed87bdd9215 100644 --- a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp +++ b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp @@ -49,7 +49,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) } } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Makefile.am b/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Makefile.am deleted file mode 100644 index 7939f5049c2..00000000000 --- a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Bug_3174_Regression_Test_Idl.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = test_idl - -test_idl_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -test_idl_SOURCES = \ - test_idl.cpp - -test_idl_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl b/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl index c5e6b022b7c..da59c80ef20 100755 --- a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl +++ b/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl @@ -36,7 +36,7 @@ my $client_ior1file = $client->LocalFile ($ior1file); $client->DeleteFile($ior1file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service", +$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file"); diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp b/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp index f53a114a07d..d6af0b90df0 100644 --- a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp +++ b/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp @@ -45,7 +45,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) } } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl b/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl index ba4780cedca..3775c2138e2 100755 --- a/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl +++ b/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl @@ -38,7 +38,7 @@ $client1->DeleteFile($ior1file); my $client2_ior1file = $client2->LocalFile ($ior1file); $client2->DeleteFile($ior1file); -$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service", +$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "$nice " . "-o $server_ior1file " . diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Makefile.am b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Makefile.am deleted file mode 100644 index 3ab4a032327..00000000000 --- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Makefile.am +++ /dev/null @@ -1,106 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.Bug_3495_Regression_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_3495_Regression_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch "$@" - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_3495_Regression_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestImpl.cpp \ - TestS.cpp \ - server.cpp \ - TestImpl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl index c0bf60dfe90..6e5d83ab0fc 100644 --- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl +++ b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl @@ -27,7 +27,7 @@ module Test { } thisonly; }; - exception exceptionOne + exception exceptionOne { union ExceptionUnion switch (ErrorType) { diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp index 4fd7f422bbd..4c7e5147a03 100644 --- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp +++ b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from +// TAO_IDL - Generated from // .\be\be_codegen.cpp:1179 #include "TestImpl.h" diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h index 4a4bc5670dd..e3e10eea60e 100644 --- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h +++ b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h @@ -17,12 +17,12 @@ class Test_interfaceOne_i : public virtual POA_Test::interfaceOne { public: - // Constructor + // Constructor Test_interfaceOne_i (void); - - // Destructor + + // Destructor virtual ~Test_interfaceOne_i (void); - + virtual void getstruct (::Test::structOne_out tester); }; diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp index 0585d1bc80c..a6763a1a819 100644 --- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp +++ b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/client.cpp @@ -7,7 +7,7 @@ #include "tao/IFR_Client/IFR_Client_Adapter_Impl.h" -ACE_RCSID(Hello, client, "$Id$") + const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); @@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) argv [0]), -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl index 5573c301189..8b9cf6f3503 100755 --- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl +++ b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/run_test.pl @@ -48,7 +48,7 @@ $client->DeleteFile($ior1file); $client->DeleteFile($ior2file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service", +$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file"); diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp index fb4470ea53f..42753283c2b 100644 --- a/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp +++ b/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/server.cpp @@ -34,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) argv [0]), -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl b/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl index d221f710a57..9416cb1dbb6 100755 --- a/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl +++ b/orbsvcs/tests/InterfaceRepo/Bug_3881_Regression/run_test.pl @@ -33,7 +33,7 @@ $server->DeleteFile($iorfile); my $client_iorfile = $client->LocalFile ($iorfile); $client->DeleteFile($iorfile); -$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service", +$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "$nice " . "-o $server_iorfile " . diff --git a/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl index ade44a59b4a..af326620b2d 100755 --- a/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl +++ b/orbsvcs/tests/InterfaceRepo/Duplicate_Typedef_Test/run_test.pl @@ -23,7 +23,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service", +$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", " $nice " . " -o $server_iorfile " . " $locking"); @@ -113,7 +113,7 @@ $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service", +$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", " $nice " . " -o $server_iorfile " . " $locking"); diff --git a/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am deleted file mode 100644 index 471b2f19e9a..00000000000 --- a/orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.IFR_IDL3_Test.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = IDL3_Test - -IDL3_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -IDL3_Test_SOURCES = \ - client.cpp \ - idl3_client.cpp \ - idl3_client.h - -IDL3_Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp index f43536c1139..a4e9f470c67 100644 --- a/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp +++ b/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp @@ -3,10 +3,6 @@ #include "idl3_client.h" -ACE_RCSID (Application_Test, - client, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp index 28de390cbe2..5bb899c36d5 100644 --- a/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp +++ b/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp @@ -6,10 +6,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Application_Test, - ifr_dii_client, - "$Id$") - // All the magic quantities are here at the top. const char *COMPONENT_ID = "IDL:mod/test_component:1.0"; diff --git a/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h b/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h index 16f3ebafd93..d11a20d1309 100644 --- a/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h +++ b/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h @@ -1,53 +1,52 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/orbsvcs/tests/InterfaceRepo -// -// = FILENAME -// idl3_client.h -// -// = DESCRIPTION -// This class tests the IFR support for CCM-related types. -// -// = AUTHOR -// Jeff Parsons <j.parsons@vanderbilt.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file idl3_client.h + * + * $Id$ + * + * This class tests the IFR support for CCM-related types. + * + * + * @author Jeff Parsons <j.parsons@vanderbilt.edu> + */ +//============================================================================= + #ifndef IDL3_CLIENT_H #define IDL3_CLIENT_H #include "tao/IFR_Client/IFR_ComponentsC.h" +/** + * @class IDL3_Client + * + * @brief Component-aware IFR Client Implementation + * + * Class wrapper for a client which tests the Interface Repository + * support for the OMG IDL3 extensions. + */ class IDL3_Client { - // = TITLE - // Component-aware IFR Client Implementation - // - // = DESCRIPTION - // Class wrapper for a client which tests the Interface Repository - // support for the OMG IDL3 extensions. public: + /// Constructor IDL3_Client (void); - // Constructor + /// Destructor ~IDL3_Client (void); - // Destructor + /// Initialize the ORB and get the IFR object reference. int init (int argc, ACE_TCHAR *argv[]); - // Initialize the ORB and get the IFR object reference. + /// Execute test code. int run (void); - // Execute test code. private: + /// Process the command line arguments. int parse_args (int argc, ACE_TCHAR *argv[]); - // Process the command line arguments. int component_test (void); int home_test (void); @@ -104,14 +103,14 @@ private: int home_finder_test (CORBA::ComponentIR::HomeDescription *); private: + /// Flag to output detailed error messages. bool debug_; - // Flag to output detailed error messages. + /// Storage of the ORB reference. CORBA::ORB_var orb_; - // Storage of the ORB reference. + /// Storage of the IFR reference. CORBA::Repository_var repo_; - // Storage of the IFR reference. }; #endif /* IDL3_CLIENT_H */ diff --git a/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl index 4f5376f4174..5a00c31e3dc 100755 --- a/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl +++ b/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl @@ -42,7 +42,7 @@ my $client_ior1file = $client->LocalFile ($ior1file); $client->DeleteFile($ior1file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service", +$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file"); diff --git a/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl index d03196aeee2..0e65910adfb 100755 --- a/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl +++ b/orbsvcs/tests/InterfaceRepo/IDL_Test/run_test.pl @@ -34,7 +34,7 @@ sub idl_filenames { # Input: array of idl file names # Output: array of idl file names that had a failure sub phase1 { - my $SVC = $ifr_service->CreateProcess ("../../../IFR_Service/IFR_Service", + my $SVC = $ifr_service->CreateProcess ("../../../IFR_Service/tao_ifr_service", "-o $ifr_service_iorfile"); my $CMP = $tao_ifr->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_ifr", diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am deleted file mode 100644 index 10fb0b1efaa..00000000000 --- a/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.IFR_Inheritance_Test.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = IFR_Inheritance_Test - -IFR_Inheritance_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -IFR_Inheritance_Test_SOURCES = \ - main.cpp - -IFR_Inheritance_Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp b/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp index 9709b6e5e76..261138e3244 100644 --- a/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp +++ b/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp @@ -6,10 +6,6 @@ #include "tao/IFR_Client/IFR_BasicC.h" #include "tao/ORB.h" -ACE_RCSID (IFR_Inheritance_Test, - main, - "$Id$") - void printContents (const CORBA::ContainedSeq& cont) { try diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl index 42b85861cf6..db72c527087 100755 --- a/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl +++ b/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl @@ -56,22 +56,22 @@ my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed my $iorbase = "if_repo.ior"; my $testoutputfilename = "IFR_Inheritance_test.output"; -my $log1 = "server1.log"; +my $log1 = "server1.log"; my $log2 = "server2.log"; my $log3 = "client.log"; my $log1_test = $test->LocalFile ($log1); -my $log2_test = $test->LocalFile ($log2); +my $log2_test = $test->LocalFile ($log2); my $log3_test = $test->LocalFile ($log3); $test->DeleteFile ($log1); -$test->DeleteFile ($log2); +$test->DeleteFile ($log2); $test->DeleteFile ($log3); my $test_iorfile = $test->LocalFile ($iorbase); $test->DeleteFile($iorbase); -$SV1 = $test->CreateProcess ("../../../IFR_Service/IFR_Service", +$SV1 = $test->CreateProcess ("../../../IFR_Service/tao_ifr_service", " -o $test_iorfile " . "-ORBLogFile $log1_test"); @@ -79,10 +79,10 @@ $SV2 = $test->CreateProcess ("$tao_ifr", " IFR_Inheritance_Test.idl " . "-ORBInitRef InterfaceRepository=file://$test_iorfile " . "-ORBLogFile $log2_test"); - + $CL = $test->CreateProcess ("IFR_Inheritance_Test", "-ORBInitRef InterfaceRepository=file://$test_iorfile " . - "-ORBLogFile $log3_test"); + "-ORBLogFile $log3_test"); $server_status = $SV1->Spawn (); @@ -162,7 +162,7 @@ if ($server_status != 0) { } $test->DeleteFile ($log1); -$test->DeleteFile ($log2); +$test->DeleteFile ($log2); $test->DeleteFile ($log3); $test->DeleteFile($iorbase); diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Makefile.am deleted file mode 100644 index 6bbf5b89144..00000000000 --- a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Makefile.am +++ /dev/null @@ -1,108 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.IFR_Self_Recursive_IDL_Idl.am - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl - @touch "$@" - -noinst_HEADERS = \ - Test.idl - -## Makefile.IFR_Self_Recursive_IDL_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - GoodDay.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - GoodDay.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.IFR_Self_Recursive_IDL_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - GoodDay.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl index 7eec6e81c13..2ede1277b90 100644 --- a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl +++ b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl @@ -20,13 +20,13 @@ module Test * This method is used to simplify the test shutdown process */ oneway void shutdown (); - + struct RoughWeek { BadDay isitok; SeqBadDay bad; }; - + RoughWeek this_week (); }; }; diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp index 69c98cebb82..b2c994851b7 100644 --- a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp +++ b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp @@ -31,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) argv [0]), -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl index cbcc3d17844..730bbad28a0 100755 --- a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl +++ b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/run_test.pl @@ -49,7 +49,7 @@ my $client_ior2file = $client->LocalFile ($ior2file); $client->DeleteFile($ior1file); $client->DeleteFile($ior2file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service", +$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", "-o $server1_ior1file"); diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp index 0e2399a8d78..5df03c2b300 100644 --- a/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp +++ b/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp @@ -31,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) argv [0]), -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp index afb0049f33a..079010fab3b 100644 --- a/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp +++ b/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp @@ -9,10 +9,6 @@ #include "ace/Get_Opt.h" #include "ace/SString.h" -ACE_RCSID (IFR_Test, - Admin_Client, - "$Id$") - Admin_Client::Admin_Client (void) : debug_ (0), all_tests_ (1), @@ -2034,7 +2030,7 @@ Admin_Client::constant_test (void) out_double_val)); } - ACE_ASSERT (out_double_val == double_val); + ACE_ASSERT (ACE::is_equal (out_double_val, double_val)); ivar = this->repo_->get_primitive (CORBA::pk_short); cvar->type_def (ivar.in ()); @@ -2090,7 +2086,7 @@ Admin_Client::constant_test (void) out_float_val)); } - ACE_ASSERT (out_float_val == float_val); + ACE_ASSERT (ACE::is_equal (out_float_val, float_val)); ivar = this->repo_->get_primitive (CORBA::pk_ulonglong); cvar->type_def (ivar.in ()); diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h b/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h index a550a1a9809..882e2ca3242 100644 --- a/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h +++ b/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h @@ -1,23 +1,20 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/orbsvcs/tests/InterfaceRepo -// -// = FILENAME -// Admin_Client.h -// -// = DESCRIPTION -// This class tests the functionality of the IFR methods by inserting -// IR objects into the repository by hand, querying them, moving them, -// and destroying them. -// -// = AUTHOR -// Jeff Parsons <parsons@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file Admin_Client.h + * + * $Id$ + * + * This class tests the functionality of the IFR methods by inserting + * IR objects into the repository by hand, querying them, moving them, + * and destroying them. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> + */ +//============================================================================= + #if !defined (ADMIN_CLIENT_H) #define ADMIN_CLIENT_H @@ -27,29 +24,32 @@ const CORBA::ULong NUMBER_OF_TESTS = 11; +/** + * @class Admin_Client + * + * @brief Administrating IFR Client Implementation + * + * Class wrapper for a client which puts the Interface Repository + * methods through their paces. + */ class Admin_Client { - // = TITLE - // Administrating IFR Client Implementation - // - // = DESCRIPTION - // Class wrapper for a client which puts the Interface Repository - // methods through their paces. public: + /// Constructor Admin_Client (void); - // Constructor + /// Destructor ~Admin_Client (void); - // Destructor + /// Initialize the ORB and get the IFR object reference. int init (int argc, ACE_TCHAR *argv[]); - // Initialize the ORB and get the IFR object reference. + /// Execute test code. int run (void); - // Execute test code. private: + /// The various IFR tests. void array_test (void); void enum_test (void); void alias_test (void); @@ -61,35 +61,34 @@ private: void interface_test (void); void move_test (void); void module_test (void); - // The various IFR tests. + /// Process the command line arguments. int parse_args (int argc, ACE_TCHAR *argv[]); - // Process the command line arguments. + /// Array of pointers to the test functions. void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(void); - // Array of pointers to the test functions. + /// Array of test names used in selection of one test. static const char *test_names_[]; - // Array of test names used in selection of one test. + /// Flag to output results of IFR queries. CORBA::Boolean debug_; - // Flag to output results of IFR queries. + /// Are we running all the tests or just one? CORBA::Boolean all_tests_; - // Are we running all the tests or just one? + /// Array index of the selected test function. CORBA::ULong which_test_; - // Array index of the selected test function. + /// # of times to run each test. CORBA::ULong iterations_; - // # of times to run each test. + /// Storage of the ORB reference. CORBA::ORB_var orb_; - // Storage of the ORB reference. + /// Storage of the IFR reference. CORBA::Repository_var repo_; - // Storage of the IFR reference. }; #endif /* ADMIN_CLIENT_H */ diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am deleted file mode 100644 index d97df280f9a..00000000000 --- a/orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.IFR_IFR_Test.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = IFR_Test - -IFR_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -IFR_Test_SOURCES = \ - Admin_Client.cpp \ - client.cpp \ - Admin_Client.h - -IFR_Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp index 3c1af54c6b7..eec00db242d 100644 --- a/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp +++ b/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp @@ -3,10 +3,6 @@ #include "Admin_Client.h" -ACE_RCSID (IFR_Test, - client, - "$Id$") - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { Admin_Client admin_client; diff --git a/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl index 71038761a52..671dea8d432 100755 --- a/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl +++ b/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl @@ -43,7 +43,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service", +$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", " $nice " . " -o $server_iorfile " . " $locking"); diff --git a/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp index bf95c26b6c8..8369b482eb0 100644 --- a/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp +++ b/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp @@ -8,10 +8,6 @@ #include "ace/Throughput_Stats.h" #include "ace/Sample_History.h" -ACE_RCSID (Latency_Test, - Latency_Query_Client, - "$Id$") - const CORBA::ULong DEFAULT_NUMCALLS = 20000; Latency_Query_Client::Latency_Query_Client (void) diff --git a/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h b/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h index 4e0c3bf6c4f..97c5eaa6b4e 100644 --- a/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h +++ b/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h @@ -1,21 +1,18 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/orbsvcs/tests/InterfaceRepo -// -// = FILENAME -// Latency_Query_Client.h -// -// = DESCRIPTION -// This class tests the latency of queries made on the IFR. -// -// = AUTHOR -// Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file Latency_Query_Client.h + * + * $Id$ + * + * This class tests the latency of queries made on the IFR. + * + * + * @author Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu> + */ +//============================================================================= + #if !defined (LATENCY_QUERY_CLIENT_H) #define LATENCY_QUERY_CLIENT_H @@ -23,55 +20,57 @@ #include "tao/IFR_Client/IFR_BasicC.h" #include "tao/ORB.h" +/** + * @class Latency_Query_Client + * + * @brief Querying IFR Client Implementation + * + * Class wrapper for a client which queries the Interface Repository. + */ class Latency_Query_Client { - // = TITLE - // Querying IFR Client Implementation - // - // = DESCRIPTION - // Class wrapper for a client which queries the Interface Repository. public: + /// Constructor Latency_Query_Client (void); - // Constructor + /// Destructor ~Latency_Query_Client (void); - // Destructor + /// Initialize the ORB and get the IFR object reference. int init (int argc, ACE_TCHAR *argv[]); - // Initialize the ORB and get the IFR object reference. + /// Execute test code. int run (void); - // Execute test code. private: + /// Process the command line arguments. int parse_args (int argc, ACE_TCHAR *argv[]); - // Process the command line arguments. + /// Put in something to query about. int populate_ifr (void); - // Put in something to query about. private: + /// Toggle debugging output. bool debug_; - // Toggle debugging output. + /// Toggle saving of dump history. bool do_dump_history_; - // Toggle saving of dump history. + /// Number of queries in a run. CORBA::ULong iterations_; - // Number of queries in a run. + /// Storage of the ORB reference. CORBA::ORB_var orb_; - // Storage of the ORB reference. + /// Storage of the IFR reference. CORBA::Repository_var repo_; - // Storage of the IFR reference. // CORBA::AliasDef_var tdef_; // Storage of the typedef definition that we will query. + /// Storage of the attribute definition we will query. CORBA::AttributeDef_var attr_; - // Storage of the attribute definition we will query. }; #endif /* LATENCY_QUERY_CLIENT_H */ diff --git a/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am deleted file mode 100644 index 5cd0c3a6029..00000000000 --- a/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.Latency_Test.am - -if BUILD_EXCEPTIONS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Latency_Query_Client.cpp \ - client.cpp \ - Latency_Query_Client.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp index 3561ace0f15..4e919008a6b 100644 --- a/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp +++ b/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp @@ -3,17 +3,12 @@ #include "Latency_Query_Client.h" -ACE_RCSID (Latency__Test, - client, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { Latency_Query_Client client; - int retval = client.init (argc, - argv); + int retval = client.init (argc, argv); if (retval == -1) { diff --git a/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl index f262590cf39..8c5b05b1f78 100755 --- a/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl +++ b/orbsvcs/tests/InterfaceRepo/Latency_Test/run_test.pl @@ -42,7 +42,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service", +$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", " $nice " . " -o $server_iorfile"); diff --git a/orbsvcs/tests/InterfaceRepo/Makefile.am b/orbsvcs/tests/InterfaceRepo/Makefile.am deleted file mode 100644 index 771e756d881..00000000000 --- a/orbsvcs/tests/InterfaceRepo/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -SUBDIRS = \ - Application_Test \ - Bug_2962_Regression \ - Bug_3155_Regression \ - Bug_3174_Regression \ - Bug_3495_Regression \ - IDL3_Test \ - IFR_Inheritance_Test \ - IFR_Self_Recursive_IDL_Test \ - IFR_Test \ - Latency_Test \ - Persistence_Test - diff --git a/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am b/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am deleted file mode 100644 index 434c936a151..00000000000 --- a/orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - - -## Makefile.IFR_Persistence_Test.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Persistence_Test - -Persistence_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Persistence_Test_SOURCES = \ - Ptest.cpp \ - test.cpp \ - Ptest.h - -Persistence_Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp index fc7606b14ea..b1a5fab848f 100644 --- a/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp +++ b/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp @@ -5,7 +5,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" -ACE_RCSID(Persistence_Test, Ptest, "$Id$") + Ptest::Ptest (void) : debug_ (0), diff --git a/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h b/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h index 7c2477dbb1b..a8936af2dd0 100644 --- a/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h +++ b/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h @@ -1,23 +1,20 @@ // -*- C++ -*- -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/orbsvcs/tests/InterfaceRepo -// -// = FILENAME -// Ptest.h -// -// = DESCRIPTION -// This code tests the persistence of the IFR by inserting -// IR objects into the repository with one function, and querying the -// repository with another, with a repository shutdown in between. -// -// = AUTHOR -// Jeff Parsons <parsons@cs.wustl.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file Ptest.h + * + * $Id$ + * + * This code tests the persistence of the IFR by inserting + * IR objects into the repository with one function, and querying the + * repository with another, with a repository shutdown in between. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> + */ +//============================================================================= + #if !defined (PTEST_H) #define PTEST_H @@ -25,50 +22,52 @@ #include "tao/IFR_Client/IFR_BasicC.h" #include "tao/ORB.h" +/** + * @class Ptest + * + * @brief IFR Persistence test Implementation + * + * Class wrapper for code which either populates or queries the + * Interface Repository. Designed to be used with a Perl script + * which can start and stop both this process and the repository + * process in the necessary order. + */ class Ptest { - // = TITLE - // IFR Persistence test Implementation - // - // = DESCRIPTION - // Class wrapper for code which either populates or queries the - // Interface Repository. Designed to be used with a Perl script - // which can start and stop both this process and the repository - // process in the necessary order. public: + /// Constructor Ptest (void); - // Constructor + /// Destructor ~Ptest (void); - // Destructor + /// Initialize the ORB and get the IFR object reference. int init (int argc, ACE_TCHAR *argv[]); - // Initialize the ORB and get the IFR object reference. + /// Execute test code. int run (void); - // Execute test code. private: + /// The two IFR tests. void populate (void); int query (void); - // The two IFR tests. + /// Process the command line arguments. int parse_args (int argc, ACE_TCHAR *argv[]); - // Process the command line arguments. + /// Flag to output results of IFR queries. CORBA::Boolean debug_; - // Flag to output results of IFR queries. + /// Are we populating a new IFR or querying a persistent one? CORBA::Boolean query_; - // Are we populating a new IFR or querying a persistent one? + /// Storage of the ORB reference. CORBA::ORB_var orb_; - // Storage of the ORB reference. + /// Storage of the IFR reference. CORBA::Repository_var repo_; - // Storage of the IFR reference. }; #endif /* PTEST_H */ diff --git a/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl index 98575290ded..de3b93855ef 100755 --- a/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl +++ b/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl @@ -38,7 +38,7 @@ $server->DeleteFile($iorbase); $server->DeleteFile($backing_file); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../../IFR_Service/IFR_Service", +$SV = $server->CreateProcess ("../../../IFR_Service/tao_ifr_service", " -o $server_iorfile " . " $persistent"); diff --git a/orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf b/orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf index ea66c67064d..b6856698e51 100644 --- a/orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf +++ b/orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf @@ -1,2 +1,3 @@ # $Id$ + static Resource_Factory "-ORBDropRepliesDuringShutdown 0" diff --git a/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp b/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp index 77a52ea4f66..e55bfc1f40e 100644 --- a/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp +++ b/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp @@ -3,10 +3,6 @@ #include "Ptest.h" -ACE_RCSID (Persistence_Test, - test, - "$Id$") - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { Ptest ptest; diff --git a/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp index f26859c4528..b88aec910d0 100644 --- a/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp +++ b/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp @@ -12,7 +12,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - TAO_IFR_Client_Adapter *ifr_client = + TAO_IFR_Client_Adapter *ifr_client = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name ()); @@ -32,11 +32,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) "get interface returned nil ref\n"), 1); } - + CORBA::ContainedSeq_var attributes = intDef->contents (CORBA::dk_Attribute, 1); CORBA::ULong n_ats = attributes->length (); - + CORBA::ULong index = 0UL; CORBA::String_var name = attributes[index]->name (); ACE_DEBUG ((LM_DEBUG, diff --git a/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl b/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl index f13eba613c8..5b23ca74b7b 100755 --- a/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl +++ b/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/run_test.pl @@ -39,7 +39,7 @@ my $client_ior1file = $client->LocalFile ($ior1file); $client->DeleteFile($ior1file); -$SV1 = $server1->CreateProcess ("../../../IFR_Service/IFR_Service", +$SV1 = $server1->CreateProcess ("../../../IFR_Service/tao_ifr_service", " $nice " . "-ORBdebuglevel $debug_level " . "-o $server1_ior1file " . |