diff options
Diffstat (limited to 'orbsvcs/examples/ImR/Combined_Service')
4 files changed, 12 insertions, 216 deletions
diff --git a/orbsvcs/examples/ImR/Combined_Service/Makefile.am b/orbsvcs/examples/ImR/Combined_Service/Makefile.am deleted file mode 100644 index c0ae02ce3a6..00000000000 --- a/orbsvcs/examples/ImR/Combined_Service/Makefile.am +++ /dev/null @@ -1,208 +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.ImR_Combined_Service_IDL.am - -BUILT_SOURCES = \ - service_configC.cpp \ - service_configC.h \ - service_configC.inl \ - service_configS.cpp \ - service_configS.h \ - service_configS.inl - -CLEANFILES = \ - service_config-stamp \ - service_configC.cpp \ - service_configC.h \ - service_configC.inl \ - service_configS.cpp \ - service_configS.h \ - service_configS.inl - -service_configC.cpp service_configC.h service_configC.inl service_configS.cpp service_configS.h service_configS.inl: service_config-stamp - -service_config-stamp: $(srcdir)/service_config.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/service_config.idl - @touch $@ - -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 = \ - service_config.idl \ - test.idl - -## Makefile.ImR_Combined_Service.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += combined_service - -combined_service_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -combined_service_SOURCES = \ - combined.cpp \ - service_configC.cpp \ - service_configS.cpp \ - dynserver.h \ - dynserver_export.h - -combined_service_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 - -## Makefile.ImR_Combined_Service_Controller.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += controller - -controller_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -controller_SOURCES = \ - controller.cpp \ - service_configC.cpp \ - dynserver.h \ - dynserver_export.h - -controller_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.ImR_Combined_Service_DynamicServer.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES = libDynServer.la - -libDynServer_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DDYNSERVER_BUILD_DLL - -libDynServer_la_SOURCES = \ - dynserver.cpp \ - testC.cpp \ - testS.cpp - -noinst_HEADERS += \ - dynserver.h \ - dynserver_export.h - -endif BUILD_EXCEPTIONS - -## Makefile.ImR_Combined_Service_Test.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 \ - testC.cpp \ - dynserver.h \ - dynserver_export.h - -test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.ImR_Combined_Service_TestServer.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += test_server - -test_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -test_server_SOURCES = \ - testC.cpp \ - testS.cpp \ - test_server.cpp \ - dynserver.h \ - dynserver_export.h - -test_server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.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/examples/ImR/Combined_Service/dynserver.conf b/orbsvcs/examples/ImR/Combined_Service/dynserver.conf index 4d63029f52e..fe4b2e6d3eb 100644 --- a/orbsvcs/examples/ImR/Combined_Service/dynserver.conf +++ b/orbsvcs/examples/ImR/Combined_Service/dynserver.conf @@ -1 +1,3 @@ +# $Id$ + dynamic DynServer_Loader Service_Object * DynServer:_make_DynServer_Loader() '-orbcollocation per-orb -orbuseimr 1 -orbinitref ImplRepoService=corbaloc::localhost:9999/ImplRepoService' diff --git a/orbsvcs/examples/ImR/Combined_Service/run_test.pl b/orbsvcs/examples/ImR/Combined_Service/run_test.pl index a9285c15e19..c6d66ff9da2 100755 --- a/orbsvcs/examples/ImR/Combined_Service/run_test.pl +++ b/orbsvcs/examples/ImR/Combined_Service/run_test.pl @@ -69,8 +69,8 @@ my $status = 0; sub print_output { my $output_file = $_[0]; - open( TEST_OUTPUT, "< $output_file" ) or return -1; - while( <TEST_OUTPUT> ) { + open (TEST_OUTPUT, "< $output_file" ) or return -1; + while (<TEST_OUTPUT>) { print; } close (TEST_OUTPUT); @@ -92,8 +92,8 @@ sub cleanup if (m/ImR Activator: Successfully started/) { chomp $_; my @words = split (/=/, $_); - push(@pids, $words[1]); - ++ $i; + push(@pids, $words[1]); + ++ $i; } } close (TEST_OUTPUT); @@ -125,7 +125,7 @@ sub do_test } ## Wait a little bit for everything to get started - sleep(2); + sleep(10); print STDERR "Starting test_server -orbuseimr 1 $imr_initref\n"; $SERV->Arguments ("-ORBLogFile $output_files[$id_serv_log] -orbuseimr 1 $imr_initref"); @@ -136,7 +136,7 @@ sub do_test } ## Wait a little bit for everything to get started - sleep(2); + sleep(10); print STDERR "Starting client\n"; # The client should pass the simple test @@ -183,7 +183,7 @@ sub do_test print "ERROR : Shutting down test server.\n"; return $ret; } - + # Both TestObject1 and TestObject2 should now show up as "not running" $IMRUTIL->Arguments ("-ORBLogFile $output_files[$id_imru_log] $imr_initref list -v"); $ret = $IMRUTIL->SpawnWaitKill ($test->ProcessStartWaitInterval()); diff --git a/orbsvcs/examples/ImR/Combined_Service/start_all.conf b/orbsvcs/examples/ImR/Combined_Service/start_all.conf index 23e3db5379c..b8329d03a6c 100644 --- a/orbsvcs/examples/ImR/Combined_Service/start_all.conf +++ b/orbsvcs/examples/ImR/Combined_Service/start_all.conf @@ -1,2 +1,4 @@ -dynamic ImR_Locator_Loader Service_Object * TAO_ImR_Locator:_make_ImR_Locator_Loader() '-orbcollocation no -orbobjrefstyle url -t 5 -d 2 -orbendpoint iiop://:9999' +# $Id$ + +dynamic ImR_Locator_Loader Service_Object * TAO_ImR_Locator:_make_ImR_Locator_Loader() '-orbcollocation no -orbobjrefstyle url -t 10 -d 2 -orbendpoint iiop://:9999' dynamic ImR_Activator_Loader Service_Object * TAO_ImR_Activator:_make_ImR_Activator_Loader() '-orbcollocation per-orb -d 2 -orbinitref ImplRepoService=corbaloc::localhost:9999/ImplRepoService' |