diff options
Diffstat (limited to 'tests/ORB_Local_Config')
31 files changed, 168 insertions, 720 deletions
diff --git a/tests/ORB_Local_Config/Bug_1459/Makefile.am b/tests/ORB_Local_Config/Bug_1459/Makefile.am deleted file mode 100644 index 07f2cdbbe15..00000000000 --- a/tests/ORB_Local_Config/Bug_1459/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_1459.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Test - -Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib - -Test_SOURCES = \ - Test.cpp - -Test_LDADD = \ - $(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/tests/ORB_Local_Config/Bug_1459/Test.cpp b/tests/ORB_Local_Config/Bug_1459/Test.cpp index 5dd5e5e5330..f67164da137 100644 --- a/tests/ORB_Local_Config/Bug_1459/Test.cpp +++ b/tests/ORB_Local_Config/Bug_1459/Test.cpp @@ -1,4 +1,4 @@ - +// $Id$ // @author Jeff Mirwaisi <jeff_mirwaisi@yahoo.com> // @author Iliyan Jeliazkov <iliyan2ociweb.com> @@ -15,8 +15,6 @@ #include "ace/Dynamic_Service.h" #include "Service_Configuration_Per_ORB.h" -ACE_RCSID (tests, server, "$Id$") - // Currently there is no way to test SSLIOP in this test due to a problem // described in bug 3418. //#define DO_1459_SSLIOP_TEST 1 diff --git a/tests/ORB_Local_Config/Bug_1459/a.conf b/tests/ORB_Local_Config/Bug_1459/a.conf index 042a572964b..0e23b17e393 100644 --- a/tests/ORB_Local_Config/Bug_1459/a.conf +++ b/tests/ORB_Local_Config/Bug_1459/a.conf @@ -1,2 +1,4 @@ +# $Id$ + dynamic UIOP_Factory Service_Object * TAO_Strategies:_make_TAO_UIOP_Protocol_Factory() "" dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBProtocolFactory UIOP_Factory" diff --git a/tests/ORB_Local_Config/Bug_1459/b.conf b/tests/ORB_Local_Config/Bug_1459/b.conf index 9452bc3f56a..2ed07d89bec 100644 --- a/tests/ORB_Local_Config/Bug_1459/b.conf +++ b/tests/ORB_Local_Config/Bug_1459/b.conf @@ -1,3 +1,5 @@ +# $Id$ + dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem" static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory" diff --git a/tests/ORB_Local_Config/Bug_1459/d.conf b/tests/ORB_Local_Config/Bug_1459/d.conf index 93678ab8146..a9376895eac 100644 --- a/tests/ORB_Local_Config/Bug_1459/d.conf +++ b/tests/ORB_Local_Config/Bug_1459/d.conf @@ -1,2 +1,4 @@ +# $Id$ + dynamic DIOP_Factory Service_Object * TAO_Strategies:_make_TAO_DIOP_Protocol_Factory() "" dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory() "-ORBProtocolFactory DIOP_Factory" diff --git a/tests/ORB_Local_Config/Bug_1459/m.conf b/tests/ORB_Local_Config/Bug_1459/m.conf index e69de29bb2d..9406b2e4163 100644 --- a/tests/ORB_Local_Config/Bug_1459/m.conf +++ b/tests/ORB_Local_Config/Bug_1459/m.conf @@ -0,0 +1,2 @@ +# $Id$ +
\ No newline at end of file diff --git a/tests/ORB_Local_Config/Bug_1459/m1.conf b/tests/ORB_Local_Config/Bug_1459/m1.conf index d9fad55aeb9..d00b33c76c1 100644 --- a/tests/ORB_Local_Config/Bug_1459/m1.conf +++ b/tests/ORB_Local_Config/Bug_1459/m1.conf @@ -1,3 +1,5 @@ +# $Id$ + dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() "" dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() "" static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory" diff --git a/tests/ORB_Local_Config/Bug_2612/Makefile.am b/tests/ORB_Local_Config/Bug_2612/Makefile.am deleted file mode 100644 index 3c877a90e26..00000000000 --- a/tests/ORB_Local_Config/Bug_2612/Makefile.am +++ /dev/null @@ -1,68 +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.DllOrb.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES = libDllOrb.la - -libDllOrb_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DDLLORB_BUILD_DLL - -libDllOrb_la_SOURCES = \ - DllOrb.cpp - -noinst_HEADERS = \ - DllOrb.h \ - DllOrb_Export.h - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2612.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Test - -Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Test_SOURCES = \ - Test.cpp \ - DllOrb.h \ - DllOrb_Export.h - -Test_LDADD = \ - $(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/tests/ORB_Local_Config/Bug_2612/Test.cpp b/tests/ORB_Local_Config/Bug_2612/Test.cpp index 33d4a2af1ca..33fcae3e2a7 100644 --- a/tests/ORB_Local_Config/Bug_2612/Test.cpp +++ b/tests/ORB_Local_Config/Bug_2612/Test.cpp @@ -5,9 +5,9 @@ * $Id$ */ -#include "ace/OS.h" #include "ace/Service_Config.h" #include "tao/corba.h" +#include "ace/OS_NS_unistd.h" ACE_TCHAR const * const scpc_loadOrb = // NOTE due to the way ACE_DYNAMIC_SERVICE_DIRECTIVE() macro is defined, // each parameter CANNOT be split into multiple quoted strings "line1" "nextline" with the expectation that diff --git a/tests/ORB_Local_Config/Bug_3049/Makefile.am b/tests/ORB_Local_Config/Bug_3049/Makefile.am deleted file mode 100644 index 07f2cdbbe15..00000000000 --- a/tests/ORB_Local_Config/Bug_3049/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_1459.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Test - -Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib - -Test_SOURCES = \ - Test.cpp - -Test_LDADD = \ - $(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/tests/ORB_Local_Config/Bug_3049/Test.cpp b/tests/ORB_Local_Config/Bug_3049/Test.cpp index 48e7bb9082b..9abda088933 100644 --- a/tests/ORB_Local_Config/Bug_3049/Test.cpp +++ b/tests/ORB_Local_Config/Bug_3049/Test.cpp @@ -1,4 +1,4 @@ - +// $Id$ // @author Phil Mesnier <mesnier_p@ociweb.com> // This test scenario is documented in bugzilla bug 3049. This test @@ -12,10 +12,6 @@ #include "tao/ORB_Core.h" #include "ace/ARGV.h" #include "ace/Dynamic_Service.h" - -ACE_RCSID (tests, server, "$Id$") - - #include "Service_Configuration_Per_ORB.h" const ACE_TCHAR argA[] = ACE_TEXT ("AAA -ORBGestalt LOCAL -ORBId ORB-A"); diff --git a/tests/ORB_Local_Config/Bug_3049/a.conf b/tests/ORB_Local_Config/Bug_3049/a.conf index a93ffc0031e..07dbb5be23a 100644 --- a/tests/ORB_Local_Config/Bug_3049/a.conf +++ b/tests/ORB_Local_Config/Bug_3049/a.conf @@ -1,3 +1,5 @@ +# $Id$ + dynamic SHMIOP_Factory Service_Object * TAO_Strategies:_make_TAO_SHMIOP_Protocol_Factory() "" dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBProtocolFactory SHMIOP_Factory" diff --git a/tests/ORB_Local_Config/Bunch/Makefile.am b/tests/ORB_Local_Config/Bunch/Makefile.am deleted file mode 100644 index 88dd5cfe315..00000000000 --- a/tests/ORB_Local_Config/Bunch/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.Bunch.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Test - -Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib - -Test_SOURCES = \ - Test.cpp - -Test_LDADD = \ - $(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/tests/ORB_Local_Config/Bunch/Test.cpp b/tests/ORB_Local_Config/Bunch/Test.cpp index 6cfb53ba63f..29549b78b2f 100644 --- a/tests/ORB_Local_Config/Bunch/Test.cpp +++ b/tests/ORB_Local_Config/Bunch/Test.cpp @@ -9,9 +9,6 @@ #include "ace/Service_Config.h" #include "ace/Intrusive_Auto_Ptr.h" #include "ace/Dynamic_Service.h" - -ACE_RCSID (tests, server, "$Id$") - #include "Service_Configuration_Per_ORB.h" int diff --git a/tests/ORB_Local_Config/Makefile.am b/tests/ORB_Local_Config/Makefile.am deleted file mode 100644 index 72468788ad8..00000000000 --- a/tests/ORB_Local_Config/Makefile.am +++ /dev/null @@ -1,20 +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 = \ - Bug_1459 \ - Bug_2612 \ - Bunch \ - Separation \ - Service_Dependency \ - Shared \ - Simple \ - Two_DLL_ORB - diff --git a/tests/ORB_Local_Config/Separation/Makefile.am b/tests/ORB_Local_Config/Separation/Makefile.am deleted file mode 100644 index b80cba26183..00000000000 --- a/tests/ORB_Local_Config/Separation/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.Separation.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Test - -Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib - -Test_SOURCES = \ - Test.cpp - -Test_LDADD = \ - $(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/tests/ORB_Local_Config/Service_Dependency/Makefile.am b/tests/ORB_Local_Config/Service_Dependency/Makefile.am deleted file mode 100644 index fd006206d71..00000000000 --- a/tests/ORB_Local_Config/Service_Dependency/Makefile.am +++ /dev/null @@ -1,66 +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.Service_Config_Dependent_DLL.am - -noinst_LTLIBRARIES = libService_Config_Dependent_DLL.la - -libService_Config_Dependent_DLL_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(srcdir)/../lib \ - -DSERVICE_CONFIG_DLL_BUILD_DLL - -libService_Config_Dependent_DLL_la_SOURCES = \ - Service_Config_DLL.cpp - -noinst_HEADERS = \ - Service_Config_DLL.h \ - Service_Config_DLL_Export.h - -## Makefile.Service_Dependency.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Test - -Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib - -Test_SOURCES = \ - Test.cpp \ - Service_Config_DLL.h \ - Service_Config_DLL_Export.h - -Test_LDADD = \ - $(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/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp b/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp index 2ffbdab6f80..41b069b5daa 100644 --- a/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp +++ b/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp @@ -1,14 +1,11 @@ // -*- C++ -*- +// $Id$ #include "Service_Config_DLL.h" #include "ace/Service_Config.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" -ACE_RCSID (tests, - Service_Config_DLL, - "$Id$") - static ACE_THR_FUNC_RETURN invoke_service_config (void *arg) { diff --git a/tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf b/tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf index 9001bd8266b..fbd70485d49 100644 --- a/tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf +++ b/tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf @@ -1,3 +1,5 @@ +# $Id$ + # Dynamically loading each of the Service Objects below causes a # number of threads to be spawned, each one invoking the Service # Configurator (e.g. ACE_Service_Config::process_directive(). If the diff --git a/tests/ORB_Local_Config/Shared/Makefile.am b/tests/ORB_Local_Config/Shared/Makefile.am deleted file mode 100644 index 73fa3a5805b..00000000000 --- a/tests/ORB_Local_Config/Shared/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.Shared.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Test - -Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib - -Test_SOURCES = \ - Test.cpp - -Test_LDADD = \ - $(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/tests/ORB_Local_Config/Simple/Makefile.am b/tests/ORB_Local_Config/Simple/Makefile.am deleted file mode 100644 index 9c20f390524..00000000000 --- a/tests/ORB_Local_Config/Simple/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.Simple.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Test - -Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib - -Test_SOURCES = \ - Test.cpp - -Test_LDADD = \ - $(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/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am b/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am deleted file mode 100644 index 5e4afe47701..00000000000 --- a/tests/ORB_Local_Config/Two_DLL_ORB/Makefile.am +++ /dev/null @@ -1,140 +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_LTLIBRARIES = - -## Makefile.Two_DLL_ORB_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.ORB_DLL_Client.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES += libORB_DLL_Client.la - -libORB_DLL_Client_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DSERVICE_CONFIG_ORB_DLL_BUILD_DLL - -libORB_DLL_Client_la_SOURCES = \ - ORB_DLL.cpp \ - TestC.cpp \ - TestS.cpp \ - Test_i.cpp \ - client.cpp \ - server.cpp - -noinst_HEADERS += \ - ORB_DLL.h \ - ORB_DLL_Export.h \ - Test_i.h - -endif BUILD_EXCEPTIONS - -## Makefile.ORB_DLL_Server.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_LTLIBRARIES += libORB_DLL_Server.la - -libORB_DLL_Server_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DSERVICE_CONFIG_ORB_DLL_BUILD_DLL - -libORB_DLL_Server_la_SOURCES = \ - ORB_DLL.cpp \ - TestC.cpp \ - TestS.cpp \ - Test_i.cpp \ - client.cpp \ - server.cpp - -noinst_HEADERS += \ - ORB_DLL.h \ - ORB_DLL_Export.h \ - Test_i.h - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Makefile.Two_DLL_ORB.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Test - -Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib - -Test_SOURCES = \ - Test.cpp \ - ORB_DLL.h \ - ORB_DLL_Export.h \ - Test_i.h - -Test_LDADD = \ - $(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/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp b/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp index 17532f8f92b..b56ec03a8e6 100644 --- a/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp +++ b/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ORB_DLL.h" #include "ace/Service_Config.h" @@ -8,11 +9,6 @@ #include "ace/Arg_Shifter.h" #include "ace/Log_Msg.h" -ACE_RCSID (tests, - ORB_DLL, - "$Id$") - -// Abstract_Worker::Abstract_Worker (const ACE_TCHAR *s) : ior_file_ (s) { diff --git a/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp b/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp index 3721c755bf0..0a5be851783 100644 --- a/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp +++ b/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp @@ -3,8 +3,6 @@ // #include "Test_i.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp b/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp index b32d87d3aa5..dd7162beabe 100644 --- a/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp +++ b/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp @@ -7,8 +7,6 @@ #include "ace/Argv_Type_Converter.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Hello, client, "$Id$") - Client_Worker::Client_Worker () : Abstract_Worker (ACE_TEXT ("file://test.ior")) { @@ -39,83 +37,102 @@ Client_Worker::parse_args (int argc, ACE_TCHAR *argv[]) break; } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } int Client_Worker::test_main (int argc, ACE_TCHAR *argv[]) { - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - - if (parse_args (argc, argv) != 0) - ACE_ERROR_RETURN ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Could not parse the arguments\n")), - 1); - - // Doing this dance to allow the server some time to come up. - CORBA::Object_ptr co = 0; - for (int attempts_left=5; attempts_left > 0; --attempts_left) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Client is ready to proceed - awaiting the server ...\n"))); - ACE_OS::sleep (1); - - try + try { - co = orb->string_to_object (ior_file_.c_str ()); - - if (co == 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Unable to obtain object reference yet. Retrying.\n"))); - continue; - } - CORBA::Object_var tmp (co); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - Test::Hello_var hello = - Test::Hello::_narrow(tmp.in ()); + if (parse_args (argc, argv) != 0) + ACE_ERROR_RETURN ((LM_DEBUG, + ACE_TEXT ("(%P|%t) Could not parse the arguments\n")), + 1); - if (CORBA::is_nil (hello.in ())) + // Doing this dance to allow the server some time to come up. + CORBA::Object_ptr co = 0; + for (int attempts_left = 5; attempts_left > 0; --attempts_left) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Nil Test::Hello reference <%s>. Retrying.\n"), - ior_file_.c_str ())); - continue; - } - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Successfuly narrowed the Hello interface\n"))); - - CORBA::String_var the_string = - hello->get_string (); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) String returned from the server <%C>\n"), - the_string.in ())); - - hello->shutdown (); - - attempts_left = 0; // We're done here! - + ACE_TEXT ("(%P|%t) Client is ready to proceed - awaiting the server ...\n"))); + ACE_OS::sleep (1); + + try + { + co = orb->string_to_object (ior_file_.c_str ()); + + if (co == 0) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) Unable to obtain object reference yet. Retrying.\n"))); + continue; + } + CORBA::Object_var tmp (co); + + Test::Hello_var hello = + Test::Hello::_narrow(tmp.in ()); + + if (CORBA::is_nil (hello.in ())) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) Nil Test::Hello reference <%s>. Retrying.\n"), + ior_file_.c_str ())); + continue; + } + + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) Successfuly narrowed the Hello interface\n"))); + + CORBA::String_var the_string = + hello->get_string (); + + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) String returned from the server <%C>\n"), + the_string.in ())); + + hello->shutdown (); + + attempts_left = 0; // We're done here! + + } + catch (const CORBA::TRANSIENT& ex) + { + if (!attempts_left) + throw; + + ex._tao_print_exception ("Temporary problem encountered"); + + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) Client was too quick. Pausing ") + ACE_TEXT ("while the server gets ready.\n"))); + ACE_OS::sleep (5); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception("Unexpected CORBA exception caught"); + + if (!attempts_left) + throw; + + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) Pausing for a while.\n"))); + ACE_OS::sleep (5); + } + } + + orb->shutdown (0); + + orb->destroy (); } - catch (const CORBA::TRANSIENT& ex) + catch (const ::CORBA::Exception &e) { - if (!attempts_left) - throw; - - ex._tao_print_exception ("Temporary problem encountered"); - - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Client was too quick. Pausing ") - ACE_TEXT ("while the server gets ready.\n"))); - ACE_OS::sleep (5); + e._tao_print_exception("Client_Worker::test_main"); + return 1; } - } - - orb->shutdown (0); - - orb->destroy (); return 0; } diff --git a/tests/ORB_Local_Config/Two_DLL_ORB/primary-csd.conf b/tests/ORB_Local_Config/Two_DLL_ORB/primary-csd.conf index 5de36bc6f60..d52e428e167 100644 --- a/tests/ORB_Local_Config/Two_DLL_ORB/primary-csd.conf +++ b/tests/ORB_Local_Config/Two_DLL_ORB/primary-csd.conf @@ -1,2 +1,4 @@ +# $Id$ + dynamic ORB_DLL_Server Service_Object * ORB_DLL_Server:_make_Service_Config_ORB_DLL() "-s -ORBDebugLevel 1 -ORBGestalt LOCAL -ORBId SERVER -ORBSvcConf secondary-empty.conf" dynamic ORB_DLL_Client Service_Object * ORB_DLL_Client:_make_Service_Config_ORB_DLL() "-c -ORBDebugLevel 1 -ORBGestalt LOCAL -ORBId CLIENT -ORBSvcConf secondary-csd.conf" diff --git a/tests/ORB_Local_Config/Two_DLL_ORB/primary-ssl.conf b/tests/ORB_Local_Config/Two_DLL_ORB/primary-ssl.conf index 205cf07dc9b..31b94c45d6c 100644 --- a/tests/ORB_Local_Config/Two_DLL_ORB/primary-ssl.conf +++ b/tests/ORB_Local_Config/Two_DLL_ORB/primary-ssl.conf @@ -1,3 +1,5 @@ +# $Id$ + dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLNOProtection" dynamic ORB_DLL_Server Service_Object * ORB_DLL_Server:_make_Service_Config_ORB_DLL() "-s -ORBDebugLevel 1 -ORBGestalt LOCAL -ORBId SERVER -ORBSvcConf secondary-empty.conf" dynamic ORB_DLL_Client Service_Object * ORB_DLL_Client:_make_Service_Config_ORB_DLL() "-c -ORBDebugLevel 1 -ORBGestalt LOCAL -ORBId CLIENT -ORBSvcConf secondary-ssl.conf" diff --git a/tests/ORB_Local_Config/Two_DLL_ORB/secondary-csd.conf b/tests/ORB_Local_Config/Two_DLL_ORB/secondary-csd.conf index 6fde3ce799f..044750e8e5e 100644 --- a/tests/ORB_Local_Config/Two_DLL_ORB/secondary-csd.conf +++ b/tests/ORB_Local_Config/Two_DLL_ORB/secondary-csd.conf @@ -1,2 +1,4 @@ +# $Id$ + dynamic TAO_CSD_TP_Strategy_Factory Service_Object * TAO_CSD_ThreadPool:_make_TAO_CSD_TP_Strategy_Factory() "-CSDtp RootPOA:2" static Resource_Factory "" diff --git a/tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf b/tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf index 477c4795007..bacce361960 100644 --- a/tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf +++ b/tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf @@ -1 +1,3 @@ +# $Id$ + # Nothing so far diff --git a/tests/ORB_Local_Config/Two_DLL_ORB/secondary-ssl.conf b/tests/ORB_Local_Config/Two_DLL_ORB/secondary-ssl.conf index 3e718372d8c..000be6b4bb0 100644 --- a/tests/ORB_Local_Config/Two_DLL_ORB/secondary-ssl.conf +++ b/tests/ORB_Local_Config/Two_DLL_ORB/secondary-ssl.conf @@ -1,2 +1,4 @@ +# $Id$ + dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLNOProtection" static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory" diff --git a/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp b/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp index 8f2f1ada5ab..ae4e5499fc3 100644 --- a/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp +++ b/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp @@ -1,6 +1,5 @@ // $Id$ - #include "Test_i.h" #include "ORB_DLL.h" @@ -9,12 +8,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/Argv_Type_Converter.h" - -ACE_RCSID (Hello, - server, - "$Id$") - -// Server_Worker::Server_Worker () : Abstract_Worker (ACE_TEXT ("test.ior")) { @@ -47,7 +40,7 @@ Server_Worker::parse_args (int argc, ACE_TCHAR *argv[]) break; } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } @@ -55,76 +48,84 @@ Server_Worker::parse_args (int argc, ACE_TCHAR *argv[]) int Server_Worker::test_main (int argc, ACE_TCHAR *argv[]) { - // Making sure there are no stale ior files to confuse a client - ACE_OS::unlink (ior_file_.c_str ()); + try + { + // Making sure there are no stale ior files to confuse a client + ACE_OS::unlink (ior_file_.c_str ()); - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA"); + CORBA::Object_var poa_object = + orb->resolve_initial_references ("RootPOA"); - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in ()); + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); - if (CORBA::is_nil (root_poa.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) Panic: nil RootPOA\n")), - 1); + if (CORBA::is_nil (root_poa.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("(%P|%t) Panic: nil RootPOA\n")), + 1); - PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (); + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (); - if (parse_args (argc, argv) != 0) - return 1; + if (parse_args (argc, argv) != 0) + return 1; - Hello *hello_impl; - ACE_NEW_RETURN (hello_impl, - Hello (orb.in ()), - 1); + Hello *hello_impl; + ACE_NEW_RETURN (hello_impl, + Hello (orb.in ()), + 1); - PortableServer::ServantBase_var owner_transfer (hello_impl); + PortableServer::ServantBase_var owner_transfer (hello_impl); - PortableServer::ObjectId_var id = - root_poa->activate_object (hello_impl); + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); - CORBA::Object_var hello_obj = - root_poa->id_to_reference (id.in ()); + CORBA::Object_var hello_obj = + root_poa->id_to_reference (id.in ()); - Test::Hello_var hello = - Test::Hello::_narrow (hello_obj.in ()); + Test::Hello_var hello = + Test::Hello::_narrow (hello_obj.in ()); - CORBA::String_var ior = - orb->object_to_string (hello.in ()); + CORBA::String_var ior = + orb->object_to_string (hello.in ()); - poa_manager->activate (); + poa_manager->activate (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server activated POA manager\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server activated POA manager\n"))); - // Output the IOR to the <ior_output_file> - FILE *output_file= ACE_OS::fopen (ior_file_.c_str (), "w"); - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%P|%t) Cannot open output file %s for writing IOR: %C"), - ior_file_.c_str (), - ior.in ()), - 1); - ACE_OS::fprintf (output_file, "%s", ior.in ()); - ACE_OS::fclose (output_file); + // Output the IOR to the <ior_output_file> + FILE *output_file= ACE_OS::fopen (ior_file_.c_str (), "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("(%P|%t) Cannot open output file %s for writing IOR: %C"), + ior_file_.c_str (), + ior.in ()), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server entering the event loop\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server entering the event loop\n"))); - orb->run (); + orb->run (); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server exiting the event loop\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server exiting the event loop\n"))); - root_poa->destroy (1, 1); + root_poa->destroy (1, 1); - // During normal test execution the ORB would have been destroyed - // by a request from the client. + // During normal test execution the ORB would have been destroyed + // by a request from the client. - // orb->shutdown (0); + // orb->shutdown (0); - orb->destroy (); + orb->destroy (); + } + catch (const ::CORBA::Exception &e) + { + e._tao_print_exception("Server_Worker::test_main"); + return 1; + } return 0; } |