diff options
Diffstat (limited to 'tests')
1952 files changed, 14687 insertions, 52163 deletions
diff --git a/tests/AMH_Exceptions/Makefile.am b/tests/AMH_Exceptions/Makefile.am deleted file mode 100644 index 6d8e0abad38..00000000000 --- a/tests/AMH_Exceptions/Makefile.am +++ /dev/null @@ -1,125 +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.AMH_Exceptions_Idl.am - -if BUILD_CORBA_MESSAGING -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) -GH $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.AMH_Exceptions_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 = \ - TestC.cpp \ - TestS.cpp \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.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_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.AMH_Exceptions_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.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_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 - -## 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/AMH_Exceptions/Test.idl b/tests/AMH_Exceptions/Test.idl index 6a9ae77044b..6f4030410f4 100644 --- a/tests/AMH_Exceptions/Test.idl +++ b/tests/AMH_Exceptions/Test.idl @@ -8,7 +8,7 @@ module Test exception InvalidTimestamp {}; exception ServerOverload {}; - + /// Use a timestamp to measure the roundtrip delay typedef unsigned long long Timestamp; diff --git a/tests/AMH_Exceptions/client.cpp b/tests/AMH_Exceptions/client.cpp index 403234a50d0..4145de92f4b 100644 --- a/tests/AMH_Exceptions/client.cpp +++ b/tests/AMH_Exceptions/client.cpp @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ #include "TestC.h" @@ -27,7 +28,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/tests/AMH_Exceptions/server.cpp b/tests/AMH_Exceptions/server.cpp index 2a948434c95..f8132bca70e 100644 --- a/tests/AMH_Exceptions/server.cpp +++ b/tests/AMH_Exceptions/server.cpp @@ -1,4 +1,4 @@ - +// -*- C++ -*- // $Id$ #include "ace/OS_NS_stdio.h" @@ -24,7 +24,7 @@ public: //FUZZ: disable check_for_lack_ACE_OS protected: - CORBA::ORB_ptr orb_; + CORBA::ORB_var orb_; }; diff --git a/tests/AMH_Oneway/Makefile.am b/tests/AMH_Oneway/Makefile.am deleted file mode 100644 index fe45f3b457c..00000000000 --- a/tests/AMH_Oneway/Makefile.am +++ /dev/null @@ -1,124 +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.AMH_Oneway_Idl.am - -if BUILD_CORBA_MESSAGING -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) -GH $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.AMH_Oneway_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 = \ - TestC.cpp \ - TestS.cpp \ - client.cpp - -client_LDADD = \ - $(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_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.AMH_Oneway_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.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_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 - -## 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/AMI/Makefile.am b/tests/AMI/Makefile.am deleted file mode 100644 index 56fad7dc3e7..00000000000 --- a/tests/AMI/Makefile.am +++ /dev/null @@ -1,166 +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.AMI_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -CLEANFILES = \ - ami_test-stamp \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp - -ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl - @touch $@ - -noinst_HEADERS = \ - ami_test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.AMI_Client.am - -if BUILD_AMI -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 = \ - ami_testC.cpp \ - ami_testS.cpp \ - client.cpp \ - ami_test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.AMI_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - ami_testC.cpp \ - ami_testS.cpp \ - ami_test_i.cpp \ - server.cpp \ - ami_test_i.h - -server_LDADD = \ - $(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_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 -endif BUILD_AMI - -## Makefile.AMI_Simple_Client.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += simple_client - -simple_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -simple_client_SOURCES = \ - ami_testC.cpp \ - ami_testS.cpp \ - simple_client.cpp \ - ami_test_i.h - -simple_client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## 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/AMI/ami_test.idl b/tests/AMI/ami_test.idl index 04005e9531f..44853a82706 100644 --- a/tests/AMI/ami_test.idl +++ b/tests/AMI/ami_test.idl @@ -33,7 +33,7 @@ module A void inout_arg_test (inout string str); }; - + interface Test_Child : AMI_Test { void child_op (); diff --git a/tests/AMI/ami_test_i.cpp b/tests/AMI/ami_test_i.cpp index f0b9de7ebfa..398914b6099 100644 --- a/tests/AMI/ami_test_i.cpp +++ b/tests/AMI/ami_test_i.cpp @@ -16,8 +16,6 @@ #include "ami_test_i.h" #include "tao/debug.h" -ACE_RCSID(AMI, ami_test_i, "$Id$") - AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb, CORBA::Long in_l, const char * in_str, diff --git a/tests/AMI/client.cpp b/tests/AMI/client.cpp index 5f5ab8fba03..f1855318f91 100644 --- a/tests/AMI/client.cpp +++ b/tests/AMI/client.cpp @@ -18,10 +18,6 @@ #include "ace/Task.h" #include "ami_test_i.h" -ACE_RCSID (AMI, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 5; int niterations = 5; @@ -65,7 +61,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/tests/AMI/exclusive.conf b/tests/AMI/exclusive.conf index b269154099f..e03ea06380b 100644 --- a/tests/AMI/exclusive.conf +++ b/tests/AMI/exclusive.conf @@ -1,2 +1,3 @@ +# $Id$ -static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBclientconnectionhandler ST" +static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler ST" diff --git a/tests/AMI/exclusive.conf.xml b/tests/AMI/exclusive.conf.xml index 6724ae56996..33db7f50d83 100644 --- a/tests/AMI/exclusive.conf.xml +++ b/tests/AMI/exclusive.conf.xml @@ -1,5 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/AMI/exclusive.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBclientconnectionhandler ST"/> + <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler ST"/> </ACE_Svc_Conf> diff --git a/tests/AMI/mt_noupcall.conf b/tests/AMI/mt_noupcall.conf new file mode 100644 index 00000000000..1878e4a33c5 --- /dev/null +++ b/tests/AMI/mt_noupcall.conf @@ -0,0 +1,3 @@ +# $Id$ + +static Client_Strategy_Factory '-ORBWaitStrategy mt_noupcall' diff --git a/tests/AMI/muxed.conf b/tests/AMI/muxed.conf index a7f2f5f608a..117767bce28 100644 --- a/tests/AMI/muxed.conf +++ b/tests/AMI/muxed.conf @@ -1,2 +1,3 @@ +# $Id$ -static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED -ORBProfileLock null -ORBClientConnectionHandler ST" +static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED -ORBClientConnectionHandler ST" diff --git a/tests/AMI/muxed.conf.xml b/tests/AMI/muxed.conf.xml index 812cb7376db..cf063034ce0 100644 --- a/tests/AMI/muxed.conf.xml +++ b/tests/AMI/muxed.conf.xml @@ -1,5 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/AMI/muxed.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED -ORBProfileLock null -ORBClientConnectionHandler ST"/> + <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED -ORBClientConnectionHandler ST"/> </ACE_Svc_Conf> diff --git a/tests/AMI/run_mt_noupcall.pl b/tests/AMI/run_mt_noupcall.pl new file mode 100755 index 00000000000..76ce949dbdd --- /dev/null +++ b/tests/AMI/run_mt_noupcall.pl @@ -0,0 +1,82 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +$client_conf = $client->LocalFile ("mt_noupcall$PerlACE::svcconf_ext"); + +$server_debug_level = '0'; +$client_debug_level = '0'; +$iterations = '1'; + +foreach $i (@ARGV) { + if ($i eq '-debug') { + $server_debug_level = '1'; + $client_debug_level = '1'; + } +} + +my $iorbase = "server.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $server_debug_level -o $server_iorfile"); + +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; +} + +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot get file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$CL = $client->CreateProcess ("simple_client", + "-ORBsvcconf $client_conf " + . "-ORBdebuglevel $client_debug_level" + . " -k file://$client_iorfile " + . " -i $iterations -d -x"); + +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval()); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; + $status = 1; +} + +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + $status = 1; +} + +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +exit $status; diff --git a/tests/AMI/run_test.pl b/tests/AMI/run_test.pl index 392e6e68498..29fe59a71aa 100755 --- a/tests/AMI/run_test.pl +++ b/tests/AMI/run_test.pl @@ -13,7 +13,8 @@ my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 fail $client_conf = $client->LocalFile ("muxed$PerlACE::svcconf_ext"); -$debug_level = '0'; +$server_debug_level = '0'; +$client_debug_level = '0'; $iterations = '1'; foreach $i (@ARGV) { @@ -21,7 +22,8 @@ foreach $i (@ARGV) { $client_conf = $client->LocalFile ("muxed$PerlACE::svcconf_ext"); } elsif ($i eq '-debug') { - $debug_level = '1'; + $server_debug_level = '1'; + $client_debug_level = '1'; } elsif ($i eq '-exclusive') { $client_conf = $client->LocalFile ("exclusive$PerlACE::svcconf_ext"); @@ -34,7 +36,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $server_debug_level -o $server_iorfile"); $server_status = $SV->Spawn (); @@ -62,7 +64,7 @@ if ($client->PutFile ($iorbase) == -1) { $CL = $client->CreateProcess ("simple_client", "-ORBsvcconf $client_conf " - . "-ORBdebuglevel $debug_level" + . "-ORBdebuglevel $client_debug_level" . " -k file://$client_iorfile " . " -i $iterations -d"); @@ -77,7 +79,7 @@ if ($client_status != 0) { $CL2 = $client->CreateProcess ("simple_client", "-ORBsvcconf $client_conf" . " -ORBCollocation no" - . " -ORBdebuglevel $debug_level" + . " -ORBdebuglevel $client_debug_level" . " -k file://$client_iorfile " . " -i $iterations -x -d"); diff --git a/tests/AMI/server.conf b/tests/AMI/server.conf index faf9c6c874b..0ce1881ed1c 100644 --- a/tests/AMI/server.conf +++ b/tests/AMI/server.conf @@ -1,3 +1,3 @@ # $Id$ -# + static Server_Strategy_Factory "-ORBconcurrency thread-per-connection" diff --git a/tests/AMI/server.cpp b/tests/AMI/server.cpp index 456eceb946e..18d23928d5c 100644 --- a/tests/AMI/server.cpp +++ b/tests/AMI/server.cpp @@ -19,8 +19,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" -ACE_RCSID(AMI, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int @@ -47,7 +45,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/tests/AMI/simple_client.cpp b/tests/AMI/simple_client.cpp index 7a5dbfd0ccc..0f1ec108585 100644 --- a/tests/AMI/simple_client.cpp +++ b/tests/AMI/simple_client.cpp @@ -16,13 +16,8 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" - #include "ami_testS.h" -ACE_RCSID (AMI, - simple_client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 5; int shutdown_flag = 0; @@ -61,7 +56,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; } @@ -289,8 +284,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } poa_var->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); } diff --git a/tests/AMI_Buffering/AMI_Buffering.cpp b/tests/AMI_Buffering/AMI_Buffering.cpp index 6fe9b1a0db7..1856c608088 100644 --- a/tests/AMI_Buffering/AMI_Buffering.cpp +++ b/tests/AMI_Buffering/AMI_Buffering.cpp @@ -3,8 +3,6 @@ // #include "AMI_Buffering.h" -ACE_RCSID(AMI_Buffering, AMI_Buffering, "$Id$") - AMI_Buffering::AMI_Buffering (CORBA::ORB_ptr orb, Test::AMI_Buffering_Admin_ptr admin) : orb_ (CORBA::ORB::_duplicate (orb)), diff --git a/tests/AMI_Buffering/AMI_Buffering_Admin.cpp b/tests/AMI_Buffering/AMI_Buffering_Admin.cpp index 22ed84d2379..221d36fac3a 100644 --- a/tests/AMI_Buffering/AMI_Buffering_Admin.cpp +++ b/tests/AMI_Buffering/AMI_Buffering_Admin.cpp @@ -3,8 +3,6 @@ // #include "AMI_Buffering_Admin.h" -ACE_RCSID(AMI_Buffering, AMI_Buffering_Admin, "$Id$") - AMI_Buffering_Admin::AMI_Buffering_Admin (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) , request_count_ (0) diff --git a/tests/AMI_Buffering/Client_Task.cpp b/tests/AMI_Buffering/Client_Task.cpp index 70a7d6d3414..560ac417b3b 100644 --- a/tests/AMI_Buffering/Client_Task.cpp +++ b/tests/AMI_Buffering/Client_Task.cpp @@ -4,8 +4,6 @@ #include "Client_Task.h" -ACE_RCSID(AMI_Buffering, Client_Task, "$Id$") - Client_Task::Client_Task (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) , terminate_loop_ (0) diff --git a/tests/AMI_Buffering/Makefile.am b/tests/AMI_Buffering/Makefile.am deleted file mode 100644 index 1b6a636d73a..00000000000 --- a/tests/AMI_Buffering/Makefile.am +++ /dev/null @@ -1,170 +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.AMI_Buffering_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -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) -GC $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.AMI_Buffering_Admin.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += admin - -admin_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -admin_SOURCES = \ - AMI_Buffering_Admin.cpp \ - TestC.cpp \ - TestS.cpp \ - admin.cpp \ - AMI_Buffering_Admin.h - -admin_LDADD = \ - $(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_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 -endif BUILD_AMI - -## Makefile.AMI_Buffering_Client.am - -if BUILD_AMI -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_Task.cpp \ - Reply_Handler.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Client_Task.h \ - Reply_Handler.h - -client_LDADD = \ - $(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_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 -endif BUILD_AMI - -## Makefile.AMI_Buffering_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - AMI_Buffering.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - AMI_Buffering.h - -server_LDADD = \ - $(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_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 -endif BUILD_AMI - -## 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/AMI_Buffering/Reply_Handler.cpp b/tests/AMI_Buffering/Reply_Handler.cpp index 8742d78f98c..e83851109bc 100644 --- a/tests/AMI_Buffering/Reply_Handler.cpp +++ b/tests/AMI_Buffering/Reply_Handler.cpp @@ -3,8 +3,6 @@ // #include "Reply_Handler.h" -ACE_RCSID(AMI_Buffering, Reply_Handler, "$Id$") - Reply_Handler::Reply_Handler (void) { } diff --git a/tests/AMI_Buffering/admin.cpp b/tests/AMI_Buffering/admin.cpp index ca116476ba1..18b21e61445 100644 --- a/tests/AMI_Buffering/admin.cpp +++ b/tests/AMI_Buffering/admin.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(AMI_Buffering, admin, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("admin.ior"); int @@ -30,7 +28,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/tests/AMI_Buffering/client.cpp b/tests/AMI_Buffering/client.cpp index 795fad7a48b..3e722e6dbb0 100644 --- a/tests/AMI_Buffering/client.cpp +++ b/tests/AMI_Buffering/client.cpp @@ -8,8 +8,6 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" -ACE_RCSID(AMI_Buffering, client, "$Id$") - const ACE_TCHAR *server_ior = ACE_TEXT("file://server.ior"); const ACE_TCHAR *admin_ior = ACE_TEXT("file://admin.ior"); int iterations = 20; @@ -86,7 +84,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/tests/AMI_Buffering/server.cpp b/tests/AMI_Buffering/server.cpp index 8c0968041f2..ca15e6184ec 100644 --- a/tests/AMI_Buffering/server.cpp +++ b/tests/AMI_Buffering/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(AMI_Buffering, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); const ACE_TCHAR *ior = ACE_TEXT("file://admin.ior"); @@ -36,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/tests/AMI_Timeouts/Makefile.am b/tests/AMI_Timeouts/Makefile.am deleted file mode 100644 index 4d635e2ac31..00000000000 --- a/tests/AMI_Timeouts/Makefile.am +++ /dev/null @@ -1,137 +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.AMI_Timeouts_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - timeoutC.cpp \ - timeoutC.h \ - timeoutC.inl \ - timeoutS.cpp \ - timeoutS.h \ - timeoutS.inl - -CLEANFILES = \ - timeout-stamp \ - timeoutC.cpp \ - timeoutC.h \ - timeoutC.inl \ - timeoutS.cpp \ - timeoutS.h \ - timeoutS.inl - -timeoutC.cpp timeoutC.h timeoutC.inl timeoutS.cpp timeoutS.h timeoutS.inl: timeout-stamp - -timeout-stamp: $(srcdir)/timeout.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/timeout.idl - @touch $@ - -noinst_HEADERS = \ - timeout.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.AMI_Timeouts_Client.am - -if BUILD_AMI -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 \ - timeoutC.cpp \ - timeoutS.cpp \ - timeout_client.cpp \ - timeout_i.cpp \ - timeout_client.h \ - timeout_i.h - -client_LDADD = \ - $(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_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 -endif BUILD_AMI - -## Makefile.AMI_Timeouts_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - timeoutC.cpp \ - timeoutS.cpp \ - timeout_client.cpp \ - timeout_i.cpp \ - timeout_client.h \ - timeout_i.h - -server_LDADD = \ - $(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_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 -endif BUILD_AMI - -## 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/AMI_Timeouts/client.cpp b/tests/AMI_Timeouts/client.cpp index 64b2aa35e9b..ef9f5991edc 100644 --- a/tests/AMI_Timeouts/client.cpp +++ b/tests/AMI_Timeouts/client.cpp @@ -19,10 +19,6 @@ #include "ace/Get_Opt.h" -ACE_RCSID (AMI, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); unsigned int msec = 50; @@ -55,7 +51,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/tests/AMI_Timeouts/server.cpp b/tests/AMI_Timeouts/server.cpp index 4605335adc1..467f3e5cde5 100644 --- a/tests/AMI_Timeouts/server.cpp +++ b/tests/AMI_Timeouts/server.cpp @@ -16,10 +16,6 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" -ACE_RCSID (AMI, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = 0; int @@ -46,7 +42,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/tests/AMI_Timeouts/svc.conf b/tests/AMI_Timeouts/svc.conf index 644bce82202..8bcf51d9450 100644 --- a/tests/AMI_Timeouts/svc.conf +++ b/tests/AMI_Timeouts/svc.conf @@ -1,2 +1,3 @@ +# $Id$ static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler MT" diff --git a/tests/AMI_Timeouts/timeout.idl b/tests/AMI_Timeouts/timeout.idl index 64aa8c189c5..e6c70e478e6 100644 --- a/tests/AMI_Timeouts/timeout.idl +++ b/tests/AMI_Timeouts/timeout.idl @@ -1,22 +1,17 @@ -// -// $Id$ -// -// ============================================================================ -// -// = LIBRARY -// TAO/tests/AMI_Timeouts -// -// = FILENAME -// timeout.idl -// -// = DESCRIPTION -// Interface of the test CORBA object. -// -// = AUTHOR -// Michael Kircher <Michael.Kircher@mchp.siemens.de> -// -// ============================================================================ +//============================================================================= +/** + * @file timeout.idl + * + * $Id$ + * + * Interface of the test CORBA object. + * + * + * @author Michael Kircher <Michael.Kircher@mchp.siemens.de> + */ +//============================================================================= + interface TimeoutObj { diff --git a/tests/AMI_Timeouts/timeout_client.h b/tests/AMI_Timeouts/timeout_client.h index 126be343504..e554b62ff80 100644 --- a/tests/AMI_Timeouts/timeout_client.h +++ b/tests/AMI_Timeouts/timeout_client.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/AMI_Timeouts -// -// = FILENAME -// timeout_client.h -// -// = DESCRIPTION -// Tests timeouts with AMI. -// -// = AUTHOR -// Michael Kircher <Michael.Kircher@mchp.siemens.de> -// -// ============================================================================ + +//============================================================================= +/** + * @file timeout_client.h + * + * $Id$ + * + * Tests timeouts with AMI. + * + * + * @author Michael Kircher <Michael.Kircher@mchp.siemens.de> + */ +//============================================================================= + #include "ace/Task.h" diff --git a/tests/AMI_Timeouts/timeout_i.cpp b/tests/AMI_Timeouts/timeout_i.cpp index fc67d8d8f09..9064b6ca9f0 100644 --- a/tests/AMI_Timeouts/timeout_i.cpp +++ b/tests/AMI_Timeouts/timeout_i.cpp @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/AMI_Timeouts -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// Implements the timeout CORBA Object and its reply handler. -// -// = AUTHOR -// Michael Kircher <Michael.Kircher@mchp.siemens.de> -// -// ============================================================================ + +//============================================================================= +/** + * @file timeout_i.cpp + * + * $Id$ + * + * Implements the timeout CORBA Object and its reply handler. + * + * + * @author Michael Kircher <Michael.Kircher@mchp.siemens.de> + */ +//============================================================================= + #include "timeout_i.h" #include "ace/OS_NS_unistd.h" diff --git a/tests/AMI_Timeouts/timeout_i.h b/tests/AMI_Timeouts/timeout_i.h index cde9fbcea71..3b7c7996303 100644 --- a/tests/AMI_Timeouts/timeout_i.h +++ b/tests/AMI_Timeouts/timeout_i.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/AMI_Timeouts -// -// = FILENAME -// timeout_i.h -// -// = DESCRIPTION -// Implements the CORBA object. -// -// = AUTHOR -// Michael Kircher <Michael.Kircher@mchp.siemens.de> -// -// ============================================================================ + +//============================================================================= +/** + * @file timeout_i.h + * + * $Id$ + * + * Implements the CORBA object. + * + * + * @author Michael Kircher <Michael.Kircher@mchp.siemens.de> + */ +//============================================================================= + #ifndef TIMEOUT_I_H #define TIMEOUT_I_H diff --git a/tests/Abstract_Interface/Makefile.am b/tests/Abstract_Interface/Makefile.am deleted file mode 100644 index d6dd9c6d02d..00000000000 --- a/tests/Abstract_Interface/Makefile.am +++ /dev/null @@ -1,114 +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.Abstract_Interface_Idl.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_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.Abstract_Interface_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 \ - testC.cpp \ - testC.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Abstract_Interface_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - testC.h \ - testS.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/tests/Abstract_Interface/client.cpp b/tests/Abstract_Interface/client.cpp index c4a678fc71a..f9ce8e86e83 100644 --- a/tests/Abstract_Interface/client.cpp +++ b/tests/Abstract_Interface/client.cpp @@ -1,12 +1,9 @@ +// -*- C++ -*- // $Id$ #include "testC.h" #include "ace/Get_Opt.h" -ACE_RCSID (Abstract_Interface, - client, - "$Id$") - const ACE_TCHAR *ior_input_file = ACE_TEXT ("file://test.ior"); int debug = 0; @@ -53,7 +50,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } @@ -65,14 +62,14 @@ dump_node (BaseNode* bn, int indent) return; } - // This is ugly I know - int i = indent; - for (; i != 0; --i) ACE_DEBUG ((LM_DEBUG, " ")); - StringNode* sn = StringNode::_downcast (bn); if (debug) { + // This is ugly I know + int i = indent; + for (; i != 0; --i) ACE_DEBUG ((LM_DEBUG, " ")); + if (sn != 0) { ACE_DEBUG ((LM_DEBUG, "%x <StringNode> %C\n", @@ -280,10 +277,21 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (which_test == TEST_EXCEPTION || which_test == TEST_ALL) { - which_test = TEST_EXCEPTION; test_exception (package.in ()); } + if (which_test == TEST_ALL) + { + objref->pass_nil (package.out ()); + + if (!CORBA::is_nil (package.in ())) + { + ACE_ERROR_RETURN ((LM_ERROR, + "pass_nil() did NOT return null OUT arg\n"), + -1); + } + } + objref->shutdown (); orb->destroy (); diff --git a/tests/Abstract_Interface/server.cpp b/tests/Abstract_Interface/server.cpp index f9d003d7fda..5a825efcfce 100644 --- a/tests/Abstract_Interface/server.cpp +++ b/tests/Abstract_Interface/server.cpp @@ -1,13 +1,10 @@ +// -*- C++ -*- // $Id$ #include "test_i.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Abstract_Interface, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Abstract_Interface/test.idl b/tests/Abstract_Interface/test.idl index c5b5643405a..6a5d9ec4a1c 100644 --- a/tests/Abstract_Interface/test.idl +++ b/tests/Abstract_Interface/test.idl @@ -21,6 +21,7 @@ interface passer { void pass_ops (out base outarg); void pass_state (out base outarg); + void pass_nil (out base outarg); oneway void shutdown (); }; diff --git a/tests/Abstract_Interface/test_i.cpp b/tests/Abstract_Interface/test_i.cpp index 7e9c8163f92..57480795547 100644 --- a/tests/Abstract_Interface/test_i.cpp +++ b/tests/Abstract_Interface/test_i.cpp @@ -1,13 +1,9 @@ +// -*- C++ -*- // $Id$ #include "test_i.h" #include "ace/OS_NS_string.h" - -ACE_RCSID (Abstract_Interface, - test_i, - "$Id$") - char * foo_i::foo_op (const char * inarg) { @@ -100,3 +96,9 @@ passer_i::pass_state (base_out outarg) outarg = tc._retn (); } + +void +passer_i::pass_nil (base_out outarg) +{ + outarg = foo::_nil (); +} diff --git a/tests/Abstract_Interface/test_i.h b/tests/Abstract_Interface/test_i.h index 855edd98712..90fae856475 100644 --- a/tests/Abstract_Interface/test_i.h +++ b/tests/Abstract_Interface/test_i.h @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ #ifndef TAO_TEST_I_H @@ -21,6 +22,8 @@ public: virtual void pass_state (base_out outarg); + virtual void pass_nil (base_out outarg); + virtual void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/tests/Alt_Mapping/alt_mapping.mpc b/tests/Alt_Mapping/alt_mapping.mpc index 8451f327917..5e572ff5a05 100644 --- a/tests/Alt_Mapping/alt_mapping.mpc +++ b/tests/Alt_Mapping/alt_mapping.mpc @@ -8,7 +8,7 @@ project(*idl): taoidldefaults { -Wb,stub_export_include=alt_mapping_stub_export.h \ -Wb,skel_export_macro=ALT_MAPPING_SKEL_Export \ -Wb,skel_export_include=alt_mapping_skel_export.h \ - -Gxhst -Gxhsk -Gstl + -Gxhst -Gxhsk alt_mapping.idl } custom_only = 1 diff --git a/tests/Alt_Mapping/alt_mapping_i.cpp b/tests/Alt_Mapping/alt_mapping_i.cpp index 0d14e960a4c..908096ebc93 100644 --- a/tests/Alt_Mapping/alt_mapping_i.cpp +++ b/tests/Alt_Mapping/alt_mapping_i.cpp @@ -1,14 +1,14 @@ -// $Id$ - -// ============================================================================ -// -// = FILENAME -// alt_mapping_i.cpp -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ + +//============================================================================= +/** + * @file alt_mapping_i.cpp + * + * $Id$ + * + * @author Jeff Parsons + */ +//============================================================================= + #include "alt_mapping_i.h" diff --git a/tests/Alt_Mapping/alt_mapping_i.h b/tests/Alt_Mapping/alt_mapping_i.h index 6c96dbe120f..2ac152c9ccb 100644 --- a/tests/Alt_Mapping/alt_mapping_i.h +++ b/tests/Alt_Mapping/alt_mapping_i.h @@ -1,14 +1,14 @@ -// $Id$ -// ============================================================================ -// -// = FILENAME -// alt_mapping_i.h -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ +//============================================================================= +/** + * @file alt_mapping_i.h + * + * $Id$ + * + * @author Jeff Parsons + */ +//============================================================================= + #ifndef ALT_MAPPING_I_H #define ALT_MAPPING_I_H @@ -17,10 +17,6 @@ class ALT_MAPPING_SKEL_Export Alt_Mapping_i : public POA_Alt_Mapping { - // = TITLE - // Alt_Mapping_i - // = DESCRIPTION - // Implementation of the Alt_Mapping_i test suite. public: Alt_Mapping_i (CORBA::ORB_ptr orb); diff --git a/tests/Alt_Mapping/client.cpp b/tests/Alt_Mapping/client.cpp index b5e936b6e3c..5f8672c0382 100644 --- a/tests/Alt_Mapping/client.cpp +++ b/tests/Alt_Mapping/client.cpp @@ -1,18 +1,18 @@ -// $Id$ - -// ============================================================================ -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// This file contains the implementation of the client-side of the -// Alt_Mapping application. -// -// = AUTHORS -// Jeff Parsons -// -// ============================================================================ + +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * This file contains the implementation of the client-side of the + * Alt_Mapping application. + * + * + * @author Jeff Parsons + */ +//============================================================================= + #ifndef CLIENT_CPP #define CLIENT_CPP @@ -145,7 +145,7 @@ Alt_Mapping_Client<T>::run_sii_test (void) "********** Finished running %s SII *********\n", opname)); } - + return this->results_.error_count () ? -1 : 0; } diff --git a/tests/Alt_Mapping/client.h b/tests/Alt_Mapping/client.h index acdb2a18612..fe39af905ca 100644 --- a/tests/Alt_Mapping/client.h +++ b/tests/Alt_Mapping/client.h @@ -1,21 +1,17 @@ -// -*- c++ -*- -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Alt_Mapping_Test -// -// = FILENAME -// client.h -// -// = DESCRIPTION -// Header file for the Alt_Mapping_Test client application. -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ +//============================================================================= +/** + * @file client.h + * + * $Id$ + * + * Header file for the Alt_Mapping_Test client application. + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef ALT_MAPPING_CLIENT_H #define ALT_MAPPING_CLIENT_H @@ -24,18 +20,20 @@ #include "alt_mappingC.h" #include "results.h" +/** + * @class Alt_Mapping_Client + * + * @brief Alt_Mapping_Client + * + * This class declares an interface to run the example client for + * Alt_Mapping CORBA server. All the complexity for initializing + * the client is hidden in the class. Just the run () interface + * is needed. The template class does the specific work of making + * the request of the desired data type + */ template <class T> class Alt_Mapping_Client { - // = TITLE - // Alt_Mapping_Client - // - // = DESCRIPTION - // This class declares an interface to run the example client for - // Alt_Mapping CORBA server. All the complexity for initializing - // the client is hidden in the class. Just the run () interface - // is needed. The template class does the specific work of making - // the request of the desired data type public: typedef T TEST_OBJECT; @@ -46,21 +44,21 @@ public: ~Alt_Mapping_Client (void); + /// run the SII test int run_sii_test (void); - // run the SII test private: + /// underlying ORB CORBA::ORB_ptr orb_; - // underlying ORB + /// alt mapping object reference Alt_Mapping_ptr alt_mapping_test_; - // alt mapping object reference + /// object doing the actual work TEST_OBJECT *test_object_; - // object doing the actual work + /// results Results results_; - // results }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/tests/Alt_Mapping/driver.cpp b/tests/Alt_Mapping/driver.cpp index 65a399de294..5632196412c 100644 --- a/tests/Alt_Mapping/driver.cpp +++ b/tests/Alt_Mapping/driver.cpp @@ -1,17 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = FILENAME -// driver.cpp -// -// = DESCRIPTION -// Driver program -// -// = AUTHORS -// Jeff Parsons -// -// ============================================================================ + +//============================================================================= +/** + * @file driver.cpp + * + * $Id$ + * + * Driver program + * + * + * @author Jeff Parsons + */ +//============================================================================= + #include "client.h" #include "driver.h" @@ -130,7 +130,7 @@ Driver::run (void) new Test_Unbounded_String); retstatus = client->run_sii_test (); - + delete client; } break; @@ -142,9 +142,9 @@ Driver::run (void) this->orb_.in (), this->objref_.in (), new Test_Unbounded_Struct_Sequence); - + retstatus = client->run_sii_test (); - + delete client; } break; diff --git a/tests/Alt_Mapping/driver.h b/tests/Alt_Mapping/driver.h index 0b670df7541..e20e146ca7d 100644 --- a/tests/Alt_Mapping/driver.h +++ b/tests/Alt_Mapping/driver.h @@ -1,21 +1,17 @@ -// -*- c++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// driver.h -// -// = DESCRIPTION -// Header file for the driver program. The driver is a singleton. -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file driver.h + * + * $Id$ + * + * Header file for the driver program. The driver is a singleton. + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef DRIVER_H #define DRIVER_H @@ -23,30 +19,32 @@ #include "options.h" #include "alt_mappingC.h" +/** + * @class Driver + * + * @brief Driver + * + * Driver program for the client + */ class Driver { - // = TITLE - // Driver - // - // = DESCRIPTION - // Driver program for the client public: // = Constructor and destructor. Driver (void); ~Driver (void); + /// Initialize the driver object int init (int argc, ACE_TCHAR **argv); - // Initialize the driver object + /// Execute client example code. int run (void); - // Execute client example code. private: + /// underlying ORB (we do not own it) CORBA::ORB_var orb_; - // underlying ORB (we do not own it) + /// object reference (we do not own it) Alt_Mapping_var objref_; - // object reference (we do not own it) }; #endif /* !defined */ diff --git a/tests/Alt_Mapping/helper.cpp b/tests/Alt_Mapping/helper.cpp index b6484a8e860..e66b489e915 100644 --- a/tests/Alt_Mapping/helper.cpp +++ b/tests/Alt_Mapping/helper.cpp @@ -1,18 +1,18 @@ -// $Id$ - -// ============================================================================ -// -// = FILENAME -// helper.cpp -// -// = DESCRIPTION -// Defines a helper class that can generate values for the parameters used -// for the Alt_Mapping example -// -// = AUTHORS -// Jeff Parsons -// -// ============================================================================ + +//============================================================================= +/** + * @file helper.cpp + * + * $Id$ + * + * Defines a helper class that can generate values for the parameters used + * for the Alt_Mapping example + * + * + * @author Jeff Parsons + */ +//============================================================================= + #include "helper.h" #include "ace/OS_NS_ctype.h" diff --git a/tests/Alt_Mapping/helper.h b/tests/Alt_Mapping/helper.h index 8ef8cc3bf99..62730d343e6 100644 --- a/tests/Alt_Mapping/helper.h +++ b/tests/Alt_Mapping/helper.h @@ -1,21 +1,18 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// helper.h -// -// = DESCRIPTION -// Defines a helper class that can generate values for the parameters used -// for the Param_Test example -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file helper.h + * + * $Id$ + * + * Defines a helper class that can generate values for the parameters used + * for the Param_Test example + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef HELPER_H #define HELPER_H @@ -38,7 +35,7 @@ public: CORBA::WChar* gen_wstring (void); CORBA::WChar* gen_wstring (int maxlength); const Alt_Mapping::Fixed_Struct gen_fixed_struct (void); - + private: Alt_Mapping::Fixed_Struct fixed_struct_; }; diff --git a/tests/Alt_Mapping/options.cpp b/tests/Alt_Mapping/options.cpp index a596d929555..ea92667f54e 100644 --- a/tests/Alt_Mapping/options.cpp +++ b/tests/Alt_Mapping/options.cpp @@ -1,4 +1,4 @@ -// $Id$ +// -*- C++ -*- // ============================================================================ // @@ -16,6 +16,7 @@ // // ============================================================================ + #include "options.h" #include "tao/debug.h" #include "ace/Read_Buffer.h" diff --git a/tests/Alt_Mapping/options.h b/tests/Alt_Mapping/options.h index 8002cafc481..30c882358bc 100644 --- a/tests/Alt_Mapping/options.h +++ b/tests/Alt_Mapping/options.h @@ -1,21 +1,17 @@ -// -*- c++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// options.h -// -// = DESCRIPTION -// Options for the Param_Test application -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file options.h + * + * $Id$ + * + * Options for the Param_Test application + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef OPTIONS_H #define OPTIONS_H @@ -51,54 +47,54 @@ public: DII }; + /// constructor Options (void); - // constructor + /// destructor ~Options (void); - // destructor + /// Parses the arguments passed on the command line. int parse_args (int argc, ACE_TCHAR **argv); - // Parses the arguments passed on the command line. + /// return the IOR for the servant char const * param_test_ior (void) const; - // return the IOR for the servant + /// what test to run TEST_TYPE test_type (void); - // what test to run + /// whether to use SII or DII INVOKE_TYPE invoke_type (void); - // whether to use SII or DII + /// number of times to run the test CORBA::ULong loop_count (void); - // number of times to run the test + /// whether debug option is on or not CORBA::Boolean debug (void) const; - // whether debug option is on or not + /// If we should request the server to shutdown. CORBA::Boolean shutdown (void) const; - // If we should request the server to shutdown. private: + /// Function to read the servant IOR from a file. int read_ior (ACE_TCHAR *filename); - // Function to read the servant IOR from a file. + /// IOR for the servant CORBA::String_var ior_; - // IOR for the servant + /// what test to run TEST_TYPE test_type_; - // what test to run + /// whether SII or DII INVOKE_TYPE invoke_type_; - // whether SII or DII + /// Number of times to do the "test_*" operations. CORBA::ULong loop_count_; - // Number of times to do the "test_*" operations. + /// debugging output values CORBA::Boolean debug_; - // debugging output values + /// server shutdown flag. CORBA::Boolean shutdown_; - // server shutdown flag. }; typedef ACE_Singleton<Options, TAO_SYNCH_RECURSIVE_MUTEX> OPTIONS; diff --git a/tests/Alt_Mapping/results.cpp b/tests/Alt_Mapping/results.cpp index 56d38e2a92e..d196920829c 100644 --- a/tests/Alt_Mapping/results.cpp +++ b/tests/Alt_Mapping/results.cpp @@ -1,17 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = FILENAME -// results.cpp -// -// = DESCRIPTION -// Printing the results -// -// = AUTHORS -// Jeff Parsons -// -// ============================================================================ + +//============================================================================= +/** + * @file results.cpp + * + * $Id$ + * + * Printing the results + * + * + * @author Jeff Parsons + */ +//============================================================================= + #include "results.h" #include "tao/debug.h" diff --git a/tests/Alt_Mapping/results.h b/tests/Alt_Mapping/results.h index e04e26e5f3c..65c490debd4 100644 --- a/tests/Alt_Mapping/results.h +++ b/tests/Alt_Mapping/results.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// results.h -// -// = DESCRIPTION -// Printing the results -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file results.h + * + * $Id$ + * + * Printing the results + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef RESULTS_H #define RESULTS_H @@ -38,51 +35,51 @@ TAO_END_VERSIONED_NAMESPACE_DECL class Results { public: + /// ctor Results (void); - // ctor + /// destructor ~Results (void); - // destructor + /// prints the time stats void print_stats (void); - // prints the time stats + /// print the exception void print_exception (const char *call_name); - // print the exception + /// start timing void start_timer (void); - // start timing + /// stop timing void stop_timer (void); - // stop timing + /// return call count CORBA::ULong call_count (void); - // return call count + /// set the call count void call_count (CORBA::ULong); - // set the call count + /// return the error count CORBA::ULong error_count (void); - // return the error count + /// set error count void error_count (CORBA::ULong); - // set error count + /// set the number of times the test will be run void iterations (CORBA::ULong iters); - // set the number of times the test will be run private: + /// # of calls made to functions CORBA::ULong call_count_; - // # of calls made to functions + /// # of errors incurred in the lifetime of the application. CORBA::ULong error_count_; - // # of errors incurred in the lifetime of the application. + /// for timing the test ACE_Profile_Timer timer_; - // for timing the test + /// holds the elapsed time for each iteration ACE_Profile_Timer::ACE_Elapsed_Time *elapsed_time_; - // holds the elapsed time for each iteration }; #endif /* RESULTS_H */ diff --git a/tests/Alt_Mapping/server.cpp b/tests/Alt_Mapping/server.cpp index 4532a55a5cf..25135306105 100644 --- a/tests/Alt_Mapping/server.cpp +++ b/tests/Alt_Mapping/server.cpp @@ -1,17 +1,14 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// server.cpp -// -// = AUTHOR -// Jeff Parsons -// -// ============================================================================ + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * @author Jeff Parsons + */ +//============================================================================= + #include "alt_mapping_i.h" #include "tao/Codeset/Codeset.h" @@ -146,7 +143,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) userex._tao_print_exception ("User Exception"); return -1; } - + /// Free resources. delete svnt; diff --git a/tests/Alt_Mapping/tests.h b/tests/Alt_Mapping/tests.h index 24df56f20bb..f240a50a308 100644 --- a/tests/Alt_Mapping/tests.h +++ b/tests/Alt_Mapping/tests.h @@ -1,17 +1,17 @@ -// $Id$ -// ============================================================================ -// -// = FILENAME -// tests.h -// -// = DESCRIPTION -// All the test objects header files included here -// -// = AUTHORS -// Jeff Parsons -// -// ============================================================================ +//============================================================================= +/** + * @file tests.h + * + * $Id$ + * + * All the test objects header files included here + * + * + * @author Jeff Parsons + */ +//============================================================================= + #ifndef TESTS_H #define TESTS_H diff --git a/tests/Alt_Mapping/ub_string.cpp b/tests/Alt_Mapping/ub_string.cpp index f37a20423fb..155114be13c 100644 --- a/tests/Alt_Mapping/ub_string.cpp +++ b/tests/Alt_Mapping/ub_string.cpp @@ -1,4 +1,3 @@ -// $Id$ // ============================================================================ // @@ -16,6 +15,7 @@ // // ============================================================================ + #include "helper.h" #include "ub_string.h" @@ -47,7 +47,7 @@ Test_Unbounded_String::init_parameters (Alt_Mapping_ptr) this->in_ = gen->gen_string (); this->inout_ = this->in_.c_str (); - + return 0; } @@ -57,7 +57,7 @@ Test_Unbounded_String::reset_parameters (void) this->inout_ = this->in_.c_str (); this->out_.clear (); this->ret_.clear (); - + return 0; } @@ -76,7 +76,7 @@ Test_Unbounded_String::run_sii_test (Alt_Mapping_ptr objref) { ex._tao_print_exception ("Test_Unbounded_String::run_sii_test\n"); } - + return -1; } @@ -87,7 +87,7 @@ Test_Unbounded_String::check_validity (void) std::string first_half = this->inout_.substr (0, len); std::string second_half = this->inout_.substr (len, len); - + return (this->in_ == this->out_ && this->in_ == this->ret_ && this->inout_.length () == 2 * len diff --git a/tests/Alt_Mapping/ub_string.h b/tests/Alt_Mapping/ub_string.h index d61e2337155..274b434e70a 100644 --- a/tests/Alt_Mapping/ub_string.h +++ b/tests/Alt_Mapping/ub_string.h @@ -1,9 +1,8 @@ -// $Id$ // ============================================================================ // // = LIBRARY -// TAO/tests/Param_Test +// TAO/tests/Alt_Mapping // // = FILENAME // unbounded_string.h @@ -28,37 +27,37 @@ class Test_Unbounded_String { public: + /// ctor Test_Unbounded_String (void); - // ctor + /// dtor ~Test_Unbounded_String (void); - // dtor + /// run the SII test int run_sii_test (Alt_Mapping_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Alt_Mapping_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values private: + /// operation name char *opname_; - // operation name - + std::string in_; std::string inout_; std::string out_; diff --git a/tests/Alt_Mapping/ub_struct_seq.cpp b/tests/Alt_Mapping/ub_struct_seq.cpp index 946f29bbed3..87b1dcb498b 100644 --- a/tests/Alt_Mapping/ub_struct_seq.cpp +++ b/tests/Alt_Mapping/ub_struct_seq.cpp @@ -1,4 +1,3 @@ -// $Id$ // ============================================================================ // @@ -17,6 +16,7 @@ // // ============================================================================ + #include "helper.h" #include "ub_struct_seq.h" @@ -54,7 +54,7 @@ Test_Unbounded_Struct_Sequence::init_parameters (Alt_Mapping_ptr) // set the length of the sequence this->in_.resize (len); this->inout_.resize (len); - + // Now set each individual element. for (CORBA::ULong i = 0; i < this->in_.size (); i++) { @@ -63,7 +63,7 @@ Test_Unbounded_Struct_Sequence::init_parameters (Alt_Mapping_ptr) this->in_[i] = gen->gen_fixed_struct (); this->inout_[i] = gen->gen_fixed_struct (); } - + return 0; } @@ -73,7 +73,7 @@ Test_Unbounded_Struct_Sequence::reset_parameters (void) this->inout_.clear (); this->out_.clear (); this->ret_.clear (); - + return 0; } @@ -134,15 +134,15 @@ Test_Unbounded_Struct_Sequence::compare ( { ACE_CDR::ULong s1v = s1.capacity (); ACE_CDR::ULong s2v = s2.capacity (); - + if (s1v != s2v) { return false; } - + s1v = s1.size (); - s2v = s2.size (); - + s2v = s2.size (); + if (s1v != s2v) { return false; @@ -157,9 +157,9 @@ Test_Unbounded_Struct_Sequence::compare ( || vs1.c != vs2.c || vs1.s != vs2.s || vs1.o != vs2.o - || vs1.f != vs2.f + || !ACE::is_equal (vs1.f, vs2.f) || vs1.b != vs2.b - || vs1.d != vs2.d ) + || !ACE::is_equal (vs1.d, vs2.d)) return false; } @@ -176,7 +176,7 @@ Test_Unbounded_Struct_Sequence::print_sequence ( s.capacity (), s.size ())); ACE_DEBUG ((LM_DEBUG, "Elements -\n")); - + for (CORBA::ULong i = 0; i < s.size (); i++) { const Alt_Mapping::Fixed_Struct& vs = s[i]; diff --git a/tests/Alt_Mapping/ub_struct_seq.h b/tests/Alt_Mapping/ub_struct_seq.h index a85f78c7d5b..5d388e1fe66 100644 --- a/tests/Alt_Mapping/ub_struct_seq.h +++ b/tests/Alt_Mapping/ub_struct_seq.h @@ -1,4 +1,3 @@ -// $Id$ // ============================================================================ // @@ -17,6 +16,7 @@ // // ============================================================================ + #ifndef ALT_MAPPING_TEST_UNBOUNED_STRUCT_SEQUENCE_H #define ALT_MAPPING_TEST_UNBOUNED_STRUCT_SEQUENCE_H @@ -29,37 +29,37 @@ class Test_Unbounded_Struct_Sequence { public: + /// ctor Test_Unbounded_Struct_Sequence (void); - // ctor + /// dtor ~Test_Unbounded_Struct_Sequence (void); - // dtor + /// run the SII test int run_sii_test (Alt_Mapping_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Alt_Mapping_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// print all the values void print_values (void); - // print all the values protected: + /// compare CORBA::Boolean compare (const Alt_Mapping::StructSeq &s1, const Alt_Mapping::StructSeq &s2); - // compare + /// print individual sequence void print_sequence (const Alt_Mapping::StructSeq &s); - // print individual sequence private: char *opname_; diff --git a/tests/Any/Makefile.am b/tests/Any/Makefile.am deleted file mode 100644 index 3f2d34af807..00000000000 --- a/tests/Any/Makefile.am +++ /dev/null @@ -1,13 +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 = \ - Recursive - diff --git a/tests/Any/Recursive/Hello.cpp b/tests/Any/Recursive/Hello.cpp index eb2603dd591..46043d0d3ee 100644 --- a/tests/Any/Recursive/Hello.cpp +++ b/tests/Any/Recursive/Hello.cpp @@ -2,12 +2,6 @@ #include "Hello.h" - -ACE_RCSID (Recursive, - Hello, - "$Id$") - - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Any/Recursive/Makefile.am b/tests/Any/Recursive/Makefile.am deleted file mode 100644 index 7621c59fd2d..00000000000 --- a/tests/Any/Recursive/Makefile.am +++ /dev/null @@ -1,143 +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 = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.RecursiveHello_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - NonRecursiveC.cpp \ - NonRecursiveC.h \ - NonRecursiveC.inl \ - NonRecursiveS.cpp \ - NonRecursiveS.h \ - NonRecursiveS.inl - -CLEANFILES += \ - NonRecursive-stamp \ - NonRecursiveC.cpp \ - NonRecursiveC.h \ - NonRecursiveC.inl \ - NonRecursiveS.cpp \ - NonRecursiveS.h \ - NonRecursiveS.inl - -NonRecursiveC.cpp NonRecursiveC.h NonRecursiveC.inl NonRecursiveS.cpp NonRecursiveS.h NonRecursiveS.inl: NonRecursive-stamp - -NonRecursive-stamp: $(srcdir)/NonRecursive.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/NonRecursive.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) $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - NonRecursive.idl \ - Test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.RecursiveHello_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - NonRecursiveC.cpp \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.RecursiveHello_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - NonRecursiveC.cpp \ - NonRecursiveS.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/tests/Any/Recursive/client.cpp b/tests/Any/Recursive/client.cpp index 2f966550e93..24e41ef04df 100644 --- a/tests/Any/Recursive/client.cpp +++ b/tests/Any/Recursive/client.cpp @@ -9,12 +9,6 @@ #include <algorithm> #include <functional> - -ACE_RCSID (Recursive, - client, - "$Id$") - - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/tests/Any/Recursive/server.cpp b/tests/Any/Recursive/server.cpp index c1d8bd1bb30..ab19d0fb0a7 100644 --- a/tests/Any/Recursive/server.cpp +++ b/tests/Any/Recursive/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +28,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/tests/BiDirectional/Makefile.am b/tests/BiDirectional/Makefile.am deleted file mode 100644 index 2113bfae39e..00000000000 --- a/tests/BiDirectional/Makefile.am +++ /dev/null @@ -1,117 +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.BiDirectional_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.BiDirectional_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 \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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.BiDirectional_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/BiDirectional/client.cpp b/tests/BiDirectional/client.cpp index 96d755b73fe..b950587ff83 100644 --- a/tests/BiDirectional/client.cpp +++ b/tests/BiDirectional/client.cpp @@ -5,8 +5,6 @@ #include "tao/BiDir_GIOP/BiDirGIOP.h" #include "tao/AnyTypeCode/Any.h" -ACE_RCSID(BiDirectional, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); void do_nothing (void) @@ -35,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/tests/BiDirectional/server.cpp b/tests/BiDirectional/server.cpp index f573b1c6084..73dc9849790 100644 --- a/tests/BiDirectional/server.cpp +++ b/tests/BiDirectional/server.cpp @@ -6,8 +6,6 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(BiDirectional, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int no_iterations = 10; @@ -36,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/tests/BiDirectional/test_i.cpp b/tests/BiDirectional/test_i.cpp index 1759a635cfc..7f25ec3f471 100644 --- a/tests/BiDirectional/test_i.cpp +++ b/tests/BiDirectional/test_i.cpp @@ -11,8 +11,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(BiDirectional, test_i, "$Id$") - void Callback_i::shutdown (void) { diff --git a/tests/BiDirectional/test_i.h b/tests/BiDirectional/test_i.h index cc4725dc141..3914ef78a3e 100644 --- a/tests/BiDirectional/test_i.h +++ b/tests/BiDirectional/test_i.h @@ -1,59 +1,58 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/BiDirectional -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Balachandran Natarajan <bala@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Balachandran Natarajan <bala@cs.wustl.edu> + */ +//============================================================================= + #ifndef TAO_BIDIRECTIONAL_TEST_I_H #define TAO_BIDIRECTIONAL_TEST_I_H #include "testS.h" +/** + * @class Callback_i + * + * @brief A callback object to the "client" + * + * To test that the server can call the client on the same + * connection that was established by the client + */ class Callback_i : public POA_Callback { - // = TITLE - // A callback object to the "client" - // - // = DESCRIPTION - // To test that the server can call the client on the same - // connection that was established by the client - // public: + /// ctor Callback_i (CORBA::ORB_ptr orb); - // ctor + /// Safe way to shutdown void shutdown (void); - // Safe way to shutdown + /// The callback method void callback_method (void); - // The callback method private: + /// The orb CORBA::ORB_var orb_; - // The orb }; +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations); - // ctor // = The Simple_Server methods. CORBA::Long test_method (CORBA::Boolean do_callback); @@ -65,17 +64,17 @@ public: int call_client (void); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB + /// Flag to indicate, whether we are ready for a remote call. int flag_; - // Flag to indicate, whether we are ready for a remote call. + /// Callback Object Callback_var callback_; - // Callback Object + /// Number of times the callback needs to be called int no_iterations_; - // Number of times the callback needs to be called }; #if defined(__ACE_INLINE__) diff --git a/tests/BiDirectional_DelayedUpcall/Makefile.am b/tests/BiDirectional_DelayedUpcall/Makefile.am deleted file mode 100644 index 4666df50125..00000000000 --- a/tests/BiDirectional_DelayedUpcall/Makefile.am +++ /dev/null @@ -1,117 +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.BiDir_DelayedUpcall_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.BiDir_DelayedUpcall_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 \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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.BiDir_DelayedUpcall_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/BiDirectional_DelayedUpcall/client.cpp b/tests/BiDirectional_DelayedUpcall/client.cpp index b93c837c726..63e24ba38f8 100644 --- a/tests/BiDirectional_DelayedUpcall/client.cpp +++ b/tests/BiDirectional_DelayedUpcall/client.cpp @@ -6,8 +6,6 @@ #include "tao/BiDir_GIOP/BiDirGIOP.h" #include "tao/AnyTypeCode/Any.h" -ACE_RCSID(BiDirectional, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); void do_nothing (void) @@ -36,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/tests/BiDirectional_DelayedUpcall/server.cpp b/tests/BiDirectional_DelayedUpcall/server.cpp index 08ee5eb5188..1bea3072543 100644 --- a/tests/BiDirectional_DelayedUpcall/server.cpp +++ b/tests/BiDirectional_DelayedUpcall/server.cpp @@ -6,8 +6,6 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(BiDirectional, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int no_iterations = 10; @@ -36,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/tests/BiDirectional_DelayedUpcall/test_i.cpp b/tests/BiDirectional_DelayedUpcall/test_i.cpp index c591ab2b419..df7de9fe6bd 100644 --- a/tests/BiDirectional_DelayedUpcall/test_i.cpp +++ b/tests/BiDirectional_DelayedUpcall/test_i.cpp @@ -11,8 +11,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$") - void Callback_i::shutdown (void) { diff --git a/tests/BiDirectional_DelayedUpcall/test_i.h b/tests/BiDirectional_DelayedUpcall/test_i.h index ba1f46f4764..3a4bc82f063 100644 --- a/tests/BiDirectional_DelayedUpcall/test_i.h +++ b/tests/BiDirectional_DelayedUpcall/test_i.h @@ -1,17 +1,14 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/BiDirectional -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Balachandran Natarajan <bala@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Balachandran Natarajan <bala@cs.wustl.edu> + */ +//============================================================================= + #ifndef TAO_BIDIRECTIONAL_TEST_I_H #define TAO_BIDIRECTIONAL_TEST_I_H @@ -19,43 +16,45 @@ #include "testS.h" #include "ace/Event_Handler.h" +/** + * @class Callback_i + * + * @brief A callback object to the "client" + * + * To test that the server can call the client on the same + * connection that was established by the client + */ class Callback_i : public virtual POA_Callback { - // = TITLE - // A callback object to the "client" - // - // = DESCRIPTION - // To test that the server can call the client on the same - // connection that was established by the client - // public: + /// ctor Callback_i (CORBA::ORB_ptr orb, Simple_Server_ptr srv); - // ctor + /// Safe way to shutdown void shutdown (void); - // Safe way to shutdown + /// The callback method void callback_method (void); - // The callback method private: + /// The orb + /// The server CORBA::ORB_var orb_; - // The orb Simple_Server_var server_; - // The server }; +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public virtual POA_Simple_Server, public virtual ACE_Event_Handler { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations); - // ctor // = The Simple_Server methods. CORBA::Long test_method (CORBA::Boolean do_callback); @@ -68,17 +67,17 @@ public: const void *act = 0); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB + /// Flag to indicate, whether we are ready for a remote call. int flag_; - // Flag to indicate, whether we are ready for a remote call. + /// Callback Object Callback_var callback_; - // Callback Object + /// Number of times the callback needs to be called int no_iterations_; - // Number of times the callback needs to be called }; #if defined(__ACE_INLINE__) diff --git a/tests/BiDirectional_MultipleORB/Makefile.am b/tests/BiDirectional_MultipleORB/Makefile.am deleted file mode 100644 index 99a47f9ef1d..00000000000 --- a/tests/BiDirectional_MultipleORB/Makefile.am +++ /dev/null @@ -1,49 +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.destroy.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = destroy - -destroy_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -destroy_SOURCES = \ - destroy.cpp - -destroy_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/BiDirectional_MultipleORB/destroy.cpp b/tests/BiDirectional_MultipleORB/destroy.cpp index ed26ffa83ff..718576ac8a1 100644 --- a/tests/BiDirectional_MultipleORB/destroy.cpp +++ b/tests/BiDirectional_MultipleORB/destroy.cpp @@ -1,28 +1,24 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/BiDir_Multiple_ORB -// -// = FILENAME -// destroy.cpp -// -// = DESCRIPTION -// Modified ORB destruction test. -// -// = AUTHOR -// Andrew Schnable <Andrew.Schnable@veritas.com> -// Iliyan Jeliazkov <jeliazkov_i@ociweb.com> -// -//========================================================================= + +//============================================================================= +/** + * @file destroy.cpp + * + * $Id$ + * + * Modified ORB destruction test. + * + * + * @author Andrew Schnable <Andrew.Schnable@veritas.com> Iliyan Jeliazkov <jeliazkov_i@ociweb.com> + */ +//============================================================================= + #include "tao/corba.h" #include "tao/PortableServer/PortableServer.h" #include "tao/AnyTypeCode/Any.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" -ACE_RCSID(BiDir_Multiple_ORB, destroy, "$Id$") + int test_with_bidir_poa (int argc, diff --git a/tests/BiDirectional_NestedUpcall/Makefile.am b/tests/BiDirectional_NestedUpcall/Makefile.am deleted file mode 100644 index 7f77bb0bd2f..00000000000 --- a/tests/BiDirectional_NestedUpcall/Makefile.am +++ /dev/null @@ -1,117 +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.BiDir_NestedUpcall_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.BiDir_NestedUpcall_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 \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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.BiDir_NestedUpcall_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/BiDirectional_NestedUpcall/client.cpp b/tests/BiDirectional_NestedUpcall/client.cpp index 54f68876b18..3e74cbe5dc4 100644 --- a/tests/BiDirectional_NestedUpcall/client.cpp +++ b/tests/BiDirectional_NestedUpcall/client.cpp @@ -6,8 +6,6 @@ #include "tao/BiDir_GIOP/BiDirGIOP.h" #include "tao/AnyTypeCode/Any.h" -ACE_RCSID(BiDirectional, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); void do_nothing (void) @@ -36,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/tests/BiDirectional_NestedUpcall/server.cpp b/tests/BiDirectional_NestedUpcall/server.cpp index 08ee5eb5188..1bea3072543 100644 --- a/tests/BiDirectional_NestedUpcall/server.cpp +++ b/tests/BiDirectional_NestedUpcall/server.cpp @@ -6,8 +6,6 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(BiDirectional, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int no_iterations = 10; @@ -36,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/tests/BiDirectional_NestedUpcall/test_i.cpp b/tests/BiDirectional_NestedUpcall/test_i.cpp index 776ec609487..91c174281c6 100644 --- a/tests/BiDirectional_NestedUpcall/test_i.cpp +++ b/tests/BiDirectional_NestedUpcall/test_i.cpp @@ -10,8 +10,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$") - void Callback_i::shutdown (void) { diff --git a/tests/BiDirectional_NestedUpcall/test_i.h b/tests/BiDirectional_NestedUpcall/test_i.h index 41c91c52b59..7ae2ce17af0 100644 --- a/tests/BiDirectional_NestedUpcall/test_i.h +++ b/tests/BiDirectional_NestedUpcall/test_i.h @@ -1,58 +1,57 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/BiDirectional -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Balachandran Natarajan <bala@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Balachandran Natarajan <bala@cs.wustl.edu> + */ +//============================================================================= + #ifndef TAO_BIDIRECTIONAL_TEST_I_H #define TAO_BIDIRECTIONAL_TEST_I_H #include "testS.h" +/** + * @class Callback_i + * + * @brief A callback object to the "client" + * + * To test that the server can call the client on the same + * connection that was established by the client + */ class Callback_i : public virtual POA_Callback { - // = TITLE - // A callback object to the "client" - // - // = DESCRIPTION - // To test that the server can call the client on the same - // connection that was established by the client - // public: + /// ctor Callback_i (CORBA::ORB_ptr orb); - // ctor + /// Safe way to shutdown void shutdown (void); - // Safe way to shutdown + /// The callback method void callback_method (void); - // The callback method private: + /// The orb CORBA::ORB_var orb_; - // The orb }; +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public virtual POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations); - // ctor // = The Simple_Server methods. CORBA::Long test_method (CORBA::Boolean do_callback); @@ -62,17 +61,17 @@ public: void shutdown (void); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB + /// Flag to indicate, whether we are ready for a remote call. int flag_; - // Flag to indicate, whether we are ready for a remote call. + /// Callback Object Callback_var callback_; - // Callback Object + /// Number of times the callback needs to be called int no_iterations_; - // Number of times the callback needs to be called }; #if defined(__ACE_INLINE__) diff --git a/tests/Big_AMI/Makefile.am b/tests/Big_AMI/Makefile.am deleted file mode 100644 index 3cee3c22109..00000000000 --- a/tests/Big_AMI/Makefile.am +++ /dev/null @@ -1,132 +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.Big_AMI_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -CLEANFILES = \ - ami_test-stamp \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp - -ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl - @touch $@ - -noinst_HEADERS = \ - ami_test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Big_AMI_Client.am - -if BUILD_AMI -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 = \ - ami_testC.cpp \ - ami_testS.cpp \ - client.cpp \ - ami_test_i.h - -client_LDADD = \ - $(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_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 -endif BUILD_AMI - -## Makefile.Big_AMI_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - ami_testC.cpp \ - ami_testS.cpp \ - ami_test_i.cpp \ - server.cpp \ - ami_test_i.h - -server_LDADD = \ - $(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_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 -endif BUILD_AMI - -## 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/Big_AMI/ami_test_i.cpp b/tests/Big_AMI/ami_test_i.cpp index 064960d0458..586617ba886 100644 --- a/tests/Big_AMI/ami_test_i.cpp +++ b/tests/Big_AMI/ami_test_i.cpp @@ -17,8 +17,6 @@ #include "ami_test_i.h" #include "tao/debug.h" -ACE_RCSID(AMI, ami_test_i, "$Id$") - AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Big_AMI/client.cpp b/tests/Big_AMI/client.cpp index 3bcdad99a27..7c26af0223d 100644 --- a/tests/Big_AMI/client.cpp +++ b/tests/Big_AMI/client.cpp @@ -17,10 +17,6 @@ #include "ami_testS.h" -ACE_RCSID (AMI, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 5; int shutdown_flag = 0; @@ -63,7 +59,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/tests/Big_AMI/server.cpp b/tests/Big_AMI/server.cpp index 456eceb946e..18d23928d5c 100644 --- a/tests/Big_AMI/server.cpp +++ b/tests/Big_AMI/server.cpp @@ -19,8 +19,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" -ACE_RCSID(AMI, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int @@ -47,7 +45,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/tests/Big_Oneways/Coordinator.cpp b/tests/Big_Oneways/Coordinator.cpp index fcfcb5239d2..7447f0b25a5 100644 --- a/tests/Big_Oneways/Coordinator.cpp +++ b/tests/Big_Oneways/Coordinator.cpp @@ -3,8 +3,6 @@ // #include "Coordinator.h" -ACE_RCSID(Big_Oneways, Coordinator, "$Id$") - Coordinator::Coordinator (CORBA::ULong peer_count) : peers_ (0) , peer_count_ (0) @@ -56,6 +54,7 @@ Coordinator::shutdown_all_peers (void) try { (*i)->shutdown (); + (*i) = Test::Peer::_nil (); } catch (const CORBA::Exception& ex) { diff --git a/tests/Big_Oneways/Makefile.am b/tests/Big_Oneways/Makefile.am deleted file mode 100644 index 9340bd4596a..00000000000 --- a/tests/Big_Oneways/Makefile.am +++ /dev/null @@ -1,115 +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.Big_Oneways_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.Big_Oneways_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Peer.cpp \ - Session.cpp \ - Session_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Peer.h \ - Session.h \ - Session_Task.h - -client_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.Big_Oneways_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Coordinator.cpp \ - Session_Control.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Coordinator.h \ - Session_Control.h - -server_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/Big_Oneways/Peer.cpp b/tests/Big_Oneways/Peer.cpp index 7a5db7a496d..b5bdeb94a7b 100644 --- a/tests/Big_Oneways/Peer.cpp +++ b/tests/Big_Oneways/Peer.cpp @@ -4,8 +4,6 @@ #include "Peer.h" #include "Session.h" -ACE_RCSID(Big_Oneways, Peer, "$Id$") - Peer::Peer (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Big_Oneways/Session.cpp b/tests/Big_Oneways/Session.cpp index 217a6415ea0..b4780b4bd54 100644 --- a/tests/Big_Oneways/Session.cpp +++ b/tests/Big_Oneways/Session.cpp @@ -4,8 +4,6 @@ #include "Session.h" #include "tao/debug.h" -ACE_RCSID(Big_Oneways, Session, "$Id$") - Session::Session (Test::Session_Control_ptr control, CORBA::ULong payload_size, CORBA::ULong thread_count, @@ -87,8 +85,6 @@ Session::svc (void) return -1; } - this->_remove_ref (); - return 0; } @@ -127,18 +123,9 @@ Session::start (const Test::Session_List &other_sessions) for (CORBA::ULong i = 0; i != this->thread_count_; ++i) { - // Increase the reference count because the new thread will have - // access to this object.... try { - this->_add_ref (); - - if (this->task_.activate ( - THR_NEW_LWP | THR_JOINABLE, 1, 1) == -1) - { - this->_remove_ref (); - } - else + if (this->task_.activate (THR_NEW_LWP | THR_JOINABLE, 1, 1) != -1) { this->running_ = 1; this->active_thread_count_++; @@ -247,5 +234,4 @@ Session::terminate (CORBA::Boolean success) { ex._tao_print_exception ("Session::terminate, ignored"); } - } diff --git a/tests/Big_Oneways/Session_Control.cpp b/tests/Big_Oneways/Session_Control.cpp index d0fab0de5fa..0ed54fbf36b 100644 --- a/tests/Big_Oneways/Session_Control.cpp +++ b/tests/Big_Oneways/Session_Control.cpp @@ -3,8 +3,6 @@ // #include "Session_Control.h" -ACE_RCSID(Big_Oneways, Session_Control, "$Id$") - Session_Control::Session_Control (CORBA::ULong session_count) : session_count_ (session_count) , success_ (1) diff --git a/tests/Big_Oneways/Session_Task.cpp b/tests/Big_Oneways/Session_Task.cpp index bd992a66e5d..8c4a1efcb43 100644 --- a/tests/Big_Oneways/Session_Task.cpp +++ b/tests/Big_Oneways/Session_Task.cpp @@ -5,8 +5,6 @@ #include "Session_Task.h" #include "Session.h" -ACE_RCSID(Big_Oneways, Session_Task, "$Id$") - Session_Task::Session_Task (Session *session) : session_ (session) { diff --git a/tests/Big_Oneways/client.cpp b/tests/Big_Oneways/client.cpp index 144048ee7c8..5902682fe98 100644 --- a/tests/Big_Oneways/client.cpp +++ b/tests/Big_Oneways/client.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/Thread_Manager.h" -ACE_RCSID(Big_Oneways, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -30,7 +28,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/tests/Big_Oneways/server.cpp b/tests/Big_Oneways/server.cpp index e9c9f4d4c88..3d484feaa1a 100644 --- a/tests/Big_Oneways/server.cpp +++ b/tests/Big_Oneways/server.cpp @@ -6,8 +6,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Big_Oneways, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); CORBA::ULong peer_count = 4; CORBA::ULong payload_size = 1024; @@ -56,7 +54,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; } @@ -89,6 +87,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_NEW_RETURN (coordinator_impl, Coordinator (peer_count), 1); + PortableServer::ServantBase_var coordinator_owner (coordinator_impl); PortableServer::ObjectId_var id = root_poa->activate_object (coordinator_impl); @@ -136,6 +135,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_NEW_RETURN (session_control_impl, Session_Control (peer_count), 1); + PortableServer::ServantBase_var session_control_owner (session_control_impl); PortableServer::ObjectId_var idu = root_poa->activate_object (session_control_impl); diff --git a/tests/Big_Reply/Client_Task.cpp b/tests/Big_Reply/Client_Task.cpp index 1cff6fff879..db9fda0680e 100644 --- a/tests/Big_Reply/Client_Task.cpp +++ b/tests/Big_Reply/Client_Task.cpp @@ -4,7 +4,7 @@ #include "Client_Task.h" -ACE_RCSID(Muxing, Client_Task, "$Id$") + Client_Task::Client_Task (Test::Big_Reply_ptr reply_gen, int event_count, diff --git a/tests/Big_Reply/Makefile.am b/tests/Big_Reply/Makefile.am deleted file mode 100644 index 1369b5ab7f4..00000000000 --- a/tests/Big_Reply/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.Big_Reply_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.Big_Reply_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_Task.cpp \ - TestC.cpp \ - client.cpp \ - Client_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Big_Reply_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Big_Reply_i.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Big_Reply_i.h - -server_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/Big_Reply/client.cpp b/tests/Big_Reply/client.cpp index ff401da2ed4..f8e4d32b6d4 100644 --- a/tests/Big_Reply/client.cpp +++ b/tests/Big_Reply/client.cpp @@ -3,7 +3,7 @@ #include "Client_Task.h" #include "ace/Get_Opt.h" -ACE_RCSID(Big_Reply, client, "$Id$") + const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); bool server_shutdown = false; @@ -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/tests/Big_Reply/server.cpp b/tests/Big_Reply/server.cpp index f09af6d6c14..4db6e458dd1 100644 --- a/tests/Big_Reply/server.cpp +++ b/tests/Big_Reply/server.cpp @@ -5,7 +5,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/Task.h" -ACE_RCSID(Big_Reply, server, "$Id$") + const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); @@ -63,7 +63,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/tests/Big_Request_Muxing/Client_Task.cpp b/tests/Big_Request_Muxing/Client_Task.cpp index 42c8f6df8dd..b1ace35723d 100644 --- a/tests/Big_Request_Muxing/Client_Task.cpp +++ b/tests/Big_Request_Muxing/Client_Task.cpp @@ -5,8 +5,6 @@ #include "Client_Task.h" #include "tao/AnyTypeCode/Any.h" -ACE_RCSID(Big_Request_Muxing, Client_Task, "$Id$") - namespace { const ACE_Time_Value TRANSIENT_HOLDOFF (0, 2000); // 2ms delay diff --git a/tests/Big_Request_Muxing/Makefile.am b/tests/Big_Request_Muxing/Makefile.am deleted file mode 100644 index 3872d7e0b86..00000000000 --- a/tests/Big_Request_Muxing/Makefile.am +++ /dev/null @@ -1,120 +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.Big_Request_Muxing_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.Big_Request_Muxing_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_Task.cpp \ - TestC.cpp \ - client.cpp \ - Client_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.Big_Request_Muxing_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Payload_Receiver.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Payload_Receiver.h - -server_LDADD = \ - $(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_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 - -## 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/Big_Request_Muxing/Payload_Receiver.cpp b/tests/Big_Request_Muxing/Payload_Receiver.cpp index aebfcb2b16e..8b1de41178d 100644 --- a/tests/Big_Request_Muxing/Payload_Receiver.cpp +++ b/tests/Big_Request_Muxing/Payload_Receiver.cpp @@ -3,8 +3,6 @@ // #include "Payload_Receiver.h" -ACE_RCSID(Big_Request_Muxing, Payload_Receiver, "$Id$") - Payload_Receiver::Payload_Receiver (void) : message_count_ (0) , maybe_lost_count_ (0) diff --git a/tests/Big_Request_Muxing/client.cpp b/tests/Big_Request_Muxing/client.cpp index 3056acf2311..cfc0343c2d4 100644 --- a/tests/Big_Request_Muxing/client.cpp +++ b/tests/Big_Request_Muxing/client.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "tao/Messaging/Messaging.h" -ACE_RCSID(Muxing, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); namespace @@ -39,7 +37,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/tests/Big_Request_Muxing/server.cpp b/tests/Big_Request_Muxing/server.cpp index 1385daa30ad..073a01cec6e 100644 --- a/tests/Big_Request_Muxing/server.cpp +++ b/tests/Big_Request_Muxing/server.cpp @@ -5,8 +5,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_sys_time.h" -ACE_RCSID(Big_Request_Muxing, server, "$Id$") - namespace { // defaults only @@ -41,7 +39,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/tests/Big_Twoways/Coordinator.cpp b/tests/Big_Twoways/Coordinator.cpp index fcfcb5239d2..2d258c15f71 100644 --- a/tests/Big_Twoways/Coordinator.cpp +++ b/tests/Big_Twoways/Coordinator.cpp @@ -3,8 +3,6 @@ // #include "Coordinator.h" -ACE_RCSID(Big_Oneways, Coordinator, "$Id$") - Coordinator::Coordinator (CORBA::ULong peer_count) : peers_ (0) , peer_count_ (0) diff --git a/tests/Big_Twoways/Makefile.am b/tests/Big_Twoways/Makefile.am deleted file mode 100644 index 3b7ea85979e..00000000000 --- a/tests/Big_Twoways/Makefile.am +++ /dev/null @@ -1,115 +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.Big_Twoways_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.Big_Twoways_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Peer.cpp \ - Session.cpp \ - Session_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Peer.h \ - Session.h \ - Session_Task.h - -client_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.Big_Twoways_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Coordinator.cpp \ - Session_Control.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Coordinator.h \ - Session_Control.h - -server_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/Big_Twoways/Peer.cpp b/tests/Big_Twoways/Peer.cpp index 77c338bdb63..d866b0dd7dc 100644 --- a/tests/Big_Twoways/Peer.cpp +++ b/tests/Big_Twoways/Peer.cpp @@ -4,8 +4,6 @@ #include "Peer.h" #include "Session.h" -ACE_RCSID(Big_Oneways, Peer, "$Id$") - Peer::Peer (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Big_Twoways/Session.cpp b/tests/Big_Twoways/Session.cpp index 9c90a5e0554..691d792eb70 100644 --- a/tests/Big_Twoways/Session.cpp +++ b/tests/Big_Twoways/Session.cpp @@ -4,8 +4,6 @@ #include "Session.h" #include "tao/debug.h" -ACE_RCSID(Big_Oneways, Session, "$Id$") - Session::Session (Test::Session_Control_ptr control, CORBA::ULong payload_size, CORBA::ULong thread_count, diff --git a/tests/Big_Twoways/Session_Control.cpp b/tests/Big_Twoways/Session_Control.cpp index bd51595b39d..0f47ee16245 100644 --- a/tests/Big_Twoways/Session_Control.cpp +++ b/tests/Big_Twoways/Session_Control.cpp @@ -3,8 +3,6 @@ // #include "Session_Control.h" -ACE_RCSID(Big_Oneways, Session_Control, "$Id$") - Session_Control::Session_Control (CORBA::ULong session_count) : session_count_ (session_count) , success_ (1) diff --git a/tests/Big_Twoways/Session_Task.cpp b/tests/Big_Twoways/Session_Task.cpp index bd992a66e5d..8c4a1efcb43 100644 --- a/tests/Big_Twoways/Session_Task.cpp +++ b/tests/Big_Twoways/Session_Task.cpp @@ -5,8 +5,6 @@ #include "Session_Task.h" #include "Session.h" -ACE_RCSID(Big_Oneways, Session_Task, "$Id$") - Session_Task::Session_Task (Session *session) : session_ (session) { diff --git a/tests/Big_Twoways/client.cpp b/tests/Big_Twoways/client.cpp index 144048ee7c8..5902682fe98 100644 --- a/tests/Big_Twoways/client.cpp +++ b/tests/Big_Twoways/client.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/Thread_Manager.h" -ACE_RCSID(Big_Oneways, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -30,7 +28,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/tests/Big_Twoways/server.cpp b/tests/Big_Twoways/server.cpp index a65ee6f0295..bad96d106f0 100644 --- a/tests/Big_Twoways/server.cpp +++ b/tests/Big_Twoways/server.cpp @@ -6,8 +6,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Big_Oneways, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); CORBA::ULong peer_count = 4; CORBA::ULong payload_size = 1024; @@ -56,7 +54,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/tests/Blocking_Sync_None/Blocking_Sync_None.cpp b/tests/Blocking_Sync_None/Blocking_Sync_None.cpp index c6e032fb953..bd0704de43f 100644 --- a/tests/Blocking_Sync_None/Blocking_Sync_None.cpp +++ b/tests/Blocking_Sync_None/Blocking_Sync_None.cpp @@ -4,8 +4,6 @@ #include "Blocking_Sync_None.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Blocking_Sync_None, Blocking_Sync_None, "$Id$") - Blocking_Sync_None::Blocking_Sync_None (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Blocking_Sync_None/Makefile.am b/tests/Blocking_Sync_None/Makefile.am deleted file mode 100644 index e46865fb4ac..00000000000 --- a/tests/Blocking_Sync_None/Makefile.am +++ /dev/null @@ -1,119 +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.Blocking_Sync_None_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.Blocking_Sync_None_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 = \ - TestC.cpp \ - client.cpp \ - Blocking_Sync_None.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.Blocking_Sync_None_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Blocking_Sync_None.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Blocking_Sync_None.h - -server_LDADD = \ - $(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_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 - -## 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/Blocking_Sync_None/client.cpp b/tests/Blocking_Sync_None/client.cpp index 1074d45fd53..0936113493e 100644 --- a/tests/Blocking_Sync_None/client.cpp +++ b/tests/Blocking_Sync_None/client.cpp @@ -6,8 +6,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_sys_time.h" -ACE_RCSID(Blocking_Sync_None, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int iterations = 1000; @@ -38,7 +36,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/tests/Blocking_Sync_None/server.cpp b/tests/Blocking_Sync_None/server.cpp index 0ecb13b82fa..cc426f78414 100644 --- a/tests/Blocking_Sync_None/server.cpp +++ b/tests/Blocking_Sync_None/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Blocking_Sync_None, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -30,7 +28,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/tests/Bug_1020_Basic_Regression/Client_Task.cpp b/tests/Bug_1020_Basic_Regression/Client_Task.cpp index f01893bc102..f2adcb00f22 100644 --- a/tests/Bug_1020_Basic_Regression/Client_Task.cpp +++ b/tests/Bug_1020_Basic_Regression/Client_Task.cpp @@ -1,11 +1,7 @@ -// // $Id$ -// #include "Client_Task.h" -ACE_RCSID(Muxing, Client_Task, "$Id$") - Client_Task::Client_Task (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_1020_Basic_Regression/Echo.cpp b/tests/Bug_1020_Basic_Regression/Echo.cpp index 05cf417b3a0..038a43fa0e9 100644 --- a/tests/Bug_1020_Basic_Regression/Echo.cpp +++ b/tests/Bug_1020_Basic_Regression/Echo.cpp @@ -1,8 +1,8 @@ +// $Id$ + #include "Echo.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Bug_1269_Regression, Echo, "$Id$") - Echo::Echo(CORBA::ORB_ptr orb, int abort_counter) : orb_(CORBA::ORB::_duplicate(orb)) diff --git a/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp b/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp index dc26aa8804e..00225da7ceb 100644 --- a/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp +++ b/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp @@ -1,10 +1,8 @@ +// $Id$ + #include "Echo_Caller.h" #include "Server_Task.h" -ACE_RCSID (Bug_1020_Basic_Regression, - Echo_Caller, - "$Id$") - Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate(orb)) { diff --git a/tests/Bug_1020_Basic_Regression/Makefile.am b/tests/Bug_1020_Basic_Regression/Makefile.am deleted file mode 100644 index b4bc15e4b3a..00000000000 --- a/tests/Bug_1020_Basic_Regression/Makefile.am +++ /dev/null @@ -1,125 +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_1020_Basic_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_1020_Basic_Regression_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_Task.cpp \ - Echo.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Client_Task.h \ - Echo.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.Bug_1020_Basic_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Echo_Caller.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Echo_Caller.h \ - Server_Task.h - -server_LDADD = \ - $(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_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 - -## 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/Bug_1020_Basic_Regression/Server_Task.cpp b/tests/Bug_1020_Basic_Regression/Server_Task.cpp index e90fc608a61..c1b36af884d 100644 --- a/tests/Bug_1020_Basic_Regression/Server_Task.cpp +++ b/tests/Bug_1020_Basic_Regression/Server_Task.cpp @@ -1,10 +1,6 @@ -#include "Server_Task.h" - - -ACE_RCSID (Bug_1020_Basic_Regression, - Server_Task, - "$Id$") +// $Id$ +#include "Server_Task.h" Server_Task::Server_Task (Test::Echo_ptr echo, size_t sz) diff --git a/tests/Bug_1020_Basic_Regression/client.cpp b/tests/Bug_1020_Basic_Regression/client.cpp index 0aa79ea4446..a681243525b 100644 --- a/tests/Bug_1020_Basic_Regression/client.cpp +++ b/tests/Bug_1020_Basic_Regression/client.cpp @@ -2,15 +2,10 @@ #include "Echo.h" #include "Client_Task.h" -#include "tao/Utils/Servant_Var.h" #include "ace/Get_Opt.h" #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" -ACE_RCSID (Bug_1020_Basic_Regression, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -35,7 +30,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; } @@ -91,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Echo> impl; + PortableServer::Servant_var<Echo> impl; { Echo * tmp; // ACE_NEW_RETURN is the worst possible way to handle diff --git a/tests/Bug_1020_Basic_Regression/run_test.pl b/tests/Bug_1020_Basic_Regression/run_test.pl index d5aa1704cab..47b125f6733 100755 --- a/tests/Bug_1020_Basic_Regression/run_test.pl +++ b/tests/Bug_1020_Basic_Regression/run_test.pl @@ -22,7 +22,7 @@ foreach $i (@ARGV) { if ($i eq '-quick') { $elapsed = 0; $max_running_time = 1; - } + } } my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; diff --git a/tests/Bug_1020_Basic_Regression/server.cpp b/tests/Bug_1020_Basic_Regression/server.cpp index 393cc836e81..5d2ccad9a2b 100644 --- a/tests/Bug_1020_Basic_Regression/server.cpp +++ b/tests/Bug_1020_Basic_Regression/server.cpp @@ -2,13 +2,8 @@ #include "Echo_Caller.h" #include "tao/ORB_Core.h" -#include "tao/Utils/Servant_Var.h" #include "ace/Get_Opt.h" -ACE_RCSID(Bug_1020_Basic_Regression, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -33,7 +28,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; } @@ -63,7 +58,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Echo_Caller> impl; + PortableServer::Servant_var<Echo_Caller> impl; { Echo_Caller * tmp; // ACE_NEW_RETURN is the worst possible way to handle diff --git a/tests/Bug_1020_Regression/Echo.cpp b/tests/Bug_1020_Regression/Echo.cpp index 17ffaf51fbf..ea5dd5ed121 100644 --- a/tests/Bug_1020_Regression/Echo.cpp +++ b/tests/Bug_1020_Regression/Echo.cpp @@ -8,7 +8,7 @@ */ #include "Echo.h" -ACE_RCSID(Notify_Crash, Echo, "$Id$") + Echo::Echo(CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) diff --git a/tests/Bug_1020_Regression/Echo_Callback.cpp b/tests/Bug_1020_Regression/Echo_Callback.cpp index ef35acd35b9..e9de3d4e830 100644 --- a/tests/Bug_1020_Regression/Echo_Callback.cpp +++ b/tests/Bug_1020_Regression/Echo_Callback.cpp @@ -8,7 +8,7 @@ */ #include "Echo_Callback.h" -ACE_RCSID(Notify_Crash, Echo_Callback, "$Id$") + Echo_Callback::Echo_Callback() { diff --git a/tests/Bug_1020_Regression/Makefile.am b/tests/Bug_1020_Regression/Makefile.am deleted file mode 100644 index 73d3e961b8f..00000000000 --- a/tests/Bug_1020_Regression/Makefile.am +++ /dev/null @@ -1,127 +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_1020_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_1020_Regression_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 = \ - Echo.cpp \ - ORB_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Echo.h \ - ORB_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.Bug_1020_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - ORB_Task.cpp \ - Server_Task.cpp \ - Server_i.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - ORB_Task.h \ - Server_Task.h \ - Server_i.h - -server_LDADD = \ - $(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_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 - -## 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/Bug_1020_Regression/ORB_Task.cpp b/tests/Bug_1020_Regression/ORB_Task.cpp index c2645f8354e..0c26681b550 100644 --- a/tests/Bug_1020_Regression/ORB_Task.cpp +++ b/tests/Bug_1020_Regression/ORB_Task.cpp @@ -9,7 +9,7 @@ #include "ORB_Task.h" #include "tao/Environment.h" -ACE_RCSID(Bug_1230_Regression, ORB_Task, "$Id$") + ORB_Task::ORB_Task(CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) diff --git a/tests/Bug_1020_Regression/Server_Task.cpp b/tests/Bug_1020_Regression/Server_Task.cpp index a89ac08487a..51e4a5ad48d 100644 --- a/tests/Bug_1020_Regression/Server_Task.cpp +++ b/tests/Bug_1020_Regression/Server_Task.cpp @@ -8,7 +8,7 @@ */ #include "Server_Task.h" -ACE_RCSID(Bug_1230_Regression, Server_Task, "$Id$") + Server_Task::Server_Task(Test::Echo_ptr echo) : echo_(Test::Echo::_duplicate(echo)) diff --git a/tests/Bug_1020_Regression/Server_i.cpp b/tests/Bug_1020_Regression/Server_i.cpp index b8d26e2843a..7ba4adf2e3e 100644 --- a/tests/Bug_1020_Regression/Server_i.cpp +++ b/tests/Bug_1020_Regression/Server_i.cpp @@ -1,9 +1,8 @@ +// $Id$ + #include "Server_i.h" #include "Server_Task.h" -ACE_RCSID (Bug_1230_Regression, - Server, "$Id$") - Server::Server(CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) { diff --git a/tests/Bug_1020_Regression/client.cpp b/tests/Bug_1020_Regression/client.cpp index e3096eb4c3b..770c576efd9 100644 --- a/tests/Bug_1020_Regression/client.cpp +++ b/tests/Bug_1020_Regression/client.cpp @@ -4,13 +4,10 @@ #include "ORB_Task.h" #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" -#include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" -ACE_RCSID(Bug_1230_Regression, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -73,7 +70,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Echo> impl; + PortableServer::Servant_var<Echo> impl; { Echo * tmp = 0; // ACE_NEW_RETURN is the worst possible way to handle @@ -165,7 +162,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/tests/Bug_1020_Regression/server.cpp b/tests/Bug_1020_Regression/server.cpp index c668c137df4..98c44f068bb 100644 --- a/tests/Bug_1020_Regression/server.cpp +++ b/tests/Bug_1020_Regression/server.cpp @@ -3,14 +3,9 @@ #include "Server_i.h" #include "ORB_Task.h" #include "tao/Messaging/Messaging.h" -#include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" -ACE_RCSID (Bug_1230_Regression, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); #if defined (ACE_OPENVMS) @@ -53,7 +48,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Server> impl; + PortableServer::Servant_var<Server> impl; { Server * tmp; // ACE_NEW_RETURN is the worst possible way to handle @@ -131,6 +126,6 @@ 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/tests/Bug_1254_Regression/BlobServer.cpp b/tests/Bug_1254_Regression/BlobServer.cpp index 419ad646a44..c2c1d06aea0 100644 --- a/tests/Bug_1254_Regression/BlobServer.cpp +++ b/tests/Bug_1254_Regression/BlobServer.cpp @@ -3,8 +3,6 @@ // #include "BlobServer.h" -ACE_RCSID(BlobServerImpl, BlobServerImpl, "$Id$") - BlobServerImpl::BlobServerImpl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_1254_Regression/Bug_1254_Regression.mpc b/tests/Bug_1254_Regression/Bug_1254_Regression.mpc index 2847b187410..1a629aa8dcf 100644 --- a/tests/Bug_1254_Regression/Bug_1254_Regression.mpc +++ b/tests/Bug_1254_Regression/Bug_1254_Regression.mpc @@ -2,7 +2,6 @@ // $Id$ project(*idl): taoidldefaults { - idlflags += -Sa -St IDL_Files { test.idl } diff --git a/tests/Bug_1254_Regression/Makefile.am b/tests/Bug_1254_Regression/Makefile.am deleted file mode 100644 index f1a03337c11..00000000000 --- a/tests/Bug_1254_Regression/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.Bug_1254_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 -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Bug_1254_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 \ - testC.cpp \ - testS.cpp \ - BlobServer.h - -client_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.Bug_1254_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 = \ - BlobServer.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - BlobServer.h - -server_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/Bug_1254_Regression/client.cpp b/tests/Bug_1254_Regression/client.cpp index 0da8e0bf326..d658ef4b1ce 100644 --- a/tests/Bug_1254_Regression/client.cpp +++ b/tests/Bug_1254_Regression/client.cpp @@ -1,8 +1,8 @@ +// $Id$ + #include "testC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int @@ -27,7 +27,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/tests/Bug_1254_Regression/server.cpp b/tests/Bug_1254_Regression/server.cpp index e69ea65aaa5..6b8406adf8d 100644 --- a/tests/Bug_1254_Regression/server.cpp +++ b/tests/Bug_1254_Regression/server.cpp @@ -1,11 +1,9 @@ +// $Id$ + #include "BlobServer.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (BlobServer, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int @@ -30,7 +28,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/tests/Bug_1269_Regression/Echo.cpp b/tests/Bug_1269_Regression/Echo.cpp index d64dae69dce..364d723fd8e 100644 --- a/tests/Bug_1269_Regression/Echo.cpp +++ b/tests/Bug_1269_Regression/Echo.cpp @@ -9,8 +9,6 @@ #include "Echo.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Bug_1269_Regression, Echo, "$Id$") - Echo::Echo(CORBA::ORB_ptr orb, int abort_counter) : orb_(CORBA::ORB::_duplicate(orb)) diff --git a/tests/Bug_1269_Regression/Echo_Caller.cpp b/tests/Bug_1269_Regression/Echo_Caller.cpp index 1bc987dda57..1520b6d40a7 100644 --- a/tests/Bug_1269_Regression/Echo_Caller.cpp +++ b/tests/Bug_1269_Regression/Echo_Caller.cpp @@ -10,8 +10,6 @@ #include "Server_Timer.h" #include "tao/ORB_Core.h" -ACE_RCSID(Bug_1269_Regression, Echo_Caller, "$Id$") - Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) { diff --git a/tests/Bug_1269_Regression/Makefile.am b/tests/Bug_1269_Regression/Makefile.am deleted file mode 100644 index 84cdea41184..00000000000 --- a/tests/Bug_1269_Regression/Makefile.am +++ /dev/null @@ -1,123 +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_1269_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_1269_Regression_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 = \ - Echo.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Echo.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.Bug_1269_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Echo_Caller.cpp \ - Server_Timer.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Echo_Caller.h \ - Server_Timer.h - -server_LDADD = \ - $(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_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 - -## 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/Bug_1269_Regression/Server_Timer.cpp b/tests/Bug_1269_Regression/Server_Timer.cpp index 7804f97eb1e..7d8d82cb28d 100644 --- a/tests/Bug_1269_Regression/Server_Timer.cpp +++ b/tests/Bug_1269_Regression/Server_Timer.cpp @@ -10,8 +10,6 @@ #include "ace/Reactor.h" #include "ace/OS_NS_string.h" -ACE_RCSID(Bug_1269_Regression, Server_Timer, "$Id$") - Server_Timer::Server_Timer(Test::Echo_ptr echo, ACE_Reactor * reactor) : ACE_Event_Handler (reactor) diff --git a/tests/Bug_1269_Regression/client.cpp b/tests/Bug_1269_Regression/client.cpp index c74d1ffc44c..56ff66d4927 100644 --- a/tests/Bug_1269_Regression/client.cpp +++ b/tests/Bug_1269_Regression/client.cpp @@ -3,12 +3,9 @@ #include "Echo.h" #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" -#include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" -ACE_RCSID(Bug_1269_Regression, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); bool do_shutdown = false; @@ -63,7 +60,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Echo> impl; + PortableServer::Servant_var<Echo> impl; { Echo * tmp; // ACE_NEW_RETURN is the worst possible way to handle @@ -152,6 +149,6 @@ 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/tests/Bug_1269_Regression/server.cpp b/tests/Bug_1269_Regression/server.cpp index f1b41aeb66f..01bf0aa1ebe 100644 --- a/tests/Bug_1269_Regression/server.cpp +++ b/tests/Bug_1269_Regression/server.cpp @@ -2,12 +2,9 @@ #include "Echo_Caller.h" #include "tao/Messaging/Messaging.h" -#include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" -ACE_RCSID(Bug_1269_Regression, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -41,7 +38,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Echo_Caller> impl; + PortableServer::Servant_var<Echo_Caller> impl; { Echo_Caller * tmp; // ACE_NEW_RETURN is the worst possible way to handle @@ -116,6 +113,6 @@ 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/tests/Bug_1269_Regression/shutdown.cpp b/tests/Bug_1269_Regression/shutdown.cpp index 7c1a549bec8..cf65eed282f 100644 --- a/tests/Bug_1269_Regression/shutdown.cpp +++ b/tests/Bug_1269_Regression/shutdown.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Bug_1269_Regression, shutdown, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -70,6 +68,6 @@ 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/tests/Bug_1270_Regression/Echo.cpp b/tests/Bug_1270_Regression/Echo.cpp index 15a7a4c57b2..75c94693e1a 100644 --- a/tests/Bug_1270_Regression/Echo.cpp +++ b/tests/Bug_1270_Regression/Echo.cpp @@ -9,8 +9,6 @@ #include "Echo.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Bug_1270_Regression, Echo, "$Id$") - Echo::Echo(CORBA::ORB_ptr orb, int abort_counter) : orb_(CORBA::ORB::_duplicate(orb)) diff --git a/tests/Bug_1270_Regression/Echo_Caller.cpp b/tests/Bug_1270_Regression/Echo_Caller.cpp index 1763f53b57d..4759fa55393 100644 --- a/tests/Bug_1270_Regression/Echo_Caller.cpp +++ b/tests/Bug_1270_Regression/Echo_Caller.cpp @@ -10,8 +10,6 @@ #include "Server_Timer.h" #include "tao/ORB_Core.h" -ACE_RCSID(Bug_1270_Regression, Echo_Caller, "$Id$") - Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) { diff --git a/tests/Bug_1270_Regression/Makefile.am b/tests/Bug_1270_Regression/Makefile.am deleted file mode 100644 index 39dae818999..00000000000 --- a/tests/Bug_1270_Regression/Makefile.am +++ /dev/null @@ -1,157 +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_1270_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_1270_Regression_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 = \ - Echo.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Echo.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.Bug_1270_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Echo_Caller.cpp \ - Server_Timer.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Echo_Caller.h \ - Server_Timer.h - -server_LDADD = \ - $(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_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.Bug_1270_Regression_Shutdown.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += shutdown - -shutdown_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -shutdown_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - shutdown.cpp \ - Echo.h \ - Echo_Caller.h \ - Server_Timer.h - -shutdown_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## 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/Bug_1270_Regression/Server_Timer.cpp b/tests/Bug_1270_Regression/Server_Timer.cpp index 9890d7961e5..e75d5f6a2cd 100644 --- a/tests/Bug_1270_Regression/Server_Timer.cpp +++ b/tests/Bug_1270_Regression/Server_Timer.cpp @@ -10,8 +10,6 @@ #include "ace/Reactor.h" #include "ace/OS_NS_string.h" -ACE_RCSID(Bug_1270_Regression, Server_Timer, "$Id$") - Server_Timer::Server_Timer(Test::Echo_ptr echo, ACE_Reactor * reactor) : ACE_Event_Handler (reactor) diff --git a/tests/Bug_1270_Regression/client.cpp b/tests/Bug_1270_Regression/client.cpp index 00ebb73a9b0..3dda8c71a5a 100644 --- a/tests/Bug_1270_Regression/client.cpp +++ b/tests/Bug_1270_Regression/client.cpp @@ -3,13 +3,10 @@ #include "Echo.h" #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" -#include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" -ACE_RCSID(Bug_1270_Regression, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -63,7 +60,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Echo> impl; + PortableServer::ServantBase_var impl; { Echo * tmp; // ACE_NEW_RETURN is the worst possible way to handle @@ -142,6 +139,6 @@ 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/tests/Bug_1270_Regression/server.cpp b/tests/Bug_1270_Regression/server.cpp index 36b26f22b52..e2641efd61d 100644 --- a/tests/Bug_1270_Regression/server.cpp +++ b/tests/Bug_1270_Regression/server.cpp @@ -2,12 +2,9 @@ #include "Echo_Caller.h" #include "tao/Messaging/Messaging.h" -#include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" -ACE_RCSID(Bug_1270_Regression, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -61,7 +58,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Echo_Caller> impl; + PortableServer::Servant_var<Echo_Caller> impl; { Echo_Caller * tmp; // ACE_NEW_RETURN is the worst possible way to handle @@ -136,6 +133,6 @@ 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/tests/Bug_1270_Regression/shutdown.cpp b/tests/Bug_1270_Regression/shutdown.cpp index 893d0e85ba4..f8b1987b6d0 100644 --- a/tests/Bug_1270_Regression/shutdown.cpp +++ b/tests/Bug_1270_Regression/shutdown.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Bug_1270_Regression, shutdown, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -70,6 +68,6 @@ 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/tests/Bug_1330_Regression/Makefile.am b/tests/Bug_1330_Regression/Makefile.am deleted file mode 100644 index 50c3153c264..00000000000 --- a/tests/Bug_1330_Regression/Makefile.am +++ /dev/null @@ -1,107 +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_1330_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_1330_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 = \ - TestC.cpp \ - client.cpp \ - Test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_1330_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 \ - TestS.cpp \ - Test_i.cpp \ - server.cpp \ - Test_i.h - -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/tests/Bug_1330_Regression/client.cpp b/tests/Bug_1330_Regression/client.cpp index d29f072a754..4a0ab7db26d 100644 --- a/tests/Bug_1330_Regression/client.cpp +++ b/tests/Bug_1330_Regression/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/tests/Bug_1330_Regression/server.cpp b/tests/Bug_1330_Regression/server.cpp index c9e54969898..1d586aa6046 100644 --- a/tests/Bug_1330_Regression/server.cpp +++ b/tests/Bug_1330_Regression/server.cpp @@ -35,7 +35,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/tests/Bug_1361_Regression/Echo.cpp b/tests/Bug_1361_Regression/Echo.cpp index bdfc3b0d967..b8035e33bf7 100644 --- a/tests/Bug_1361_Regression/Echo.cpp +++ b/tests/Bug_1361_Regression/Echo.cpp @@ -11,8 +11,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_signal.h" -ACE_RCSID(Bug_1270_Regression, Echo, "$Id$") - Echo::Echo(CORBA::ORB_ptr orb, int abort_counter) : orb_(CORBA::ORB::_duplicate(orb)) diff --git a/tests/Bug_1361_Regression/Echo_Caller.cpp b/tests/Bug_1361_Regression/Echo_Caller.cpp index 452334f778a..fdde9dc70e6 100644 --- a/tests/Bug_1361_Regression/Echo_Caller.cpp +++ b/tests/Bug_1361_Regression/Echo_Caller.cpp @@ -10,8 +10,6 @@ #include "tao/ORB_Core.h" #include "Server_Thread_Pool.h" -ACE_RCSID(Bug_1270_Regression, Echo_Caller, "$Id$") - Echo_Caller::Echo_Caller(Thread_Pool *pool) : pool_(pool) { diff --git a/tests/Bug_1361_Regression/Makefile.am b/tests/Bug_1361_Regression/Makefile.am deleted file mode 100644 index ce933e9571a..00000000000 --- a/tests/Bug_1361_Regression/Makefile.am +++ /dev/null @@ -1,163 +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_1361_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_1361_Regression_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 = \ - Echo.cpp \ - ORB_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Echo.h \ - ORB_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.Bug_1361_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Echo_Caller.cpp \ - ORB_Task.cpp \ - Server_Thread_Pool.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Echo_Caller.h \ - ORB_Task.h \ - Server_Thread_Pool.h - -server_LDADD = \ - $(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_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.Bug_1361_Regression_Shutdown.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += shutdown - -shutdown_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -shutdown_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - shutdown.cpp \ - Echo.h \ - Echo_Caller.h \ - ORB_Task.h \ - Server_Thread_Pool.h \ - Server_Timer.h - -shutdown_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## 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/Bug_1361_Regression/ORB_Task.cpp b/tests/Bug_1361_Regression/ORB_Task.cpp index e916f9b08f4..b54d49e1e3d 100644 --- a/tests/Bug_1361_Regression/ORB_Task.cpp +++ b/tests/Bug_1361_Regression/ORB_Task.cpp @@ -9,9 +9,6 @@ #include "ORB_Task.h" #include "tao/Environment.h" -ACE_RCSID (Bug_1361_Regression, - ORB_Task, "$Id$") - ORB_Task::ORB_Task (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_1361_Regression/Server_Thread_Pool.cpp b/tests/Bug_1361_Regression/Server_Thread_Pool.cpp index 57cf2b62aa1..083131a18b4 100644 --- a/tests/Bug_1361_Regression/Server_Thread_Pool.cpp +++ b/tests/Bug_1361_Regression/Server_Thread_Pool.cpp @@ -45,7 +45,7 @@ Thread_Pool::shutdown (void) i + 1)); ACE_Message_Block *mb1; ACE_NEW_RETURN (mb1, - ACE_Message_Block ((char*)0), + ACE_Message_Block ((char*) Test::Echo::_nil ()), -1); mb1->length (0); @@ -67,7 +67,7 @@ Thread_Pool::put (Test::Echo_ptr echoptr) { char * charData = (char *) Test::Echo::_duplicate (echoptr); - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN(mb, ACE_Message_Block(charData), -1); return this->put (mb); } @@ -95,7 +95,7 @@ Thread_Pool::svc (void) for (;; count++) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; #if 0 ACE_DEBUG ((LM_DEBUG, @@ -125,8 +125,7 @@ Thread_Pool::svc (void) Test::Echo_var echo = (Test::Echo_ptr)mb->base(); - // Echo_var is responsible for deallocating this. - // mb->release (); + mb->release (); if (CORBA::is_nil(echo.in())) { diff --git a/tests/Bug_1361_Regression/client.cpp b/tests/Bug_1361_Regression/client.cpp index 57ae006f44f..bd9b8da4374 100644 --- a/tests/Bug_1361_Regression/client.cpp +++ b/tests/Bug_1361_Regression/client.cpp @@ -2,14 +2,11 @@ #include "Echo.h" #include "ORB_Task.h" -#include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" #include "ace/OS_NS_signal.h" -ACE_RCSID(Bug_1270_Regression, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int serverthreads = 4; @@ -68,9 +65,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Echo> impl; + PortableServer::ServantBase_var impl; { - Echo * tmp; + Echo * tmp = 0; // ACE_NEW_RETURN is the worst possible way to handle // exceptions (think: what if the constructor allocates memory // and fails?), but I'm not in the mood to fight for a more @@ -171,6 +168,6 @@ 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/tests/Bug_1361_Regression/run_test.pl b/tests/Bug_1361_Regression/run_test.pl index 8c91f3676f5..8f9467135a1 100755 --- a/tests/Bug_1361_Regression/run_test.pl +++ b/tests/Bug_1361_Regression/run_test.pl @@ -18,7 +18,7 @@ foreach $i (@ARGV) { $debug_opts = '-ORBDebugLevel 10 -ORBVerboseLogging 1 ' . '-ORBLogFile client'; $srv_debug = '-ORBDebugLevel 5'; - } + } } my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; diff --git a/tests/Bug_1361_Regression/server.cpp b/tests/Bug_1361_Regression/server.cpp index ae617a640da..7ca77b344f3 100644 --- a/tests/Bug_1361_Regression/server.cpp +++ b/tests/Bug_1361_Regression/server.cpp @@ -1,14 +1,11 @@ // $Id$ #include "Echo_Caller.h" -#include "tao/Utils/Servant_Var.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "Server_Thread_Pool.h" #include "ORB_Task.h" -ACE_RCSID(Bug_1270_Regression, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -42,9 +39,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_Thread_Manager mymanager; Thread_Pool callback_pool (orb.in (), &mymanager, 10); - TAO::Utils::Servant_Var<Echo_Caller> impl; + PortableServer::ServantBase_var impl; { - Echo_Caller * tmp; + Echo_Caller * tmp = 0; // ACE_NEW_RETURN is the worst possible way to handle // exceptions (think: what if the constructor allocates memory // and fails?), but I'm not in the mood to fight for a more @@ -125,6 +122,6 @@ 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/tests/Bug_1361_Regression/shutdown.cpp b/tests/Bug_1361_Regression/shutdown.cpp index cdf5316cc59..a128eec709f 100644 --- a/tests/Bug_1361_Regression/shutdown.cpp +++ b/tests/Bug_1361_Regression/shutdown.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Bug_1361_Regression, shutdown, "$Id$") - #if defined (ACE_OPENVMS) // need this to circumvent link error on OpenVMS // has to do with interference in template instantiations @@ -80,6 +78,6 @@ 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/tests/Bug_1383_Regression/Makefile.am b/tests/Bug_1383_Regression/Makefile.am deleted file mode 100644 index 9c5e7b846ea..00000000000 --- a/tests/Bug_1383_Regression/Makefile.am +++ /dev/null @@ -1,138 +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_1383_Regression_Idl.am - -BUILT_SOURCES = \ - calleeC.cpp \ - calleeC.h \ - calleeC.inl \ - calleeS.cpp \ - calleeS.h \ - calleeS.inl - -CLEANFILES = \ - callee-stamp \ - calleeC.cpp \ - calleeC.h \ - calleeC.inl \ - calleeS.cpp \ - calleeS.h \ - calleeS.inl - -calleeC.cpp calleeC.h calleeC.inl calleeS.cpp calleeS.h calleeS.inl: callee-stamp - -callee-stamp: $(srcdir)/callee.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/callee.idl - @touch $@ - -BUILT_SOURCES += \ - simpleC.cpp \ - simpleC.h \ - simpleC.inl \ - simpleS.cpp \ - simpleS.h \ - simpleS.inl - -CLEANFILES += \ - simple-stamp \ - simpleC.cpp \ - simpleC.h \ - simpleC.inl \ - simpleS.cpp \ - simpleS.h \ - simpleS.inl - -simpleC.cpp simpleC.h simpleC.inl simpleS.cpp simpleS.h simpleS.inl: simple-stamp - -simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/simple.idl - @touch $@ - -noinst_HEADERS = \ - callee.idl \ - simple.idl - -## Makefile.Bug_1383_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 = \ - Callee_i.cpp \ - SimpleClient.cpp \ - calleeC.cpp \ - calleeS.cpp \ - simpleC.cpp \ - Callee_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.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.Bug_1383_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 = \ - SimpleServer.cpp \ - calleeC.cpp \ - simpleC.cpp \ - simpleS.cpp \ - simple_i.cpp \ - simple_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(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/tests/Bug_1476_Regression/Client_Task.cpp b/tests/Bug_1476_Regression/Client_Task.cpp index 12e18871ff5..48e0f8666bf 100644 --- a/tests/Bug_1476_Regression/Client_Task.cpp +++ b/tests/Bug_1476_Regression/Client_Task.cpp @@ -7,8 +7,6 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Bug_1476_Regression, Client_Task, "$Id$") - Client_Task::Client_Task (CORBA::ORB_ptr orb, Test::Sender_ptr reply_gen, ACE_Thread_Manager *thr_mgr, diff --git a/tests/Bug_1476_Regression/Makefile.am b/tests/Bug_1476_Regression/Makefile.am deleted file mode 100644 index f911655e87a..00000000000 --- a/tests/Bug_1476_Regression/Makefile.am +++ /dev/null @@ -1,125 +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_1476_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_1476_Regression_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_Task.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Client_Task.h \ - Server_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.Bug_1476_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Sender_i.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Sender_i.h \ - Server_Task.h - -server_LDADD = \ - $(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_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 - -## 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/Bug_1476_Regression/Sender_i.cpp b/tests/Bug_1476_Regression/Sender_i.cpp index 142e4e6e2c5..ae31215c43d 100644 --- a/tests/Bug_1476_Regression/Sender_i.cpp +++ b/tests/Bug_1476_Regression/Sender_i.cpp @@ -1,6 +1,6 @@ -#include "Sender_i.h" +// $Id$ -ACE_RCSID(Bug_1476_Regression, Sender_i, "$Id$") +#include "Sender_i.h" Sender_i::Sender_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)), diff --git a/tests/Bug_1476_Regression/Sender_i.h b/tests/Bug_1476_Regression/Sender_i.h index d600e7a32e0..773e07812e1 100644 --- a/tests/Bug_1476_Regression/Sender_i.h +++ b/tests/Bug_1476_Regression/Sender_i.h @@ -42,7 +42,7 @@ public: private: /// Our local ORB ptr - CORBA::ORB_ptr orb_; + CORBA::ORB_var orb_; /// Number of active objects who are trying to connect CORBA::ULong active_objects_; diff --git a/tests/Bug_1476_Regression/Server_Task.cpp b/tests/Bug_1476_Regression/Server_Task.cpp index d52edc68000..3b8532d941d 100644 --- a/tests/Bug_1476_Regression/Server_Task.cpp +++ b/tests/Bug_1476_Regression/Server_Task.cpp @@ -4,8 +4,6 @@ #include "Server_Task.h" -ACE_RCSID(Bug_1476_Regression, Server_Task, "$Id$") - Server_Task::Server_Task (CORBA::ORB_ptr orb, ACE_Thread_Manager *thr_mgr) : ACE_Task_Base (thr_mgr) diff --git a/tests/Bug_1476_Regression/client.cpp b/tests/Bug_1476_Regression/client.cpp index e285a9b0ebf..eb78e7d3824 100644 --- a/tests/Bug_1476_Regression/client.cpp +++ b/tests/Bug_1476_Regression/client.cpp @@ -11,8 +11,6 @@ #include "tao/PortableServer/PortableServer.h" #include "tao/AnyTypeCode/Any.h" -ACE_RCSID(Bug_1476_Regression, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int number_of_oneways = 10; int number_of_client_tasks = 2; @@ -46,7 +44,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/tests/Bug_1476_Regression/server.cpp b/tests/Bug_1476_Regression/server.cpp index 5045536c573..0b24119f46e 100644 --- a/tests/Bug_1476_Regression/server.cpp +++ b/tests/Bug_1476_Regression/server.cpp @@ -5,8 +5,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/Get_Opt.h" -ACE_RCSID(Oneways_Invoking_Twoways, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int number_of_oneways = 10; @@ -34,7 +32,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/tests/Bug_1476_Test/Makefile.am b/tests/Bug_1476_Test/Makefile.am deleted file mode 100644 index 3a639e48146..00000000000 --- a/tests/Bug_1476_Test/Makefile.am +++ /dev/null @@ -1,81 +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) - - -## Makefile.Bug_1476_Test_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - HelloC.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.h \ - HelloS.inl - -CLEANFILES = \ - Hello-stamp \ - HelloC.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.h \ - HelloS.inl - -HelloC.cpp HelloC.h HelloC.inl HelloS.h HelloS.inl: Hello-stamp - -Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Hello.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - HelloC.cpp \ - client.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.h \ - HelloS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## 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/Bug_1476_Test/client.cpp b/tests/Bug_1476_Test/client.cpp index 97d07727d6e..f803832567c 100644 --- a/tests/Bug_1476_Test/client.cpp +++ b/tests/Bug_1476_Test/client.cpp @@ -14,8 +14,6 @@ #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); bool level_obj = false; bool level_thread = false; @@ -79,7 +77,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; } @@ -96,61 +94,68 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) CORBA::Object_var tmp = orb->string_to_object(ior); - if (CORBA::is_nil (tmp.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, "Invalid IOR.\n") - ,1); - } + if (CORBA::is_nil (tmp.in ())) + { + ACE_ERROR_RETURN ((LM_ERROR, "Invalid IOR.\n") + ,1); + } { - // Set the Synch Scopes + // Set the Synch Scopes - CORBA::Any scope_as_any; + CORBA::Any scope_as_any; - if (synch_none == true) - { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Applying SYNC_NONE.\n")); - scope_as_any <<= Messaging::SYNC_NONE; - } - else if (synch_delayed == true) - { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Applying SYNC_DELAYED_BUFFERING.\n")); - scope_as_any <<= TAO::SYNC_DELAYED_BUFFERING; - } + if (synch_none == true) + { + ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Applying SYNC_NONE.\n")); + scope_as_any <<= Messaging::SYNC_NONE; + } + else if (synch_delayed == true) + { + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) - Applying SYNC_DELAYED_BUFFERING.\n")); + scope_as_any <<= TAO::SYNC_DELAYED_BUFFERING; + } - CORBA::PolicyList policies (1); - policies.length (1); - policies[0] = - orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any); + CORBA::PolicyList policies (1); + policies.length (1); + policies[0] = + orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, + scope_as_any); - if (level_thread == true) - { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Applying Synch Scope at thread level.\n")); + if (level_thread == true) + { + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) - Applying Synch Scope at thread level.\n")); - CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent"); - CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in ()); + CORBA::Object_var object = + orb->resolve_initial_references ("PolicyCurrent"); + CORBA::PolicyCurrent_var policy_current = + CORBA::PolicyCurrent::_narrow (object.in ()); - policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE); - } - else if (level_orb == true) - { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Applying Synch Scope at orb level.\n")); + policy_current->set_policy_overrides (policies, + CORBA::ADD_OVERRIDE); + } + else if (level_orb == true) + { + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) - Applying Synch Scope at orb level.\n")); - CORBA::Object_var obj = - orb->resolve_initial_references("ORBPolicyManager"); - CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow(obj.in()); + CORBA::Object_var obj = + orb->resolve_initial_references("ORBPolicyManager"); + CORBA::PolicyManager_var policy_manager = + CORBA::PolicyManager::_narrow(obj.in()); - policy_manager->set_policy_overrides (policies, CORBA::ADD_OVERRIDE); - } - else if (level_obj == true) - { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Applying Synch Scope at Object level.\n")); + policy_manager->set_policy_overrides (policies, + CORBA::ADD_OVERRIDE); + } + else if (level_obj == true) + { + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) - Applying Synch Scope at Object level.\n")); - tmp = tmp->_set_policy_overrides (policies, CORBA::SET_OVERRIDE); - } + tmp = tmp->_set_policy_overrides (policies, CORBA::SET_OVERRIDE); + } policies[0]->destroy (); } @@ -158,12 +163,13 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) Test::Hello_var hello = Test::Hello::_narrow(tmp.in ()); - if (CORBA::is_nil (hello.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, - "Nil Test::Hello reference <%s>\n", - ior), - 1); - } + if (CORBA::is_nil (hello.in ())) + { + ACE_ERROR_RETURN ((LM_ERROR, + "Nil Test::Hello reference <%s>\n", + ior), + 1); + } // If a blocking connection is initiated in the next step // the test will get an exception indicating test failure. @@ -174,18 +180,21 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) TAO::Transport_Cache_Manager &tcm = hello->orb_core ()->lane_resources ().transport_cache (); - TAO_Transport *transport = 0; - TAO_Base_Transport_Property desc (hello->_stubobj ()->profile_in_use()->endpoint ()); + TAO_Base_Transport_Property desc (hello->_stubobj ()->profile_in_use ()->endpoint ()); - if (tcm.current_size() == 0) { - ACE_ERROR_RETURN ((LM_ERROR, - "The Transport Cache shouldn't be empty here.\n"), - 1); - } + if (tcm.current_size() == 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + "The Transport Cache shouldn't be empty here.\n"), + 1); + } size_t busy_count = 0; + TAO_Transport *transport = 0; TAO::Transport_Cache_Manager::Find_Result find_result = tcm.find_transport (&desc, transport, busy_count); + // We don't need this transport any more. Release the ownership. + transport->remove_reference (); switch (find_result){ case TAO::Transport_Cache_Manager::CACHE_FOUND_NONE: @@ -221,7 +230,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } } - orb->destroy (); } catch (const CORBA::Exception &ex) diff --git a/tests/Bug_1476_Test/run_test.pl b/tests/Bug_1476_Test/run_test.pl index c3694f44c0f..fcf92cadd2e 100755 --- a/tests/Bug_1476_Test/run_test.pl +++ b/tests/Bug_1476_Test/run_test.pl @@ -29,7 +29,7 @@ my @levels = ("obj", "orb", "thread"); foreach $synch (@synchs) { foreach $level (@levels) { - $CL->Arguments ("-ORBDebuglevel $debug_level -k file://$client_iorfile -s$synch -l$level"); + $CL->Arguments ("-ORBDebuglevel $debug_level -k file://$client_iorfile -s$synch -l$level"); $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 285); diff --git a/tests/Bug_1482_Regression/Client_Task.cpp b/tests/Bug_1482_Regression/Client_Task.cpp index 822d5322d78..123a01f9dbb 100644 --- a/tests/Bug_1482_Regression/Client_Task.cpp +++ b/tests/Bug_1482_Regression/Client_Task.cpp @@ -5,8 +5,6 @@ #include "Client_Task.h" #include "tao/Stub.h" -ACE_RCSID(Muxing, Client_Task, "$Id$") - Client_Task::Client_Task (Test::Hello_ptr receiver, CORBA::ORB_ptr o, ACE_Thread_Manager *thr_mgr) diff --git a/tests/Bug_1482_Regression/Hello.cpp b/tests/Bug_1482_Regression/Hello.cpp index c08ad59c653..2d3482160b2 100644 --- a/tests/Bug_1482_Regression/Hello.cpp +++ b/tests/Bug_1482_Regression/Hello.cpp @@ -4,12 +4,6 @@ #include "Hello.h" #include "ace/ACE.h" - -ACE_RCSID (Bug_1482_Regression, - Hello, - "$Id$") - - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) , mutex_ () @@ -36,9 +30,10 @@ Hello::next_prime (void) while (bc == 0) { - if (ACE::is_prime (++this->latest_prime_, + ++this->latest_prime_; + if (ACE::is_prime (this->latest_prime_, 2, - this->latest_prime_/2) == 0) + this->latest_prime_ / 2) == 0) bc = 1; } } diff --git a/tests/Bug_1482_Regression/Makefile.am b/tests/Bug_1482_Regression/Makefile.am deleted file mode 100644 index 612da503c32..00000000000 --- a/tests/Bug_1482_Regression/Makefile.am +++ /dev/null @@ -1,138 +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_1482_Regression_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -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) -GH -GC $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Bug_1482_Regression_Client.am - -if BUILD_AMI -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_Task.cpp \ - Reply_Handler.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Client_Task.h \ - Reply_Handler.h - -client_LDADD = \ - $(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_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 -endif BUILD_AMI - -## Makefile.Bug_1482_Regression_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h \ - Server_Task.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.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_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 -endif BUILD_AMI - -## 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/Bug_1482_Regression/Server_Task.cpp b/tests/Bug_1482_Regression/Server_Task.cpp index f3a3cfadc65..9447621cd73 100644 --- a/tests/Bug_1482_Regression/Server_Task.cpp +++ b/tests/Bug_1482_Regression/Server_Task.cpp @@ -3,8 +3,6 @@ // #include "Server_Task.h" -ACE_RCSID(Muxing, Server_Task, "$Id$") - Server_Task::Server_Task (CORBA::ORB_ptr orb, ACE_Thread_Manager *thr_mgr) : ACE_Task_Base (thr_mgr) diff --git a/tests/Bug_1482_Regression/client.cpp b/tests/Bug_1482_Regression/client.cpp index bfec4f1e8e9..771eb400b34 100644 --- a/tests/Bug_1482_Regression/client.cpp +++ b/tests/Bug_1482_Regression/client.cpp @@ -5,8 +5,6 @@ #include "ace/Get_Opt.h" #include "tao/AnyTypeCode/Any.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -31,7 +29,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; } @@ -71,7 +69,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) poa_manager->activate (); - CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = diff --git a/tests/Bug_1482_Regression/server.cpp b/tests/Bug_1482_Regression/server.cpp index 87d6842dbd1..83582b0ecaa 100644 --- a/tests/Bug_1482_Regression/server.cpp +++ b/tests/Bug_1482_Regression/server.cpp @@ -3,10 +3,6 @@ #include "Hello.h" #include "ace/Get_Opt.h" -ACE_RCSID (LongUpcall_Crash_Test, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -31,7 +27,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/tests/Bug_1495_Regression/Client_ORBInitializer.cpp b/tests/Bug_1495_Regression/Client_ORBInitializer.cpp index 9c1054f4ec9..fc0a4beaa9b 100644 --- a/tests/Bug_1495_Regression/Client_ORBInitializer.cpp +++ b/tests/Bug_1495_Regression/Client_ORBInitializer.cpp @@ -6,8 +6,6 @@ #include "Client_ORBInitializer.h" #include "interceptors.h" -ACE_RCSID (Service_Context_Manipulation, Client_ORBInitializer, "$Id$") - Client_ORBInitializer::Client_ORBInitializer (void) { } diff --git a/tests/Bug_1495_Regression/Makefile.am b/tests/Bug_1495_Regression/Makefile.am deleted file mode 100644 index 05080588db5..00000000000 --- a/tests/Bug_1495_Regression/Makefile.am +++ /dev/null @@ -1,128 +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_1495_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_1495_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Task.cpp \ - Server_Task.cpp \ - Threaded_Client.cpp \ - client_interceptor.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Client_Task.h \ - Server_Task.h \ - client_interceptor.h \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.Bug_1495_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Server_ORBInitializer.cpp \ - Threaded_Server.cpp \ - server_interceptor.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - server_interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_INTERCEPTORS -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/Bug_1495_Regression/Server_ORBInitializer.cpp b/tests/Bug_1495_Regression/Server_ORBInitializer.cpp index 5c484b8b253..c49d26cc388 100644 --- a/tests/Bug_1495_Regression/Server_ORBInitializer.cpp +++ b/tests/Bug_1495_Regression/Server_ORBInitializer.cpp @@ -6,8 +6,6 @@ #include "Server_ORBInitializer.h" #include "server_interceptor.h" -ACE_RCSID (Service_Context_Manipulation, Server_ORBInitializer, "$Id$") - Server_ORBInitializer::Server_ORBInitializer (void) { } diff --git a/tests/Bug_1495_Regression/Threaded_Server.cpp b/tests/Bug_1495_Regression/Threaded_Server.cpp index 3cc9f9e1099..d1546f48035 100644 --- a/tests/Bug_1495_Regression/Threaded_Server.cpp +++ b/tests/Bug_1495_Regression/Threaded_Server.cpp @@ -7,10 +7,6 @@ #include "Server_ORBInitializer.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (Service_Context_Manipulation, - server, - "$Id$" ) - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); const ACE_TCHAR *ior_input_file = ACE_TEXT("file://thr_server.ior"); @@ -40,7 +36,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/tests/Bug_1495_Regression/client_interceptor.cpp b/tests/Bug_1495_Regression/client_interceptor.cpp index d3c8aee2c01..059bfe983b0 100644 --- a/tests/Bug_1495_Regression/client_interceptor.cpp +++ b/tests/Bug_1495_Regression/client_interceptor.cpp @@ -7,11 +7,6 @@ #include "ace/OS_NS_string.h" #include "ace/Thread.h" -ACE_RCSID (Bug_1495_Regression_Test, - client_interceptor, - "$Id$") - - Echo_Client_Request_Interceptor:: Echo_Client_Request_Interceptor (const char *id) : myname_ ("Echo_Client_Interceptor"), diff --git a/tests/Bug_1495_Regression/run_test.pl b/tests/Bug_1495_Regression/run_test.pl index bb82da99587..9c3ceb458d1 100755 --- a/tests/Bug_1495_Regression/run_test.pl +++ b/tests/Bug_1495_Regression/run_test.pl @@ -35,12 +35,12 @@ my $client_thrserverfile = $client->LocalFile ($thrserverfile); $server->DeleteFile($thrserverfile); $client->DeleteFile($thrserverfile); -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-o $server_iorbase " . "-i file://$server_thrserverfile"); -$CL = $client->CreateProcess ("client", +$CL = $client->CreateProcess ("client", "-ORBdebuglevel $debug_level " . "-o $client_thrserverfile " . "-i $client_iorbase"); diff --git a/tests/Bug_1495_Regression/run_test_complex.pl b/tests/Bug_1495_Regression/run_test_complex.pl index 006225e2c8a..a4edc3de408 100755 --- a/tests/Bug_1495_Regression/run_test_complex.pl +++ b/tests/Bug_1495_Regression/run_test_complex.pl @@ -46,17 +46,17 @@ my $middle_middleserverfile = $middle->LocalFile ($middleserverfile); $middle->DeleteFile($middleserverfile); $middle->DeleteFile($thrserverfile); -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-o $server_inputfile " . "-i file://$server_middleserverfile"); -$CL = $client->CreateProcess ("client", +$CL = $client->CreateProcess ("client", "-ORBdebuglevel $debug_level " . "-i file://$client_inputfile " . "-o $client_thrserverfile"); -$ML = $middle->CreateProcess ("server", +$ML = $middle->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-i file://$middle_thrserverfile " . "-o $middle_middleserverfile"); diff --git a/tests/Bug_1495_Regression/server_interceptor.cpp b/tests/Bug_1495_Regression/server_interceptor.cpp index 7d784a15fb6..7e3683a231e 100644 --- a/tests/Bug_1495_Regression/server_interceptor.cpp +++ b/tests/Bug_1495_Regression/server_interceptor.cpp @@ -7,11 +7,6 @@ #include "ace/OS_NS_string.h" #include "ace/Thread.h" -ACE_RCSID (Bug_1495_Regression_Test, - server_interceptor, - "$Id$") - - Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) : myname_ ("Echo_Server_Interceptor") { diff --git a/tests/Bug_1495_Regression/test.idl b/tests/Bug_1495_Regression/test.idl index 1f070aa6633..2c2673dac6d 100644 --- a/tests/Bug_1495_Regression/test.idl +++ b/tests/Bug_1495_Regression/test.idl @@ -1,20 +1,17 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Bug_1495_Regression -// -// = FILENAME -// test.idl -// -// = DESCRIPTION -// Simple IDL file to test regression of bug 1495 -// -// = AUTHORS -// Will Otte <wotte@dre.vanderbilt.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file test.idl + * + * $Id$ + * + * Simple IDL file to test regression of bug 1495 + * + * + * @author Will Otte <wotte@dre.vanderbilt.edu> + */ +//============================================================================= + module Bug1495_Regression { diff --git a/tests/Bug_1495_Regression/tid_to_int.h b/tests/Bug_1495_Regression/tid_to_int.h index 4b374663c38..9a1010188a4 100755 --- a/tests/Bug_1495_Regression/tid_to_int.h +++ b/tests/Bug_1495_Regression/tid_to_int.h @@ -38,7 +38,7 @@ namespace // We assume sizeof(thread_id_type) >= sizeof(ace_thread_id_type). return (thread_id_type) tmp; - } + } }; template<typename thread_id_type> diff --git a/tests/Bug_1535_Regression/Makefile.am b/tests/Bug_1535_Regression/Makefile.am deleted file mode 100644 index f5b78061ffe..00000000000 --- a/tests/Bug_1535_Regression/Makefile.am +++ /dev/null @@ -1,83 +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) - - -## Makefile.bug_1535_regression.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 = bug_1535_regression - -bug_1535_regression_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -bug_1535_regression_SOURCES = \ - Test.cpp \ - TestC.cpp \ - TestS.cpp \ - bug_1535_regression.cpp \ - Test.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -bug_1535_regression_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/Bug_1535_Regression/Test.cpp b/tests/Bug_1535_Regression/Test.cpp index 00399f096ea..8ecec19473b 100644 --- a/tests/Bug_1535_Regression/Test.cpp +++ b/tests/Bug_1535_Regression/Test.cpp @@ -3,8 +3,6 @@ // #include "Test.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (PortableServer::POA_ptr poa) : poa_ (PortableServer::POA::_duplicate (poa)) { diff --git a/tests/Bug_1535_Regression/bug_1535_regression.cpp b/tests/Bug_1535_Regression/bug_1535_regression.cpp index d5147c7eb47..9b31706698f 100644 --- a/tests/Bug_1535_Regression/bug_1535_regression.cpp +++ b/tests/Bug_1535_Regression/bug_1535_regression.cpp @@ -4,11 +4,6 @@ #include "tao/Utils/ORB_Destroyer.h" #include "tao/Utils/RIR_Narrow.h" #include "tao/Utils/PolicyList_Destroyer.h" -#include "tao/Utils/Servant_Var.h" - -ACE_RCSID (Bug_1535_Regression, - bug_1535_regression, - "$Id$") PortableServer::POA_ptr create_persistent_POA (PortableServer::POA_ptr parent, diff --git a/tests/Bug_1551_Regression/Client_Task.cpp b/tests/Bug_1551_Regression/Client_Task.cpp index a2eda92853d..9582472460d 100644 --- a/tests/Bug_1551_Regression/Client_Task.cpp +++ b/tests/Bug_1551_Regression/Client_Task.cpp @@ -1,11 +1,7 @@ -// // $Id$ -// #include "Client_Task.h" -ACE_RCSID(Bug_1XXX_Regression, Client_Task, "$Id$") - Client_Task::Client_Task (Test::Hello_ptr receiver, CORBA::ORB_ptr orb, ACE_Thread_Manager *thr_mgr) diff --git a/tests/Bug_1551_Regression/Client_Task.h b/tests/Bug_1551_Regression/Client_Task.h index ff66a0e51a0..1027324cfce 100644 --- a/tests/Bug_1551_Regression/Client_Task.h +++ b/tests/Bug_1551_Regression/Client_Task.h @@ -9,7 +9,6 @@ #include "TestC.h" #include "Reply_Handler.h" -#include "tao/Utils/Servant_Var.h" #include "ace/Task.h" /// Implement a Task to run the experiments using multiple threads. @@ -30,7 +29,7 @@ private: /// Reference to the test interface Test::Hello_var receiver_; - TAO::Utils::Servant_Var<Reply_Handler> handler_; + PortableServer::Servant_var <Reply_Handler> handler_; Test::AMI_HelloHandler_var handler_var_; diff --git a/tests/Bug_1551_Regression/Hello.cpp b/tests/Bug_1551_Regression/Hello.cpp index 7dc579f2fbc..55866f53bad 100644 --- a/tests/Bug_1551_Regression/Hello.cpp +++ b/tests/Bug_1551_Regression/Hello.cpp @@ -3,8 +3,6 @@ #include "Hello.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Bug_1XXX_Regression, Hello, "$Id$") - Hello::Hello( CORBA::ORB_ptr orb, bool simulate_crashes) diff --git a/tests/Bug_1551_Regression/Makefile.am b/tests/Bug_1551_Regression/Makefile.am deleted file mode 100644 index 4c35fecaa96..00000000000 --- a/tests/Bug_1551_Regression/Makefile.am +++ /dev/null @@ -1,138 +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_1551_Regression_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -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) -GC $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Bug_1551_Regression_Client.am - -if BUILD_AMI -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_Task.cpp \ - Reply_Handler.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Client_Task.h \ - Reply_Handler.h - -client_LDADD = \ - $(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_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 -endif BUILD_AMI - -## Makefile.Bug_1551_Regression_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h \ - Server_Task.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.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_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 -endif BUILD_AMI - -## 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/Bug_1551_Regression/Reply_Handler.cpp b/tests/Bug_1551_Regression/Reply_Handler.cpp index 88e34505a96..fb626dd6af9 100644 --- a/tests/Bug_1551_Regression/Reply_Handler.cpp +++ b/tests/Bug_1551_Regression/Reply_Handler.cpp @@ -1,11 +1,7 @@ -// // $Id$ -// #include "Reply_Handler.h" -ACE_RCSID(Bug_1XXX_Regression, Reply_Handler, "$Id$") - Reply_Handler::Reply_Handler ( Test::Hello_ptr hello, CORBA::ORB_ptr orb) : counter_(1000) diff --git a/tests/Bug_1551_Regression/Server_Task.cpp b/tests/Bug_1551_Regression/Server_Task.cpp index 9f6f0783b85..246a93ce865 100644 --- a/tests/Bug_1551_Regression/Server_Task.cpp +++ b/tests/Bug_1551_Regression/Server_Task.cpp @@ -3,8 +3,6 @@ // #include "Server_Task.h" -ACE_RCSID(Bug_1XXX_Regression, Server_Task, "$Id$") - Server_Task::Server_Task (CORBA::ORB_ptr orb, ACE_Thread_Manager *thr_mgr) : ACE_Task_Base (thr_mgr) diff --git a/tests/Bug_1551_Regression/client.cpp b/tests/Bug_1551_Regression/client.cpp index d604a62dd60..5e45e51c4aa 100644 --- a/tests/Bug_1551_Regression/client.cpp +++ b/tests/Bug_1551_Regression/client.cpp @@ -7,8 +7,6 @@ #include "ace/Get_Opt.h" #include "tao/AnyTypeCode/Any.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 1; @@ -39,7 +37,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/tests/Bug_1551_Regression/server.cpp b/tests/Bug_1551_Regression/server.cpp index bafab201b6b..40e406e3ece 100644 --- a/tests/Bug_1551_Regression/server.cpp +++ b/tests/Bug_1551_Regression/server.cpp @@ -2,12 +2,9 @@ #include "Hello.h" #include "Server_Task.h" -#include "tao/Utils/Servant_Var.h" #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" -ACE_RCSID (Bug_1XXX_Regression, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); bool simulate_crashes = true; @@ -46,7 +43,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; } @@ -83,7 +80,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return -1; - TAO::Utils::Servant_Var<Hello> hello_impl( + PortableServer::ServantBase_var hello_impl( new Hello(orb.in(), simulate_crashes)); PortableServer::ObjectId_var id = diff --git a/tests/Bug_1568_Regression/Makefile.am b/tests/Bug_1568_Regression/Makefile.am deleted file mode 100644 index f2426d03dd1..00000000000 --- a/tests/Bug_1568_Regression/Makefile.am +++ /dev/null @@ -1,123 +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_1568_Regression_Idl.am - -if BUILD_CORBA_MESSAGING -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) -GH $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Bug_1568_Regression_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 = \ - TestC.cpp \ - TestS.cpp \ - client.cpp - -client_LDADD = \ - $(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_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.Bug_1568_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp - -server_LDADD = \ - $(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_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 - -## 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/Bug_1568_Regression/client.cpp b/tests/Bug_1568_Regression/client.cpp index 7aa1287510a..2f1d89ac396 100644 --- a/tests/Bug_1568_Regression/client.cpp +++ b/tests/Bug_1568_Regression/client.cpp @@ -10,8 +10,6 @@ #include "ace/Get_Opt.h" -ACE_RCSID(Bug_1568_Regression, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -36,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/tests/Bug_1568_Regression/run_test.pl b/tests/Bug_1568_Regression/run_test.pl index 7eee3624c54..e20d93f2b50 100755 --- a/tests/Bug_1568_Regression/run_test.pl +++ b/tests/Bug_1568_Regression/run_test.pl @@ -14,7 +14,7 @@ $debug_level = '0'; foreach $i (@ARGV) { if ($i eq '-debug') { $debug_level = '10'; - } + } } my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; diff --git a/tests/Bug_1568_Regression/server.cpp b/tests/Bug_1568_Regression/server.cpp index 24bbf4fc48f..9e2a7e30078 100644 --- a/tests/Bug_1568_Regression/server.cpp +++ b/tests/Bug_1568_Regression/server.cpp @@ -7,14 +7,11 @@ */ #include "TestS.h" -#include "tao/Utils/Servant_Var.h" #include "tao/corba.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" -ACE_RCSID(Bug_1568_Regression, server, "$Id$") - /** * @class Simple_C * @@ -101,7 +98,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; } @@ -130,7 +127,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Simple_C> simple_c_impl( + PortableServer::Servant_var<Simple_C> simple_c_impl( new Simple_C(orb.in())); PortableServer::ObjectId_var id = diff --git a/tests/Bug_1627_Regression/Makefile.am b/tests/Bug_1627_Regression/Makefile.am deleted file mode 100644 index 0d96cf2adf9..00000000000 --- a/tests/Bug_1627_Regression/Makefile.am +++ /dev/null @@ -1,107 +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_1627_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_1627_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 = \ - TestC.cpp \ - client.cpp \ - Test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_1627_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 \ - TestS.cpp \ - Test_i.cpp \ - server.cpp \ - Test_i.h - -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/tests/Bug_1627_Regression/client.cpp b/tests/Bug_1627_Regression/client.cpp index d29f072a754..4a0ab7db26d 100644 --- a/tests/Bug_1627_Regression/client.cpp +++ b/tests/Bug_1627_Regression/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/tests/Bug_1627_Regression/server.cpp b/tests/Bug_1627_Regression/server.cpp index 8acd5f2e037..08715c08c59 100644 --- a/tests/Bug_1627_Regression/server.cpp +++ b/tests/Bug_1627_Regression/server.cpp @@ -35,7 +35,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/tests/Bug_1635_Regression/Makefile.am b/tests/Bug_1635_Regression/Makefile.am deleted file mode 100644 index 3ba24415721..00000000000 --- a/tests/Bug_1635_Regression/Makefile.am +++ /dev/null @@ -1,44 +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_1635_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.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/Bug_1636_Regression/Makefile.am b/tests/Bug_1636_Regression/Makefile.am deleted file mode 100644 index 88d3c6e526f..00000000000 --- a/tests/Bug_1636_Regression/Makefile.am +++ /dev/null @@ -1,86 +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) - - -## Makefile.bug_1636_testclient.am - -if BUILD_CORBA_MESSAGING -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 = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -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_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## 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/Bug_1639_Regression/Makefile.am b/tests/Bug_1639_Regression/Makefile.am deleted file mode 100644 index c708c64b3ba..00000000000 --- a/tests/Bug_1639_Regression/Makefile.am +++ /dev/null @@ -1,80 +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) - - -## Makefile.Bug_1639_testclient.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - structC.cpp \ - structC.h \ - structC.inl \ - structS.cpp \ - structS.h \ - structS.inl - -CLEANFILES = \ - struct-stamp \ - structC.cpp \ - structC.h \ - structC.inl \ - structS.cpp \ - structS.h \ - structS.inl - -structC.cpp structC.h structC.inl structS.cpp structS.h structS.inl: struct-stamp - -struct-stamp: $(srcdir)/struct.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/struct.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - structC.cpp \ - structS.cpp \ - struct_client.cpp \ - structC.h \ - structC.inl \ - structS.h \ - structS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/tests/Bug_1670_Regression/Makefile.am b/tests/Bug_1670_Regression/Makefile.am deleted file mode 100644 index b69b8887c6f..00000000000 --- a/tests/Bug_1670_Regression/Makefile.am +++ /dev/null @@ -1,123 +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_1670_Regression_Idl.am - -if BUILD_CORBA_MESSAGING -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) -GH $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Bug_1670_Regression_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 = \ - TestC.cpp \ - TestS.cpp \ - client.cpp - -client_LDADD = \ - $(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_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.Bug_1670_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp - -server_LDADD = \ - $(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_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 - -## 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/Bug_1670_Regression/Test.idl b/tests/Bug_1670_Regression/Test.idl index 2b43053cca3..de8c78c10db 100644 --- a/tests/Bug_1670_Regression/Test.idl +++ b/tests/Bug_1670_Regression/Test.idl @@ -14,7 +14,7 @@ module Foo long op1(); long op2(); }; - + interface B { long op3(); diff --git a/tests/Bug_1670_Regression/client.cpp b/tests/Bug_1670_Regression/client.cpp index d4e7029ae21..42810d581f0 100644 --- a/tests/Bug_1670_Regression/client.cpp +++ b/tests/Bug_1670_Regression/client.cpp @@ -10,8 +10,6 @@ #include "ace/Get_Opt.h" -ACE_RCSID(Bug_1670_Regression, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -36,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/tests/Bug_1670_Regression/server.cpp b/tests/Bug_1670_Regression/server.cpp index 6062d01fc6f..b8738e8c0ef 100644 --- a/tests/Bug_1670_Regression/server.cpp +++ b/tests/Bug_1670_Regression/server.cpp @@ -7,14 +7,11 @@ */ #include "TestS.h" -#include "tao/Utils/Servant_Var.h" #include "tao/corba.h" #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" #include "ace/Reactor.h" -ACE_RCSID(Bug_1670_Regression, server, "$Id$") - /** * @class Simple_C * @@ -103,7 +100,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; } @@ -132,7 +129,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - TAO::Utils::Servant_Var<Simple_C> simple_c_impl( + PortableServer::Servant_var<Simple_C> simple_c_impl( new Simple_C(orb.in())); PortableServer::ObjectId_var id = diff --git a/tests/Bug_1676_Regression/Hello.cpp b/tests/Bug_1676_Regression/Hello.cpp index d1c31b7ac8d..c0f0a801fd8 100644 --- a/tests/Bug_1676_Regression/Hello.cpp +++ b/tests/Bug_1676_Regression/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_1676_Regression/Makefile.am b/tests/Bug_1676_Regression/Makefile.am deleted file mode 100644 index a9af38597c4..00000000000 --- a/tests/Bug_1676_Regression/Makefile.am +++ /dev/null @@ -1,105 +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_1676_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_1676_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 = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_1676_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 = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_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/Bug_1676_Regression/client.cpp b/tests/Bug_1676_Regression/client.cpp index 12a6a238c74..9aafb92d591 100644 --- a/tests/Bug_1676_Regression/client.cpp +++ b/tests/Bug_1676_Regression/client.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -29,7 +27,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/tests/Bug_1676_Regression/server.cpp b/tests/Bug_1676_Regression/server.cpp index c1d8bd1bb30..ab19d0fb0a7 100644 --- a/tests/Bug_1676_Regression/server.cpp +++ b/tests/Bug_1676_Regression/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +28,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/tests/Bug_1693_Test/Makefile.am b/tests/Bug_1693_Test/Makefile.am deleted file mode 100644 index 808a07f09cc..00000000000 --- a/tests/Bug_1693_Test/Makefile.am +++ /dev/null @@ -1,75 +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) - - -## Makefile.Bug_1693_Test_Client.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/Bug_1693_Test/client.cpp b/tests/Bug_1693_Test/client.cpp index 6415ed9e0be..9a44fb1bbee 100644 --- a/tests/Bug_1693_Test/client.cpp +++ b/tests/Bug_1693_Test/client.cpp @@ -1,13 +1,10 @@ // -*- C++ -*- +// $Id$ #include "tao/CodecFactory/CodecFactory.h" #include "testC.h" #include "ace/Log_Msg.h" -ACE_RCSID (Codec, - client, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/tests/Bug_1812_Regression/Makefile.am b/tests/Bug_1812_Regression/Makefile.am deleted file mode 100644 index 5543c31438a..00000000000 --- a/tests/Bug_1812_Regression/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.Bug_1812_Regession_Test.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) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - test.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_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/Bug_1813_Regression/Makefile.am b/tests/Bug_1813_Regression/Makefile.am deleted file mode 100644 index 129033377b7..00000000000 --- a/tests/Bug_1813_Regression/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.Bug_1813_Regession_Test.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) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - test.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_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/Bug_1869_Regression/Makefile.am b/tests/Bug_1869_Regression/Makefile.am deleted file mode 100644 index 77ee0b67a4f..00000000000 --- a/tests/Bug_1869_Regression/Makefile.am +++ /dev/null @@ -1,130 +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_1869_Regression_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - AMIC.cpp \ - AMIC.h \ - AMIC.inl \ - AMIS.cpp \ - AMIS.h \ - AMIS.inl - -CLEANFILES = \ - AMI-stamp \ - AMIC.cpp \ - AMIC.h \ - AMIC.inl \ - AMIS.cpp \ - AMIS.h \ - AMIS.inl - -AMIC.cpp AMIC.h AMIC.inl AMIS.cpp AMIS.h AMIS.inl: AMI-stamp - -AMI-stamp: $(srcdir)/AMI.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/AMI.idl - @touch $@ - -noinst_HEADERS = \ - AMI.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Bug_1869_Regression_Client.am - -if BUILD_AMI -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 = \ - AMIC.cpp \ - AMIS.cpp \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Bug_1869_Regression_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - AMIC.cpp \ - AMIS.cpp \ - server.cpp - -server_LDADD = \ - $(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_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 -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## 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/Bug_1904_Regression/Makefile.am b/tests/Bug_1904_Regression/Makefile.am deleted file mode 100644 index d36e536396c..00000000000 --- a/tests/Bug_1904_Regression/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.test.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) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = test - -test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -test_SOURCES = \ - test.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -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/Bug_2084_Regression/Client_Task.cpp b/tests/Bug_2084_Regression/Client_Task.cpp index 6f909cab23f..8eaf4fdd0a6 100644 --- a/tests/Bug_2084_Regression/Client_Task.cpp +++ b/tests/Bug_2084_Regression/Client_Task.cpp @@ -8,10 +8,6 @@ #include "tao/ORB_Core.h" #include "tao/PortableServer/PortableServer.h" -ACE_RCSID(Bug_2084_Regression, - Client_Task, - "$Id$") - Client_Task::Client_Task (const ACE_TCHAR *ior, CORBA::ORB_ptr corb, ACE_Thread_Manager *thr_mgr) diff --git a/tests/Bug_2084_Regression/Collocated_Test.cpp b/tests/Bug_2084_Regression/Collocated_Test.cpp index 1af0460353f..a08bd75a215 100644 --- a/tests/Bug_2084_Regression/Collocated_Test.cpp +++ b/tests/Bug_2084_Regression/Collocated_Test.cpp @@ -38,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) // This is a hack but that is okay! return 0; } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Bug_2084_Regression/EventNode.cpp b/tests/Bug_2084_Regression/EventNode.cpp index 8490764d777..518367b85cd 100644 --- a/tests/Bug_2084_Regression/EventNode.cpp +++ b/tests/Bug_2084_Regression/EventNode.cpp @@ -7,8 +7,6 @@ #include "tao/ORB_Table.h" #include "tao/ORB_Core_Auto_Ptr.h" -ACE_RCSID(EventNode, EventNode, "$Id$") - EventNode::EventNode (CORBA::ORB_ptr orb, ACE_thread_t thrid) : orb_ (CORBA::ORB::_duplicate (orb)) , thr_id_ (thrid) diff --git a/tests/Bug_2084_Regression/Hello.cpp b/tests/Bug_2084_Regression/Hello.cpp index a374609b63a..c88af27ed68 100644 --- a/tests/Bug_2084_Regression/Hello.cpp +++ b/tests/Bug_2084_Regression/Hello.cpp @@ -7,8 +7,6 @@ #include "tao/ORB_Table.h" #include "tao/ORB_Core_Auto_Ptr.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb, ACE_thread_t thrid) : orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/tests/Bug_2084_Regression/Makefile.am b/tests/Bug_2084_Regression/Makefile.am deleted file mode 100644 index 7248a088a11..00000000000 --- a/tests/Bug_2084_Regression/Makefile.am +++ /dev/null @@ -1,87 +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) - - -## Makefile.Bug_2084_Regression_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) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Client_Task.cpp \ - Collocated_Test.cpp \ - EventNode.cpp \ - Hello.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - Client_Task.h \ - EventNode.h \ - Hello.h \ - Server_Task.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ - tid_to_int.h - -server_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/Bug_2084_Regression/Server_Task.cpp b/tests/Bug_2084_Regression/Server_Task.cpp index a34c5c366e6..ed7fc335f0f 100644 --- a/tests/Bug_2084_Regression/Server_Task.cpp +++ b/tests/Bug_2084_Regression/Server_Task.cpp @@ -8,11 +8,6 @@ #include "ace/Manual_Event.h" #include "tao/ORB_Core.h" -ACE_RCSID(Collocated_Test, - Server_Task, - "$Id$") - - Server_Task::Server_Task (const ACE_TCHAR *output, CORBA::ORB_ptr sorb, ACE_Manual_Event &me, diff --git a/tests/Bug_2085_Regression/Makefile.am b/tests/Bug_2085_Regression/Makefile.am deleted file mode 100644 index 41b8aa70983..00000000000 --- a/tests/Bug_2085_Regression/Makefile.am +++ /dev/null @@ -1,44 +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_2085_Regression.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Bug_2085_Regression.cpp - -client_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/Bug_2119_Regression/Makefile.am b/tests/Bug_2119_Regression/Makefile.am deleted file mode 100644 index 1c0f01c32de..00000000000 --- a/tests/Bug_2119_Regression/Makefile.am +++ /dev/null @@ -1,74 +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) - - -## Makefile.tao67_test.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_LTLIBRARIES = libtao67_test.la - -libtao67_test_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -libtao67_test_la_SOURCES = \ - testC.cpp \ - testS.cpp - -noinst_HEADERS = \ - test.idl \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -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/Bug_2122_Regression/Makefile.am b/tests/Bug_2122_Regression/Makefile.am deleted file mode 100644 index ae3dcd0a80b..00000000000 --- a/tests/Bug_2122_Regression/Makefile.am +++ /dev/null @@ -1,76 +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) - - -## Makefile.Bug_2122_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_2122_Regression_Test.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 \ - test.cpp - -client_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/Bug_2124_Regression/Makefile.am b/tests/Bug_2124_Regression/Makefile.am deleted file mode 100644 index cf8e551344d..00000000000 --- a/tests/Bug_2124_Regression/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.Bug_2124_Regression_Test.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) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - test.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_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/Bug_2124_Regression/Test.idl b/tests/Bug_2124_Regression/Test.idl index 641ad61bb7b..4725a402aff 100644 --- a/tests/Bug_2124_Regression/Test.idl +++ b/tests/Bug_2124_Regression/Test.idl @@ -6,7 +6,7 @@ */ module Test -{ +{ typedef string<10> MyString; typedef MyString OtherString; diff --git a/tests/Bug_2126_Regression/Makefile.am b/tests/Bug_2126_Regression/Makefile.am deleted file mode 100644 index 43339530507..00000000000 --- a/tests/Bug_2126_Regression/Makefile.am +++ /dev/null @@ -1,76 +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) - - -## Makefile.Bug_2126_Regression_Test.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) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - test.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -client_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/Bug_2134_Regression/Makefile.am b/tests/Bug_2134_Regression/Makefile.am deleted file mode 100644 index c2311c083ea..00000000000 --- a/tests/Bug_2134_Regression/Makefile.am +++ /dev/null @@ -1,85 +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) - - -## Makefile.Bug_2134_Regression_Test.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - HelloC.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.cpp \ - HelloS.h \ - HelloS.inl - -CLEANFILES = \ - Hello-stamp \ - HelloC.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.cpp \ - HelloS.h \ - HelloS.inl - -HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp - -Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Hello.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - HelloC.cpp \ - HelloS.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.h \ - HelloS.inl - -server_LDADD = \ - $(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_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 -endif BUILD_CORBA_MESSAGING - -## 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/Bug_2144_Regression/Makefile.am b/tests/Bug_2144_Regression/Makefile.am deleted file mode 100644 index 9eec492db11..00000000000 --- a/tests/Bug_2144_Regression/Makefile.am +++ /dev/null @@ -1,75 +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) - - -## Makefile.Bug_2144_Regression_Client.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = test - -test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -test_SOURCES = \ - test.cpp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/Bug_2174_Regression/Makefile.am b/tests/Bug_2174_Regression/Makefile.am deleted file mode 100644 index 33e3cccba47..00000000000 --- a/tests/Bug_2174_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_2174_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_2174_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 \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2174_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 = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_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/Bug_2174_Regression/client.cpp b/tests/Bug_2174_Regression/client.cpp index b3162c7a9ef..803612e4698 100644 --- a/tests/Bug_2174_Regression/client.cpp +++ b/tests/Bug_2174_Regression/client.cpp @@ -3,8 +3,6 @@ #include "testC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Bug_2174_Regression, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int min_timeout = 0; int max_timeout = 20; @@ -31,7 +29,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/tests/Bug_2174_Regression/server.cpp b/tests/Bug_2174_Regression/server.cpp index 1dc791080b3..a3187bb35a1 100644 --- a/tests/Bug_2174_Regression/server.cpp +++ b/tests/Bug_2174_Regression/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Bug_2174_Regression, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; bool remove_object = false; @@ -36,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Bug_2174_Regression/test_i.cpp b/tests/Bug_2174_Regression/test_i.cpp index ee0a7d02adc..99e084474fb 100644 --- a/tests/Bug_2174_Regression/test_i.cpp +++ b/tests/Bug_2174_Regression/test_i.cpp @@ -1,11 +1,8 @@ // $Id$ #include "test_i.h" - #include "ace/OS_NS_unistd.h" -ACE_RCSID(Timeout, test_i, "$Id$") - Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_2174_Regression/test_i.h b/tests/Bug_2174_Regression/test_i.h index 8c102e3a1b7..eb3d07084a5 100644 --- a/tests/Bug_2174_Regression/test_i.h +++ b/tests/Bug_2174_Regression/test_i.h @@ -1,34 +1,32 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Timeout -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_TIMEOUT_TEST_I_H #define TAO_TIMEOUT_TEST_I_H #include "testS.h" +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb); - // ctor // = The Simple_Server methods. CORBA::Long echo (CORBA::Long x, @@ -36,8 +34,8 @@ public: void shutdown (void); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB }; #endif /* TAO_TIMEOUT_TEST_I_H */ diff --git a/tests/Bug_2183_Regression/Hello.cpp b/tests/Bug_2183_Regression/Hello.cpp index ee93d6507bb..0f62f20b906 100644 --- a/tests/Bug_2183_Regression/Hello.cpp +++ b/tests/Bug_2183_Regression/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "Hello.cpp,v 1.3 2002/01/29 20:21:07 okellogg Exp") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_2183_Regression/Makefile.am b/tests/Bug_2183_Regression/Makefile.am deleted file mode 100644 index 7d777519a1a..00000000000 --- a/tests/Bug_2183_Regression/Makefile.am +++ /dev/null @@ -1,109 +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_2183_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_2183_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 = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2183_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 = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/Bug_2183_Regression/client.cpp b/tests/Bug_2183_Regression/client.cpp index 55dae0a50f3..ff81b60ec4f 100644 --- a/tests/Bug_2183_Regression/client.cpp +++ b/tests/Bug_2183_Regression/client.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "client.cpp,v 1.5 2002/01/29 20:21:07 okellogg Exp") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -29,7 +27,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/tests/Bug_2183_Regression/server.cpp b/tests/Bug_2183_Regression/server.cpp index a2c3e497ce9..c0439be73f2 100644 --- a/tests/Bug_2183_Regression/server.cpp +++ b/tests/Bug_2183_Regression/server.cpp @@ -5,10 +5,6 @@ #include "ace/OS_NS_stdio.h" #include "tao/Strategies/advanced_resource.h" -ACE_RCSID (Hello, - server, - "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -33,7 +29,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/tests/Bug_2186_Regression/Hello.cpp b/tests/Bug_2186_Regression/Hello.cpp index 1795e201f6a..0335cf3e142 100644 --- a/tests/Bug_2186_Regression/Hello.cpp +++ b/tests/Bug_2186_Regression/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_2186_Regression/Makefile.am b/tests/Bug_2186_Regression/Makefile.am deleted file mode 100644 index 9b0b4c7a58b..00000000000 --- a/tests/Bug_2186_Regression/Makefile.am +++ /dev/null @@ -1,115 +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_2186_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_2186_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 = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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.Bug_2186_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 = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/Bug_2186_Regression/Test.idl b/tests/Bug_2186_Regression/Test.idl index 0f5412c0210..c1a23e8d785 100644 --- a/tests/Bug_2186_Regression/Test.idl +++ b/tests/Bug_2186_Regression/Test.idl @@ -16,7 +16,7 @@ module Test * This method is used to simplify the test shutdown process */ oneway void shutdown (); - + void request_callback (in Hello call_me); }; }; diff --git a/tests/Bug_2186_Regression/client.cpp b/tests/Bug_2186_Regression/client.cpp index cd5ad4edf9e..8fcb5bc5025 100644 --- a/tests/Bug_2186_Regression/client.cpp +++ b/tests/Bug_2186_Regression/client.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *server_ior = ACE_TEXT("file://server.ior"); const ACE_TCHAR *ior_output_file = ACE_TEXT("client.ior"); @@ -33,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/tests/Bug_2186_Regression/server.conf b/tests/Bug_2186_Regression/server.conf index cbb2962f41d..df91e079996 100644 --- a/tests/Bug_2186_Regression/server.conf +++ b/tests/Bug_2186_Regression/server.conf @@ -1,2 +1,4 @@ +# $Id$ + static Client_Strategy_Factory "-ORBClientConnectionHandler RW -ORBConnectionHandlerCleanup 1" diff --git a/tests/Bug_2186_Regression/server.cpp b/tests/Bug_2186_Regression/server.cpp index 8d8913374e1..9fa6d7173b3 100644 --- a/tests/Bug_2186_Regression/server.cpp +++ b/tests/Bug_2186_Regression/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int @@ -32,7 +28,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/tests/Bug_2188_Regression/Makefile.am b/tests/Bug_2188_Regression/Makefile.am deleted file mode 100644 index 8cf93f4d44f..00000000000 --- a/tests/Bug_2188_Regression/Makefile.am +++ /dev/null @@ -1,105 +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.broken_idl.am - -BUILT_SOURCES = \ - brokenC.cpp \ - brokenC.h \ - brokenC.inl \ - brokenS.cpp \ - brokenS.h \ - brokenS.inl - -CLEANFILES = \ - broken-stamp \ - brokenC.cpp \ - brokenC.h \ - brokenC.inl \ - brokenS.cpp \ - brokenS.h \ - brokenS.inl - -brokenC.cpp brokenC.h brokenC.inl brokenS.cpp brokenS.h brokenS.inl: broken-stamp - -broken-stamp: $(srcdir)/broken.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/broken.idl - @touch $@ - -noinst_HEADERS = \ - broken.idl - -## Makefile.Broken_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - brokenC.cpp \ - client.cpp \ - broken_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Broken_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - brokenC.cpp \ - brokenS.cpp \ - broken_i.cpp \ - server.cpp \ - broken_i.h - -server_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/Bug_2188_Regression/client.cpp b/tests/Bug_2188_Regression/client.cpp index f6ff28cc076..69d6e0d8854 100644 --- a/tests/Bug_2188_Regression/client.cpp +++ b/tests/Bug_2188_Regression/client.cpp @@ -3,8 +3,6 @@ #include "brokenC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://broken.ior"); int @@ -29,7 +27,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/tests/Bug_2188_Regression/server.cpp b/tests/Bug_2188_Regression/server.cpp index 28f7154e1d8..63ff34345e6 100644 --- a/tests/Bug_2188_Regression/server.cpp +++ b/tests/Bug_2188_Regression/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("broken.ior"); int @@ -32,7 +28,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/tests/Bug_2201_Regression/Makefile.am b/tests/Bug_2201_Regression/Makefile.am deleted file mode 100644 index fee96692f13..00000000000 --- a/tests/Bug_2201_Regression/Makefile.am +++ /dev/null @@ -1,76 +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) - - -## Makefile.Bug_2201_Regression_Test.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - TestDataC.cpp \ - TestDataC.h \ - TestDataC.inl \ - TestDataS.cpp \ - TestDataS.h \ - TestDataS.inl - -CLEANFILES = \ - TestData-stamp \ - TestDataC.cpp \ - TestDataC.h \ - TestDataC.inl \ - TestDataS.cpp \ - TestDataS.h \ - TestDataS.inl - -TestDataC.cpp TestDataC.h TestDataC.inl TestDataS.cpp TestDataS.h TestDataS.inl: TestData-stamp - -TestData-stamp: $(srcdir)/TestData.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestData.idl - @touch $@ - -noinst_PROGRAMS = test - -test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -test_SOURCES = \ - TestDataC.cpp \ - TestDataS.cpp \ - test.cpp \ - TestDataC.h \ - TestDataC.inl \ - TestDataS.h \ - TestDataS.inl - -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/Bug_2222_Regression/Makefile.am b/tests/Bug_2222_Regression/Makefile.am deleted file mode 100644 index a85ab2f7a03..00000000000 --- a/tests/Bug_2222_Regression/Makefile.am +++ /dev/null @@ -1,101 +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) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.Bug_2222_Regression_Test.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - TestCaseC.cpp \ - TestCaseC.h \ - TestCaseC.inl \ - TestCaseS.h \ - TestCaseS.inl - -CLEANFILES += \ - TestCase-stamp \ - TestCaseC.cpp \ - TestCaseC.h \ - TestCaseC.inl \ - TestCaseS.h \ - TestCaseS.inl - -TestCaseC.cpp TestCaseC.h TestCaseC.inl TestCaseS.h TestCaseS.inl: TestCase-stamp - -TestCase-stamp: $(srcdir)/TestCase.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestCase.idl - @touch $@ - -BUILT_SOURCES += \ - TestTypeC.cpp \ - TestTypeC.h \ - TestTypeC.inl \ - TestTypeS.h \ - TestTypeS.inl - -CLEANFILES += \ - TestType-stamp \ - TestTypeC.cpp \ - TestTypeC.h \ - TestTypeC.inl \ - TestTypeS.h \ - TestTypeS.inl - -TestTypeC.cpp TestTypeC.h TestTypeC.inl TestTypeS.h TestTypeS.inl: TestType-stamp - -TestType-stamp: $(srcdir)/TestType.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TestType.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestCaseC.cpp \ - TestTypeC.cpp \ - test.cpp \ - TestCaseC.h \ - TestCaseC.inl \ - TestCaseS.h \ - TestCaseS.inl \ - TestTypeC.h \ - TestTypeC.inl \ - TestTypeS.h \ - TestTypeS.inl - -client_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/Bug_2234_Regression/Makefile.am b/tests/Bug_2234_Regression/Makefile.am deleted file mode 100644 index 7b4e2ea4cd9..00000000000 --- a/tests/Bug_2234_Regression/Makefile.am +++ /dev/null @@ -1,110 +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_2234_Regression_Idl.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_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2234_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 = \ - TestC.cpp \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2234_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 \ - TestS.cpp \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/Bug_2234_Regression/server.cpp b/tests/Bug_2234_Regression/server.cpp index f6a66d01ae4..3261825bb3a 100644 --- a/tests/Bug_2234_Regression/server.cpp +++ b/tests/Bug_2234_Regression/server.cpp @@ -45,7 +45,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/tests/Bug_2243_Regression/Makefile.am b/tests/Bug_2243_Regression/Makefile.am deleted file mode 100644 index 4399f966bc5..00000000000 --- a/tests/Bug_2243_Regression/Makefile.am +++ /dev/null @@ -1,44 +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_2243_Regression.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = ORB_object_to_string - -ORB_object_to_string_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -ORB_object_to_string_SOURCES = \ - ORB_object_to_string.cpp - -ORB_object_to_string_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/Bug_2243_Regression/ORB_object_to_string.cpp b/tests/Bug_2243_Regression/ORB_object_to_string.cpp index c0ab3ab8f45..c4276c8283b 100644 --- a/tests/Bug_2243_Regression/ORB_object_to_string.cpp +++ b/tests/Bug_2243_Regression/ORB_object_to_string.cpp @@ -8,10 +8,6 @@ #include "ace/Log_Msg.h" -ACE_RCSID (ORB_object_to_string, - ORB_object_to_string, - "$Id$") - // Valid test IOR. // Do not attempt to narrow the object represented by this IOR, nor // should you modify the IOR unless you replace it with another diff --git a/tests/Bug_2289_Regression/Makefile.am b/tests/Bug_2289_Regression/Makefile.am deleted file mode 100644 index c8d59fa7908..00000000000 --- a/tests/Bug_2289_Regression/Makefile.am +++ /dev/null @@ -1,111 +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_2289_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 -Gp -Gd -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_2289_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 = \ - MyInterfaceImpl.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - MyInterfaceImpl.h - -client_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 - -## Makefile.Bug_2289_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 = \ - MyInterfaceImpl.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - MyInterfaceImpl.h - -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/tests/Bug_2289_Regression/client.cpp b/tests/Bug_2289_Regression/client.cpp index b8f0884d1ee..91e62e7e286 100644 --- a/tests/Bug_2289_Regression/client.cpp +++ b/tests/Bug_2289_Regression/client.cpp @@ -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/tests/Bug_2289_Regression/server.cpp b/tests/Bug_2289_Regression/server.cpp index 86e7b583e64..dd4739827b9 100644 --- a/tests/Bug_2289_Regression/server.cpp +++ b/tests/Bug_2289_Regression/server.cpp @@ -8,10 +8,6 @@ #include "ace/OS_NS_stdio.h" #include "tao/IORTable/IORTable.h" -ACE_RCSID (Hello, - server, - "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp") - const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); const ACE_TCHAR *client_ior = ACE_TEXT("file://client.ior"); @@ -40,7 +36,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/tests/Bug_2319_Regression/Makefile.am b/tests/Bug_2319_Regression/Makefile.am deleted file mode 100644 index 9b8c8ff3fdf..00000000000 --- a/tests/Bug_2319_Regression/Makefile.am +++ /dev/null @@ -1,84 +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) - - -## Makefile.Bug_2319_Regression_Server.am - -if BUILD_CORBA_MESSAGING -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) -GH $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_LDADD = \ - $(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_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 - -## 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/Bug_2328_Regression/Hello.cpp b/tests/Bug_2328_Regression/Hello.cpp index 1f138ad1942..f506069d9db 100644 --- a/tests/Bug_2328_Regression/Hello.cpp +++ b/tests/Bug_2328_Regression/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_2328_Regression/Makefile.am b/tests/Bug_2328_Regression/Makefile.am deleted file mode 100644 index 437e4cbf91c..00000000000 --- a/tests/Bug_2328_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_2328_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_2328_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 = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2328_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 = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Codeset.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/tests/Bug_2328_Regression/client.cpp b/tests/Bug_2328_Regression/client.cpp index 5a9ae4335f7..b27a1720817 100644 --- a/tests/Bug_2328_Regression/client.cpp +++ b/tests/Bug_2328_Regression/client.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -29,7 +27,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/tests/Bug_2328_Regression/server.cpp b/tests/Bug_2328_Regression/server.cpp index aa9d398a0f0..4aba483d812 100644 --- a/tests/Bug_2328_Regression/server.cpp +++ b/tests/Bug_2328_Regression/server.cpp @@ -5,10 +5,6 @@ #include "ace/OS_NS_stdio.h" #include "tao/Codeset/Codeset.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -33,7 +29,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/tests/Bug_2345_Regression/Makefile.am b/tests/Bug_2345_Regression/Makefile.am deleted file mode 100644 index 0d7fa56e753..00000000000 --- a/tests/Bug_2345_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_2345_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 = \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_ImR_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/tests/Bug_2349_Regression/Makefile.am b/tests/Bug_2349_Regression/Makefile.am deleted file mode 100644 index 6183ba5d660..00000000000 --- a/tests/Bug_2349_Regression/Makefile.am +++ /dev/null @@ -1,102 +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_2349_Regression_Idl.am - -BUILT_SOURCES = \ - fooC.cpp \ - fooC.h \ - fooC.inl \ - fooS.cpp \ - fooS.h \ - fooS.inl - -CLEANFILES = \ - foo-stamp \ - fooC.cpp \ - fooC.h \ - fooC.inl \ - fooS.cpp \ - fooS.h \ - fooS.inl - -fooC.cpp fooC.h fooC.inl fooS.cpp fooS.h fooS.inl: foo-stamp - -foo-stamp: $(srcdir)/foo.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/foo.idl - @touch $@ - -noinst_HEADERS = \ - foo.idl - -## Makefile.Bug_2349_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 \ - fooC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2349_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 = \ - fooC.cpp \ - fooS.cpp \ - server.cpp - -server_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/Bug_2349_Regression/client.cpp b/tests/Bug_2349_Regression/client.cpp index a0b17710535..90635aa9cbe 100644 --- a/tests/Bug_2349_Regression/client.cpp +++ b/tests/Bug_2349_Regression/client.cpp @@ -28,7 +28,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/tests/Bug_2349_Regression/server.cpp b/tests/Bug_2349_Regression/server.cpp index 55cf12daf2d..c55accbf497 100644 --- a/tests/Bug_2349_Regression/server.cpp +++ b/tests/Bug_2349_Regression/server.cpp @@ -28,7 +28,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/tests/Bug_2356_Regression/Makefile.am b/tests/Bug_2356_Regression/Makefile.am deleted file mode 100644 index ade0aa4d5a2..00000000000 --- a/tests/Bug_2356_Regression/Makefile.am +++ /dev/null @@ -1,134 +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_2356_Regression_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -CLEANFILES = \ - ami_test-stamp \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp - -ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl - @touch $@ - -noinst_HEADERS = \ - ami_test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Bug_2356_Regression_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - ami_testC.cpp \ - ami_testS.cpp \ - ami_test_i.cpp \ - server.cpp \ - ami_test_i.h - -server_LDADD = \ - $(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_Codeset.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 -endif BUILD_AMI - -## Makefile.Bug_2356_Regression_Simple_Client.am - -if BUILD_AMI -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 = \ - ami_testC.cpp \ - ami_testS.cpp \ - client.cpp \ - ami_test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## 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/Bug_2356_Regression/ami_test_i.cpp b/tests/Bug_2356_Regression/ami_test_i.cpp index 3062427213a..f40a59b3835 100644 --- a/tests/Bug_2356_Regression/ami_test_i.cpp +++ b/tests/Bug_2356_Regression/ami_test_i.cpp @@ -16,8 +16,6 @@ #include "ami_test_i.h" #include "tao/debug.h" -ACE_RCSID(AMI, ami_test_i, "$Id$") - AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_2356_Regression/client.cpp b/tests/Bug_2356_Regression/client.cpp index b57ce1c0573..776495d4669 100644 --- a/tests/Bug_2356_Regression/client.cpp +++ b/tests/Bug_2356_Regression/client.cpp @@ -19,10 +19,6 @@ #include "ami_testS.h" #include "tao/Codeset/Codeset.h" -ACE_RCSID (AMI, - simple_client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 5; int shutdown_flag = 1; @@ -53,7 +49,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/tests/Bug_2356_Regression/server.cpp b/tests/Bug_2356_Regression/server.cpp index 14da91b1afc..2a53b746a50 100644 --- a/tests/Bug_2356_Regression/server.cpp +++ b/tests/Bug_2356_Regression/server.cpp @@ -19,8 +19,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" -ACE_RCSID(AMI, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int @@ -47,7 +45,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/tests/Bug_2375_Regression/Makefile.am b/tests/Bug_2375_Regression/Makefile.am deleted file mode 100644 index 6ad9ccdc27d..00000000000 --- a/tests/Bug_2375_Regression/Makefile.am +++ /dev/null @@ -1,79 +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) - - -## Makefile.Bug_2375_Regression_Test.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 = test - -test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -test_SOURCES = \ - test.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/tests/Bug_2399_Regression/Makefile.am b/tests/Bug_2399_Regression/Makefile.am deleted file mode 100644 index 96a5c0074a9..00000000000 --- a/tests/Bug_2399_Regression/Makefile.am +++ /dev/null @@ -1,109 +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) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.Bug_2399_Regression_Test.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) -Sa -St -t ./mytmp $(srcdir)/test.idl - @touch $@ - -BUILT_SOURCES += \ - includedC.cpp \ - includedC.h \ - includedC.inl \ - includedS.cpp \ - includedS.h \ - includedS.inl - -CLEANFILES += \ - included-stamp \ - includedC.cpp \ - includedC.h \ - includedC.inl \ - includedS.cpp \ - includedS.h \ - includedS.inl - -includedC.cpp includedC.h includedC.inl includedS.cpp includedS.h includedS.inl: included-stamp - -included-stamp: $(srcdir)/included.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -t ./mytmp $(srcdir)/included.idl - @touch $@ - -noinst_PROGRAMS = test - -test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -test_SOURCES = \ - includedC.cpp \ - includedS.cpp \ - test.cpp \ - testC.cpp \ - testS.cpp \ - includedC.h \ - includedC.inl \ - includedS.h \ - includedS.inl \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -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/Bug_2417_Regression/Makefile.am b/tests/Bug_2417_Regression/Makefile.am deleted file mode 100644 index a4a12721c8f..00000000000 --- a/tests/Bug_2417_Regression/Makefile.am +++ /dev/null @@ -1,151 +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 = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.Bug_2417_Regression_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - publisherC.cpp \ - publisherC.h \ - publisherC.inl \ - publisherS.cpp \ - publisherS.h \ - publisherS.inl - -CLEANFILES += \ - publisher-stamp \ - publisherC.cpp \ - publisherC.h \ - publisherC.inl \ - publisherS.cpp \ - publisherS.h \ - publisherS.inl - -publisherC.cpp publisherC.h publisherC.inl publisherS.cpp publisherS.h publisherS.inl: publisher-stamp - -publisher-stamp: $(srcdir)/publisher.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/publisher.idl - @touch $@ - -BUILT_SOURCES += \ - subscriberC.cpp \ - subscriberC.h \ - subscriberC.inl \ - subscriberS.cpp \ - subscriberS.h \ - subscriberS.inl - -CLEANFILES += \ - subscriber-stamp \ - subscriberC.cpp \ - subscriberC.h \ - subscriberC.inl \ - subscriberS.cpp \ - subscriberS.h \ - subscriberS.inl - -subscriberC.cpp subscriberC.h subscriberC.inl subscriberS.cpp subscriberS.h subscriberS.inl: subscriber-stamp - -subscriber-stamp: $(srcdir)/subscriber.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/subscriber.idl - @touch $@ - -noinst_HEADERS = \ - publisher.idl \ - subscriber.idl - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2417_Regression_Client.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - publisherC.cpp \ - subscriberC.cpp \ - subscriberS.cpp \ - subscriber_impl.cpp \ - subscriber_impl.h - -client_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_THREADS -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2417_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - publisherC.cpp \ - publisherS.cpp \ - publisher_impl.cpp \ - server.cpp \ - subscriberC.cpp \ - publisher_impl.h - -server_LDADD = \ - $(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_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## 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/Bug_2417_Regression/client.cpp b/tests/Bug_2417_Regression/client.cpp index c937030ef47..03297e9cbb5 100644 --- a/tests/Bug_2417_Regression/client.cpp +++ b/tests/Bug_2417_Regression/client.cpp @@ -29,7 +29,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/tests/Bug_2417_Regression/publisher_impl.cpp b/tests/Bug_2417_Regression/publisher_impl.cpp index 87e84cd8eda..add59e02a0f 100644 --- a/tests/Bug_2417_Regression/publisher_impl.cpp +++ b/tests/Bug_2417_Regression/publisher_impl.cpp @@ -44,7 +44,7 @@ Publisher_impl::Worker::~Worker() void Publisher_impl::Worker::addSubscriber(Subscriber_ptr subscriber) { - ACE_Guard<TAO_SYNCH_MUTEX> guard(mutex); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex); subscribers.push_back(_Subscriber()); _Subscriber& s = subscribers.back(); s.unsubscribed = false; @@ -64,7 +64,7 @@ int Publisher_impl::Worker::svc (void) data += 0.01; ++iteration; { - ACE_Guard<TAO_SYNCH_MUTEX> guard(mutex); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex, 0); doShutdown = subscribers.size() > 0; for (vector<_Subscriber>::iterator iter = subscribers.begin(); iter != subscribers.end(); ++iter) @@ -89,7 +89,7 @@ int Publisher_impl::Worker::svc (void) } if (iteration % 200 == 0) { - ACE_Guard<TAO_SYNCH_MUTEX> guard(mutex); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex, 0); for (vector<_Subscriber>::iterator iter = subscribers.begin(); iter != subscribers.end(); ++iter) { diff --git a/tests/Bug_2417_Regression/server.cpp b/tests/Bug_2417_Regression/server.cpp index eab72252371..2bd02da8c78 100644 --- a/tests/Bug_2417_Regression/server.cpp +++ b/tests/Bug_2417_Regression/server.cpp @@ -30,7 +30,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/tests/Bug_2419_Regression/Makefile.am b/tests/Bug_2419_Regression/Makefile.am deleted file mode 100644 index c0bbe56410f..00000000000 --- a/tests/Bug_2419_Regression/Makefile.am +++ /dev/null @@ -1,115 +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) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.Bug_2419_Regression_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - abstract_parentC.cpp \ - abstract_parentC.h \ - abstract_parentC.inl \ - abstract_parentS.cpp \ - abstract_parentS.h \ - abstract_parentS.inl - -CLEANFILES += \ - abstract_parent-stamp \ - abstract_parentC.cpp \ - abstract_parentC.h \ - abstract_parentC.inl \ - abstract_parentS.cpp \ - abstract_parentS.h \ - abstract_parentS.inl - -abstract_parentC.cpp abstract_parentC.h abstract_parentC.inl abstract_parentS.cpp abstract_parentS.h abstract_parentS.inl: abstract_parent-stamp - -abstract_parent-stamp: $(srcdir)/abstract_parent.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/abstract_parent.idl - @touch $@ - -BUILT_SOURCES += \ - local_childC.cpp \ - local_childC.h \ - local_childC.inl \ - local_childS.cpp \ - local_childS.h \ - local_childS.inl - -CLEANFILES += \ - local_child-stamp \ - local_childC.cpp \ - local_childC.h \ - local_childC.inl \ - local_childS.cpp \ - local_childS.h \ - local_childS.inl - -local_childC.cpp local_childC.h local_childC.inl local_childS.cpp local_childS.h local_childS.inl: local_child-stamp - -local_child-stamp: $(srcdir)/local_child.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/local_child.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - abstract_parentC.cpp \ - abstract_parentS.cpp \ - client.cpp \ - local_childC.cpp \ - local_childS.cpp \ - abstract_parentC.h \ - abstract_parentC.inl \ - abstract_parentS.h \ - abstract_parentS.inl \ - local_childC.h \ - local_childC.inl \ - local_childS.h \ - local_childS.inl - -client_LDADD = \ - $(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_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 - -## 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/Bug_2424_Regression/Makefile.am b/tests/Bug_2424_Regression/Makefile.am deleted file mode 100644 index db1a2de2180..00000000000 --- a/tests/Bug_2424_Regression/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.Bug_2424_Regression_Client.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - OneLineCosNamingC.cpp \ - OneLineCosNamingC.h \ - OneLineCosNamingC.inl \ - OneLineCosNamingS.cpp \ - OneLineCosNamingS.h \ - OneLineCosNamingS.inl - -CLEANFILES = \ - OneLineCosNaming-stamp \ - OneLineCosNamingC.cpp \ - OneLineCosNamingC.h \ - OneLineCosNamingC.inl \ - OneLineCosNamingS.cpp \ - OneLineCosNamingS.h \ - OneLineCosNamingS.inl - -OneLineCosNamingC.cpp OneLineCosNamingC.h OneLineCosNamingC.inl OneLineCosNamingS.cpp OneLineCosNamingS.h OneLineCosNamingS.inl: OneLineCosNaming-stamp - -OneLineCosNaming-stamp: $(srcdir)/OneLineCosNaming.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/OneLineCosNaming.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - OneLineCosNamingC.cpp \ - OneLineCosNamingS.cpp \ - client.cpp \ - OneLineCosNamingC.h \ - OneLineCosNamingC.inl \ - OneLineCosNamingS.h \ - OneLineCosNamingS.inl - -client_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/Bug_2429_Regression/Makefile.am b/tests/Bug_2429_Regression/Makefile.am deleted file mode 100644 index 8d5c1d26c50..00000000000 --- a/tests/Bug_2429_Regression/Makefile.am +++ /dev/null @@ -1,148 +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_2429_Regression_Idl.am - -BUILT_SOURCES = \ - ChildC.cpp \ - ChildC.h \ - ChildC.inl \ - ChildS.cpp \ - ChildS.h \ - ChildS.inl - -CLEANFILES = \ - Child-stamp \ - ChildC.cpp \ - ChildC.h \ - ChildC.inl \ - ChildS.cpp \ - ChildS.h \ - ChildS.inl - -ChildC.cpp ChildC.h ChildC.inl ChildS.cpp ChildS.h ChildS.inl: Child-stamp - -Child-stamp: $(srcdir)/Child.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GC $(srcdir)/Child.idl - @touch $@ - -BUILT_SOURCES += \ - ParentC.cpp \ - ParentC.h \ - ParentC.inl \ - ParentS.cpp \ - ParentS.h \ - ParentS.inl - -CLEANFILES += \ - Parent-stamp \ - ParentC.cpp \ - ParentC.h \ - ParentC.inl \ - ParentS.cpp \ - ParentS.h \ - ParentS.inl - -ParentC.cpp ParentC.h ParentC.inl ParentS.cpp ParentS.h ParentS.inl: Parent-stamp - -Parent-stamp: $(srcdir)/Parent.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GC $(srcdir)/Parent.idl - @touch $@ - -noinst_HEADERS = \ - Child.idl \ - Parent.idl - -## Makefile.Bug_2429_Regression_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 = \ - ChildC.cpp \ - ChildS.cpp \ - ParentC.cpp \ - ParentS.cpp \ - client.cpp \ - ChildServant.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.Bug_2429_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - ChildC.cpp \ - ChildS.cpp \ - ChildServant.cpp \ - ParentC.cpp \ - ParentS.cpp \ - server.cpp \ - ChildServant.h - -server_LDADD = \ - $(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_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 - -## 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/Bug_2429_Regression/client.cpp b/tests/Bug_2429_Regression/client.cpp index b60aa67f26c..7f321c20ad3 100644 --- a/tests/Bug_2429_Regression/client.cpp +++ b/tests/Bug_2429_Regression/client.cpp @@ -94,7 +94,7 @@ client_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/tests/Bug_2429_Regression/server.cpp b/tests/Bug_2429_Regression/server.cpp index ee2d5584aa3..458a4d71d89 100644 --- a/tests/Bug_2429_Regression/server.cpp +++ b/tests/Bug_2429_Regression/server.cpp @@ -27,7 +27,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Bug_2494_Regression/Makefile.am b/tests/Bug_2494_Regression/Makefile.am deleted file mode 100644 index 3ecff9d58a1..00000000000 --- a/tests/Bug_2494_Regression/Makefile.am +++ /dev/null @@ -1,107 +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_2494_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 -St $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Bug_2494_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 \ - testC.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2494_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 = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_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/Bug_2494_Regression/client.cpp b/tests/Bug_2494_Regression/client.cpp index 9552bd3e8ed..35e50784cd8 100644 --- a/tests/Bug_2494_Regression/client.cpp +++ b/tests/Bug_2494_Regression/client.cpp @@ -5,8 +5,6 @@ #include "ace/OS_NS_string.h" #include "testC.h" -ACE_RCSID(Bug_2494_Regression, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 5; int do_shutdown = 0; @@ -42,7 +40,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/tests/Bug_2494_Regression/server.cpp b/tests/Bug_2494_Regression/server.cpp index d692eef743e..05ddb4f4dbb 100644 --- a/tests/Bug_2494_Regression/server.cpp +++ b/tests/Bug_2494_Regression/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(Bug_2494_Regression, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int nthreads = 4; @@ -35,18 +33,17 @@ 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; } +/** + * Run a server thread + * + * Use the ACE_Task_Base class to run server threads + */ class Worker : public ACE_Task_Base { - // = TITLE - // Run a server thread - // - // = DESCRIPTION - // Use the ACE_Task_Base class to run server threads - // public: Worker (CORBA::ORB_ptr orb); // ctor diff --git a/tests/Bug_2494_Regression/test_i.cpp b/tests/Bug_2494_Regression/test_i.cpp index 4a23db96ac0..c370bf97cf4 100644 --- a/tests/Bug_2494_Regression/test_i.cpp +++ b/tests/Bug_2494_Regression/test_i.cpp @@ -8,8 +8,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Bug_2494_Regression, test_i, "$Id$") - char * Simple_Server_i::test_method (const char *x) { diff --git a/tests/Bug_2503_Regression/Makefile.am b/tests/Bug_2503_Regression/Makefile.am deleted file mode 100644 index 3fc88e4036c..00000000000 --- a/tests/Bug_2503_Regression/Makefile.am +++ /dev/null @@ -1,137 +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_2503_Regression_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -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) -GC $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Bug_2503_Regression_Client.am - -if BUILD_AMI -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 = \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - common.cpp \ - test_i.cpp \ - common.h \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Bug_2503_Regression_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - common.cpp \ - server.cpp \ - test_i.cpp \ - common.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## 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/Bug_2503_Regression/test_i.cpp b/tests/Bug_2503_Regression/test_i.cpp index af9c6b79500..945fd5c627d 100644 --- a/tests/Bug_2503_Regression/test_i.cpp +++ b/tests/Bug_2503_Regression/test_i.cpp @@ -2,8 +2,6 @@ #include "test_i.h" -#include "tao/Utils/Servant_Var.h" - test_i:: test_i(CORBA::ORB_ptr orb) { @@ -20,7 +18,7 @@ char * test_i:: create_and_activate_server() { - TAO::Utils::Servant_Var<test_i> impl( + PortableServer::Servant_var<test_i> impl( new test_i (this->orb_.in ())); CORBA::Object_var poa_object = diff --git a/tests/Bug_2542_Regression/Makefile.am b/tests/Bug_2542_Regression/Makefile.am deleted file mode 100644 index b5d1b16b38e..00000000000 --- a/tests/Bug_2542_Regression/Makefile.am +++ /dev/null @@ -1,79 +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) - - -## Makefile.Bug_2542_Regression.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 = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - bug_2542_regression.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/Bug_2542_Regression/bug_2542_regression.cpp b/tests/Bug_2542_Regression/bug_2542_regression.cpp index 7485773f3ef..d2fcbfe587b 100644 --- a/tests/Bug_2542_Regression/bug_2542_regression.cpp +++ b/tests/Bug_2542_Regression/bug_2542_regression.cpp @@ -3,10 +3,6 @@ #include "TestC.h" #include "tao/CodecFactory/CodecFactory.h" -ACE_RCSID (Bug_2542_Regression, - bug_2542_regression, - "$Id$") - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/tests/Bug_2543_Regression/Makefile.am b/tests/Bug_2543_Regression/Makefile.am deleted file mode 100644 index f6b26041197..00000000000 --- a/tests/Bug_2543_Regression/Makefile.am +++ /dev/null @@ -1,79 +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) - - -## Makefile.Bug_2543_Regression.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 = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - bug_2543_regression.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/Bug_2543_Regression/bug_2543_regression.cpp b/tests/Bug_2543_Regression/bug_2543_regression.cpp index ba1e926aa44..d72aecd3ac8 100644 --- a/tests/Bug_2543_Regression/bug_2543_regression.cpp +++ b/tests/Bug_2543_Regression/bug_2543_regression.cpp @@ -3,10 +3,6 @@ #include "TestC.h" #include "tao/CodecFactory/CodecFactory.h" -ACE_RCSID (Bug_2543_Regression, - bug_2543_regression, - "$Id$") - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try diff --git a/tests/Bug_2549_Regression/Makefile.am b/tests/Bug_2549_Regression/Makefile.am deleted file mode 100644 index 6a805739580..00000000000 --- a/tests/Bug_2549_Regression/Makefile.am +++ /dev/null @@ -1,91 +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) - - -## Makefile.Bug_2549_Regression_Test.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -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 = test - -test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -test_SOURCES = \ - test.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.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_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## 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/Bug_2560_Regression/Makefile.am b/tests/Bug_2560_Regression/Makefile.am deleted file mode 100644 index c4649dea9e2..00000000000 --- a/tests/Bug_2560_Regression/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.Bug_2560_Regression_Idl.am - -BUILT_SOURCES = \ - QuoterC.cpp \ - QuoterC.h \ - QuoterC.inl \ - QuoterS.cpp \ - QuoterS.h \ - QuoterS.inl - -CLEANFILES = \ - Quoter-stamp \ - QuoterC.cpp \ - QuoterC.h \ - QuoterC.inl \ - QuoterS.cpp \ - QuoterS.h \ - QuoterS.inl - -QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl: Quoter-stamp - -Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Quoter.idl - @touch $@ - -noinst_HEADERS = \ - Quoter.idl - -## Makefile.Bug_2560_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 = \ - QuoterC.cpp \ - client.cpp \ - Stock_Factory_i.h \ - Stock_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2560_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 = \ - QuoterC.cpp \ - QuoterS.cpp \ - Stock_Factory_i.cpp \ - Stock_i.cpp \ - server.cpp \ - Stock_Factory_i.h \ - Stock_i.h - -server_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/Bug_2560_Regression/Stock_Factory_i.cpp b/tests/Bug_2560_Regression/Stock_Factory_i.cpp index d6ab8a1d16b..56792072cee 100644 --- a/tests/Bug_2560_Regression/Stock_Factory_i.cpp +++ b/tests/Bug_2560_Regression/Stock_Factory_i.cpp @@ -3,15 +3,14 @@ // #include "Stock_Factory_i.h" -#include "tao/Utils/Servant_Var.h" #include <iostream> Quoter_Stock_Factory_i::Quoter_Stock_Factory_i () { - TAO::Utils::Servant_Var<Quoter_Stock_i> servant1 = + PortableServer::Servant_var<Quoter_Stock_i> servant1 = new Quoter_Stock_i ("RHAT", "RedHat, Inc.", 210); - TAO::Utils::Servant_Var<Quoter_Stock_i> servant2 = + PortableServer::Servant_var<Quoter_Stock_i> servant2 = new Quoter_Stock_i ("MSFT", "Microsoft, Inc.", 91); PortableServer::POA_var poa1 = servant1->_default_POA (); diff --git a/tests/Bug_2560_Regression/server.cpp b/tests/Bug_2560_Regression/server.cpp index 593f5f05167..328c7fe8eb8 100644 --- a/tests/Bug_2560_Regression/server.cpp +++ b/tests/Bug_2560_Regression/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/tests/Bug_2593_Regression/Hello.cpp b/tests/Bug_2593_Regression/Hello.cpp index df5dc90d3d9..0f62f20b906 100644 --- a/tests/Bug_2593_Regression/Hello.cpp +++ b/tests/Bug_2593_Regression/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_2593_Regression/Makefile.am b/tests/Bug_2593_Regression/Makefile.am deleted file mode 100644 index 528b58934d0..00000000000 --- a/tests/Bug_2593_Regression/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.Bug_2593_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_2593_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 = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2593_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 = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/Bug_2593_Regression/client.cpp b/tests/Bug_2593_Regression/client.cpp index cbd78a6f0d6..abaed430dc8 100644 --- a/tests/Bug_2593_Regression/client.cpp +++ b/tests/Bug_2593_Regression/client.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -29,7 +27,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/tests/Bug_2593_Regression/server.cpp b/tests/Bug_2593_Regression/server.cpp index 70d1438f4d3..f2dc09ae2f2 100644 --- a/tests/Bug_2593_Regression/server.cpp +++ b/tests/Bug_2593_Regression/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +28,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/tests/Bug_2595_Regression/Hello.cpp b/tests/Bug_2595_Regression/Hello.cpp index f95f30bdc85..df2a18536d2 100644 --- a/tests/Bug_2595_Regression/Hello.cpp +++ b/tests/Bug_2595_Regression/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_2595_Regression/Makefile.am b/tests/Bug_2595_Regression/Makefile.am deleted file mode 100644 index cf4976918e1..00000000000 --- a/tests/Bug_2595_Regression/Makefile.am +++ /dev/null @@ -1,105 +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_2595_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_2595_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 = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2595_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 = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_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/Bug_2595_Regression/client.cpp b/tests/Bug_2595_Regression/client.cpp index f75ce5ac238..0d2a3e9e825 100644 --- a/tests/Bug_2595_Regression/client.cpp +++ b/tests/Bug_2595_Regression/client.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -29,7 +27,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/tests/Bug_2595_Regression/server.cpp b/tests/Bug_2595_Regression/server.cpp index c1d8bd1bb30..ab19d0fb0a7 100644 --- a/tests/Bug_2595_Regression/server.cpp +++ b/tests/Bug_2595_Regression/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +28,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/tests/Bug_2654_Regression/Bug_2654_Regression.mpc b/tests/Bug_2654_Regression/Bug_2654_Regression.mpc index 5350e88e5a1..a5f7eea18ad 100644 --- a/tests/Bug_2654_Regression/Bug_2654_Regression.mpc +++ b/tests/Bug_2654_Regression/Bug_2654_Regression.mpc @@ -2,8 +2,6 @@ // $Id$ project(*idl): taoidldefaults { - idlflags += -Sa -St - IDL_Files { Hello.idl } diff --git a/tests/Bug_2654_Regression/Hello.cpp b/tests/Bug_2654_Regression/Hello.cpp index 6130ba94f14..8416cdb76c7 100644 --- a/tests/Bug_2654_Regression/Hello.cpp +++ b/tests/Bug_2654_Regression/Hello.cpp @@ -1,6 +1,5 @@ -// // $Id$ -// + #include "Hello.h" #include "ace/Task.h" diff --git a/tests/Bug_2654_Regression/Hello.h b/tests/Bug_2654_Regression/Hello.h index 7171680d945..5ac669ccd98 100644 --- a/tests/Bug_2654_Regression/Hello.h +++ b/tests/Bug_2654_Regression/Hello.h @@ -1,6 +1,4 @@ -// // $Id$ -// #ifndef HELLO_H #define HELLO_H diff --git a/tests/Bug_2654_Regression/Hello.idl b/tests/Bug_2654_Regression/Hello.idl index 1cd21f1773e..6bd78c2cf25 100644 --- a/tests/Bug_2654_Regression/Hello.idl +++ b/tests/Bug_2654_Regression/Hello.idl @@ -1,6 +1,4 @@ -// // $Id$ -// /// Put the interfaces in a module, to avoid global namespace pollution module Test diff --git a/tests/Bug_2654_Regression/Makefile.am b/tests/Bug_2654_Regression/Makefile.am deleted file mode 100644 index 6df8edf9440..00000000000 --- a/tests/Bug_2654_Regression/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.Bug_2654_Regression_Idl.am - -BUILT_SOURCES = \ - HelloC.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.cpp \ - HelloS.h \ - HelloS.inl - -CLEANFILES = \ - Hello-stamp \ - HelloC.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.cpp \ - HelloS.h \ - HelloS.inl - -HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp - -Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sa -St $(srcdir)/Hello.idl - @touch $@ - -noinst_HEADERS = \ - Hello.idl - -## Makefile.Bug_2654_Regression_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 = \ - HelloC.cpp \ - HelloS.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.Bug_2654_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 = \ - Hello.cpp \ - HelloC.cpp \ - HelloS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/Bug_2654_Regression/client.cpp b/tests/Bug_2654_Regression/client.cpp index 9e640c86246..aa6efe616bd 100644 --- a/tests/Bug_2654_Regression/client.cpp +++ b/tests/Bug_2654_Regression/client.cpp @@ -20,8 +20,6 @@ #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); class Callback_i : public POA_Test::CallBack @@ -71,12 +69,12 @@ int Worker::svc() { { - ACE_Guard<ACE_Mutex> g(this->lock_); + ACE_GUARD_RETURN (ACE_Mutex, ace_mon, this->lock_, 0); if (this->orb_threads_ > 0) { --this->orb_threads_; hello_->set_callback(this->callback_.in()); - g.release(); + ace_mon.release(); this->orb_->run(); return 0; } @@ -91,7 +89,7 @@ Worker::svc() { CORBA::Short n = 0; { - ACE_Guard<ACE_Mutex> g(this->lock_); + ACE_GUARD_RETURN (ACE_Mutex, ace_mon, this->lock_, 0); n = ++this->message_counter_; } this->asynch_hello_->method (n); @@ -114,7 +112,7 @@ Worker::svc() ACE_DEBUG ((LM_DEBUG, "(%t) Did all iterations\n")); { - ACE_Guard<ACE_Mutex> g(this->lock_); + ACE_GUARD_RETURN (ACE_Mutex, ace_mon, this->lock_, 0); --this->busy_threads_; if (this->busy_threads_) return 0; @@ -210,7 +208,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/tests/Bug_2654_Regression/server.cpp b/tests/Bug_2654_Regression/server.cpp index c53dd9b14f0..8f6f117b63a 100644 --- a/tests/Bug_2654_Regression/server.cpp +++ b/tests/Bug_2654_Regression/server.cpp @@ -6,10 +6,6 @@ #include "ace/Thread_Manager.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -34,7 +30,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/tests/Bug_2669_Regression/Makefile.am b/tests/Bug_2669_Regression/Makefile.am deleted file mode 100644 index 62c7a56edd5..00000000000 --- a/tests/Bug_2669_Regression/Makefile.am +++ /dev/null @@ -1,117 +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) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.Bug_2669_Regression_Test.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - ParentC.cpp \ - ParentC.h \ - ParentC.inl \ - ParentS.cpp \ - ParentS.h \ - ParentS.inl - -CLEANFILES += \ - Parent-stamp \ - ParentC.cpp \ - ParentC.h \ - ParentC.inl \ - ParentS.cpp \ - ParentS.h \ - ParentS.inl - -ParentC.cpp ParentC.h ParentC.inl ParentS.cpp ParentS.h ParentS.inl: Parent-stamp - -Parent-stamp: $(srcdir)/Parent.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Parent.idl - @touch $@ - -BUILT_SOURCES += \ - ChildC.cpp \ - ChildC.h \ - ChildC.inl \ - ChildS.cpp \ - ChildS.h \ - ChildS.inl - -CLEANFILES += \ - Child-stamp \ - ChildC.cpp \ - ChildC.h \ - ChildC.inl \ - ChildS.cpp \ - ChildS.h \ - ChildS.inl - -ChildC.cpp ChildC.h ChildC.inl ChildS.cpp ChildS.h ChildS.inl: Child-stamp - -Child-stamp: $(srcdir)/Child.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Child.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - ChildC.cpp \ - ChildS.cpp \ - ParentC.cpp \ - ParentS.cpp \ - client.cpp \ - ChildC.h \ - ChildC.inl \ - ChildS.h \ - ChildS.inl \ - ParentC.h \ - ParentC.inl \ - ParentS.h \ - ParentS.inl - -client_LDADD = \ - $(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_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 -endif BUILD_AMI - -## 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/Bug_2669_Regression/client.cpp b/tests/Bug_2669_Regression/client.cpp index c70c9815b5f..f31dbbd56ca 100644 --- a/tests/Bug_2669_Regression/client.cpp +++ b/tests/Bug_2669_Regression/client.cpp @@ -29,7 +29,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/tests/Bug_2677_Regression/DllORB.cpp b/tests/Bug_2677_Regression/DllORB.cpp index 543eb993938..776222e727c 100644 --- a/tests/Bug_2677_Regression/DllORB.cpp +++ b/tests/Bug_2677_Regression/DllORB.cpp @@ -5,7 +5,6 @@ #include "ace/OS_NS_unistd.h" #include "tao/TAO_Singleton_Manager.h" - DllORB::DllORB (void) : failPrePostInit_ (3), mv_orb_ (), @@ -13,34 +12,15 @@ DllORB::DllORB (void) { } - DllORB::~DllORB (void) { } - int DllORB::init (int argc, ACE_TCHAR *argv[]) { - int threadCnt = 1; - try { - ACE_Arg_Shifter as (argc, argv); - const ACE_TCHAR *currentArg = 0; - while (as.is_anything_left ()) - { - if (0 != (currentArg = as.get_the_parameter (ACE_TEXT ("-NumThreads")))) - { - int num = ACE_OS::atoi (currentArg); - if (num >= 1) - threadCnt = num; - as.consume_arg (); - } - else - as.ignore_arg (); - } - if (failPrePostInit_ < 3) { ACE_DEBUG ((LM_INFO, @@ -87,8 +67,7 @@ DllORB::init (int argc, ACE_TCHAR *argv[]) } // Initialize the ORB - ACE_Argv_Type_Converter argcon (argc, argv); - mv_orb_ = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv ()); + mv_orb_ = CORBA::ORB_init (argc, argv); if (CORBA::is_nil (mv_orb_.in ())) { ACE_DEBUG ((LM_ERROR, ACE_TEXT ("nil ORB\n"))); diff --git a/tests/Bug_2677_Regression/Makefile.am b/tests/Bug_2677_Regression/Makefile.am deleted file mode 100644 index b4c1cb12834..00000000000 --- a/tests/Bug_2677_Regression/Makefile.am +++ /dev/null @@ -1,69 +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_2677_Regression.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES = libBug_2677_Regression.la - -libBug_2677_Regression_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DBUG_2677_REGRESSION_BUILD_DLL - -libBug_2677_Regression_la_SOURCES = \ - DllORB.cpp - -noinst_HEADERS = \ - DllORB.h - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2677_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 = \ - server.cpp \ - DllORB.h \ - bug_2677_regression_export.h - -server_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/Bug_2677_Regression/server.cpp b/tests/Bug_2677_Regression/server.cpp index bcfdd64fc62..b2554023954 100644 --- a/tests/Bug_2677_Regression/server.cpp +++ b/tests/Bug_2677_Regression/server.cpp @@ -1,5 +1,5 @@ // $Id$ -#include "ace/OS.h" + #include "ace/Service_Config.h" #include "ace/Log_Msg.h" diff --git a/tests/Bug_2678_Regression/Makefile.am b/tests/Bug_2678_Regression/Makefile.am deleted file mode 100644 index d29c5a75c10..00000000000 --- a/tests/Bug_2678_Regression/Makefile.am +++ /dev/null @@ -1,103 +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_2678_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) $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Bug_2678_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 \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2678_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 = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_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/Bug_2678_Regression/client.cpp b/tests/Bug_2678_Regression/client.cpp index c0cc27d346e..679f5bf277b 100644 --- a/tests/Bug_2678_Regression/client.cpp +++ b/tests/Bug_2678_Regression/client.cpp @@ -3,8 +3,6 @@ #include "testC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -29,7 +27,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/tests/Bug_2678_Regression/dribble.pl b/tests/Bug_2678_Regression/dribble.pl index 26a561aa58b..3e10a136d4d 100755 --- a/tests/Bug_2678_Regression/dribble.pl +++ b/tests/Bug_2678_Regression/dribble.pl @@ -53,7 +53,7 @@ if (!$result) { my($initial) = length($str); my($length) = $initial; my($maxLine) = 78; - + print $str; foreach my $key (sort keys %options) { diff --git a/tests/Bug_2683_Regression/Makefile.am b/tests/Bug_2683_Regression/Makefile.am deleted file mode 100644 index ca384d98cd4..00000000000 --- a/tests/Bug_2683_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.IORTable_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.IORTable_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 \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.IORTable_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 \ - TestS.cpp \ - server.cpp \ - test_i.cpp \ - test_i.h - -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/tests/Bug_2683_Regression/client.cpp b/tests/Bug_2683_Regression/client.cpp index 7a0f53f3394..4dbf005651f 100644 --- a/tests/Bug_2683_Regression/client.cpp +++ b/tests/Bug_2683_Regression/client.cpp @@ -95,7 +95,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/tests/Bug_2683_Regression/server.cpp b/tests/Bug_2683_Regression/server.cpp index c8d8ed347ff..2be474414ce 100644 --- a/tests/Bug_2683_Regression/server.cpp +++ b/tests/Bug_2683_Regression/server.cpp @@ -32,7 +32,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; } @@ -68,23 +68,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try { - int nthreads = 10; bool endpoint_found = false; for (int i = 0; i < argc; i++) { if ((ACE_OS::strcasecmp (argv[i],ACE_TEXT("-ORBEndpoint")) == 0) || (ACE_OS::strcasecmp (argv[i],ACE_TEXT("-ORBListenEndpoints")) == 0)) endpoint_found = 1; - else if (ACE_OS::strcasecmp (argv[i],ACE_TEXT("-threads")) == 0) - { - ++i; - nthreads = ACE_OS::atoi (argv[i]); - } - else if (ACE_OS::strcasecmp (argv[i],ACE_TEXT("-o")) == 0) - { - ++i; -// ior_output_file = argv[i]; - } } if (!endpoint_found) diff --git a/tests/Bug_2702_Regression/Makefile.am b/tests/Bug_2702_Regression/Makefile.am deleted file mode 100644 index 088301dc92e..00000000000 --- a/tests/Bug_2702_Regression/Makefile.am +++ /dev/null @@ -1,80 +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) - - -## Makefile.CloseConnection_Idl.am - -BUILT_SOURCES = \ - TestA.cpp \ - TestA.h \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestA.cpp \ - TestA.h \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestA.cpp TestA.h 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 -GA $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.CloseConnection_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 - -client_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/Bug_2702_Regression/client.cpp b/tests/Bug_2702_Regression/client.cpp index a874800e5a5..fc2e03c93f0 100644 --- a/tests/Bug_2702_Regression/client.cpp +++ b/tests/Bug_2702_Regression/client.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -29,7 +27,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/tests/Bug_2734_Regression/Makefile.am b/tests/Bug_2734_Regression/Makefile.am deleted file mode 100644 index 4023322b448..00000000000 --- a/tests/Bug_2734_Regression/Makefile.am +++ /dev/null @@ -1,113 +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_2734_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_2734_Regression_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 \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.Bug_2734_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 = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_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/Bug_2734_Regression/client.cpp b/tests/Bug_2734_Regression/client.cpp index 755d3da6daf..a5b94214917 100644 --- a/tests/Bug_2734_Regression/client.cpp +++ b/tests/Bug_2734_Regression/client.cpp @@ -6,8 +6,6 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" -ACE_RCSID(Timeout, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int min_timeout = 0; int max_timeout = 20; diff --git a/tests/Bug_2734_Regression/server.cpp b/tests/Bug_2734_Regression/server.cpp index 7812e2261e4..1e66973cff6 100644 --- a/tests/Bug_2734_Regression/server.cpp +++ b/tests/Bug_2734_Regression/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Timeout, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int @@ -31,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Bug_2734_Regression/test_i.cpp b/tests/Bug_2734_Regression/test_i.cpp index e75b0e611ce..4dec77755fe 100644 --- a/tests/Bug_2734_Regression/test_i.cpp +++ b/tests/Bug_2734_Regression/test_i.cpp @@ -4,8 +4,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/High_Res_Timer.h" -ACE_RCSID(Timeout, test_i, "$Id$") - ACE_High_Res_Timer sleep_duration; diff --git a/tests/Bug_2734_Regression/test_i.h b/tests/Bug_2734_Regression/test_i.h index 8c102e3a1b7..eb3d07084a5 100644 --- a/tests/Bug_2734_Regression/test_i.h +++ b/tests/Bug_2734_Regression/test_i.h @@ -1,34 +1,32 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Timeout -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_TIMEOUT_TEST_I_H #define TAO_TIMEOUT_TEST_I_H #include "testS.h" +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb); - // ctor // = The Simple_Server methods. CORBA::Long echo (CORBA::Long x, @@ -36,8 +34,8 @@ public: void shutdown (void); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB }; #endif /* TAO_TIMEOUT_TEST_I_H */ diff --git a/tests/Bug_2735_Regression/Makefile.am b/tests/Bug_2735_Regression/Makefile.am deleted file mode 100644 index 0ea1856ec3f..00000000000 --- a/tests/Bug_2735_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_2735_Regression.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp - -server_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/Bug_2735_Regression/server.cpp b/tests/Bug_2735_Regression/server.cpp index d2d35fa897a..4aa36e4d73c 100644 --- a/tests/Bug_2735_Regression/server.cpp +++ b/tests/Bug_2735_Regression/server.cpp @@ -5,10 +5,6 @@ #include "ace/Service_Config.h" #include "ace/Log_Msg.h" -ACE_RCSID (Bug_2735_Regression, - server, - "$Id$") - static const ACE_TCHAR* server_strat = ACE_STATIC_SERVICE_DIRECTIVE ("Server_Strategy_Factory", "-ORBConcurrency thread-per-connection"); diff --git a/tests/Bug_2768_Regression/Makefile.am b/tests/Bug_2768_Regression/Makefile.am deleted file mode 100644 index 293f1d7f91c..00000000000 --- a/tests/Bug_2768_Regression/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.Bug_2768_Regression_Idl.am - -BUILT_SOURCES = \ - MessengerC.cpp \ - MessengerC.h \ - MessengerC.inl \ - MessengerS.cpp \ - MessengerS.h \ - MessengerS.inl - -CLEANFILES = \ - Messenger-stamp \ - MessengerC.cpp \ - MessengerC.h \ - MessengerC.inl \ - MessengerS.cpp \ - MessengerS.h \ - MessengerS.inl - -MessengerC.cpp MessengerC.h MessengerC.inl MessengerS.cpp MessengerS.h MessengerS.inl: Messenger-stamp - -Messenger-stamp: $(srcdir)/Messenger.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Messenger.idl - @touch $@ - -noinst_HEADERS = \ - Messenger.idl - -## Makefile.Bug_2768_Regression_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 = \ - MessengerC.cpp \ - client.cpp \ - Messenger_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Bug_2768_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 = \ - MessengerC.cpp \ - MessengerS.cpp \ - Messenger_i.cpp \ - server.cpp \ - Messenger_i.h - -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/tests/Bug_2768_Regression/client.cpp b/tests/Bug_2768_Regression/client.cpp index 707b9119343..759923e4f4b 100644 --- a/tests/Bug_2768_Regression/client.cpp +++ b/tests/Bug_2768_Regression/client.cpp @@ -27,7 +27,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/tests/Bug_2768_Regression/server.cpp b/tests/Bug_2768_Regression/server.cpp index 76086da54e8..eaed5c2e0f1 100644 --- a/tests/Bug_2768_Regression/server.cpp +++ b/tests/Bug_2768_Regression/server.cpp @@ -28,10 +28,10 @@ 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; } - + int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try diff --git a/tests/Bug_2791_Regression/Makefile.am b/tests/Bug_2791_Regression/Makefile.am deleted file mode 100644 index 34330f760d5..00000000000 --- a/tests/Bug_2791_Regression/Makefile.am +++ /dev/null @@ -1,79 +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) - - -## Makefile.Bug_2791_Regression_Client.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - MessageC.cpp \ - MessageC.h \ - MessageC.inl \ - MessageS.h \ - MessageS.inl - -CLEANFILES = \ - Message-stamp \ - MessageC.cpp \ - MessageC.h \ - MessageC.inl \ - MessageS.h \ - MessageS.inl - -MessageC.cpp MessageC.h MessageC.inl MessageS.h MessageS.inl: Message-stamp - -Message-stamp: $(srcdir)/Message.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Message.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - MessageC.cpp \ - MessageFactory.cpp \ - Message_i.cpp \ - client.cpp \ - MessageC.h \ - MessageC.inl \ - MessageFactory.h \ - MessageS.h \ - MessageS.inl \ - Message_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/Bug_2791_Regression/Message.idl b/tests/Bug_2791_Regression/Message.idl index 728fed86e73..0afd8fb1f25 100755 --- a/tests/Bug_2791_Regression/Message.idl +++ b/tests/Bug_2791_Regression/Message.idl @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ valuetype Message { diff --git a/tests/Bug_2791_Regression/MessageFactory.cpp b/tests/Bug_2791_Regression/MessageFactory.cpp index 82ad8a649bb..742028a19f9 100755 --- a/tests/Bug_2791_Regression/MessageFactory.cpp +++ b/tests/Bug_2791_Regression/MessageFactory.cpp @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ #include "MessageFactory.h" diff --git a/tests/Bug_2791_Regression/Message_i.cpp b/tests/Bug_2791_Regression/Message_i.cpp index d4b5ab0b38a..c66bffc6d72 100755 --- a/tests/Bug_2791_Regression/Message_i.cpp +++ b/tests/Bug_2791_Regression/Message_i.cpp @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ #include "Message_i.h" diff --git a/tests/Bug_2791_Regression/Message_i.h b/tests/Bug_2791_Regression/Message_i.h index abaf59570fb..fd5c3c4d61a 100755 --- a/tests/Bug_2791_Regression/Message_i.h +++ b/tests/Bug_2791_Regression/Message_i.h @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ #include "MessageC.h" #include "tao/corba.h" diff --git a/tests/Bug_2791_Regression/README b/tests/Bug_2791_Regression/README index 62d67c6dc92..fa4c08553c1 100755 --- a/tests/Bug_2791_Regression/README +++ b/tests/Bug_2791_Regression/README @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ This test confirms that the reference count for a valuetype factory is decremented when the valuetype factory is unregistered via ORB::unregister_value_factory(). Before, the reference diff --git a/tests/Bug_2792_Regression/Makefile.am b/tests/Bug_2792_Regression/Makefile.am deleted file mode 100644 index c7dd49276b4..00000000000 --- a/tests/Bug_2792_Regression/Makefile.am +++ /dev/null @@ -1,44 +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_2792_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.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/Bug_2792_Regression/client.cpp b/tests/Bug_2792_Regression/client.cpp index 139fc1df7c9..087c31ecc6d 100644 --- a/tests/Bug_2792_Regression/client.cpp +++ b/tests/Bug_2792_Regression/client.cpp @@ -3,10 +3,6 @@ #include "tao/ORB_Core.h" #include "tao/StringSeqC.h" -ACE_RCSID(Bug_2792_Regression, - client, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/tests/Bug_2795_Regression/Makefile.am b/tests/Bug_2795_Regression/Makefile.am deleted file mode 100644 index 81cf3d839af..00000000000 --- a/tests/Bug_2795_Regression/Makefile.am +++ /dev/null @@ -1,44 +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_2795_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.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/Bug_2795_Regression/client.cpp b/tests/Bug_2795_Regression/client.cpp index 449843bb5e9..3a76a108054 100644 --- a/tests/Bug_2795_Regression/client.cpp +++ b/tests/Bug_2795_Regression/client.cpp @@ -3,10 +3,6 @@ #include "tao/ORB_Core.h" #include "tao/StringSeqC.h" -ACE_RCSID(Bug_2795_Regression, - client, - "$Id$") - void StringOutTest (CORBA::String_out so) { diff --git a/tests/Bug_2804_Regression/Hello.cpp b/tests/Bug_2804_Regression/Hello.cpp index eb2603dd591..46043d0d3ee 100644 --- a/tests/Bug_2804_Regression/Hello.cpp +++ b/tests/Bug_2804_Regression/Hello.cpp @@ -2,12 +2,6 @@ #include "Hello.h" - -ACE_RCSID (Recursive, - Hello, - "$Id$") - - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_2804_Regression/Makefile.am b/tests/Bug_2804_Regression/Makefile.am deleted file mode 100644 index d7287754ca1..00000000000 --- a/tests/Bug_2804_Regression/Makefile.am +++ /dev/null @@ -1,114 +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_2804_Regression_Idl.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_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2804_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 = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2804_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 = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/tests/Bug_2804_Regression/client.cpp b/tests/Bug_2804_Regression/client.cpp index 547618b0e34..1fbc7867687 100644 --- a/tests/Bug_2804_Regression/client.cpp +++ b/tests/Bug_2804_Regression/client.cpp @@ -9,12 +9,6 @@ #include <algorithm> #include <functional> - -ACE_RCSID (Recursive, - client, - "$Id$") - - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/tests/Bug_2804_Regression/server.cpp b/tests/Bug_2804_Regression/server.cpp index c1d8bd1bb30..ab19d0fb0a7 100644 --- a/tests/Bug_2804_Regression/server.cpp +++ b/tests/Bug_2804_Regression/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +28,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/tests/Bug_2805_Regression/Makefile.am b/tests/Bug_2805_Regression/Makefile.am deleted file mode 100644 index 89c057b9d85..00000000000 --- a/tests/Bug_2805_Regression/Makefile.am +++ /dev/null @@ -1,97 +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) - - -## Makefile.Bug_2805_Regression_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -CLEANFILES = \ - ami_test-stamp \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp - -ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl - @touch $@ - -noinst_HEADERS = \ - ami_test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Bug_2805_Regression_Client.am - -if BUILD_AMI -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 = \ - ami_testC.cpp \ - ami_testS.cpp \ - ami_test_i.cpp \ - client.cpp \ - ami_test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## 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/Bug_2805_Regression/ami_test_i.cpp b/tests/Bug_2805_Regression/ami_test_i.cpp index c019047248b..1c6fc7253b7 100644 --- a/tests/Bug_2805_Regression/ami_test_i.cpp +++ b/tests/Bug_2805_Regression/ami_test_i.cpp @@ -17,8 +17,6 @@ #include "ami_test_i.h" #include "tao/debug.h" -ACE_RCSID(AMI, ami_test_i, "$Id$") - AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb, CORBA::Long in_l, const char * in_str, diff --git a/tests/Bug_2805_Regression/client.cpp b/tests/Bug_2805_Regression/client.cpp index fde5ffcc212..28b5c3d04b8 100644 --- a/tests/Bug_2805_Regression/client.cpp +++ b/tests/Bug_2805_Regression/client.cpp @@ -21,10 +21,6 @@ #include "ace/OS_NS_Thread.h" #include "ami_test_i.h" -ACE_RCSID (AMI, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 5; int niterations = 5; @@ -68,7 +64,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/tests/Bug_2809_Regression/Makefile.am b/tests/Bug_2809_Regression/Makefile.am deleted file mode 100644 index 4e061fa3beb..00000000000 --- a/tests/Bug_2809_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_2809_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 = \ - server.cpp - -server_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/Bug_2826_Regression/Makefile.am b/tests/Bug_2826_Regression/Makefile.am deleted file mode 100644 index 56a2faac25f..00000000000 --- a/tests/Bug_2826_Regression/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.Bug_2826_Regression.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - fooC.cpp \ - fooC.h \ - fooC.inl \ - fooS.cpp \ - fooS.h \ - fooS.inl - -CLEANFILES = \ - foo-stamp \ - fooC.cpp \ - fooC.h \ - fooC.inl \ - fooS.cpp \ - fooS.h \ - fooS.inl - -fooC.cpp fooC.h fooC.inl fooS.cpp fooS.h fooS.inl: foo-stamp - -foo-stamp: $(srcdir)/foo.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/foo.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - bug_2826_regression.cpp \ - fooC.cpp \ - fooS.cpp \ - fooC.h \ - fooC.inl \ - fooS.h \ - fooS.inl - -server_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/Bug_2826_Regression/bug_2826_regression.cpp b/tests/Bug_2826_Regression/bug_2826_regression.cpp index 955ef36251f..05d902509df 100644 --- a/tests/Bug_2826_Regression/bug_2826_regression.cpp +++ b/tests/Bug_2826_Regression/bug_2826_regression.cpp @@ -4,9 +4,6 @@ #include "tao/PortableServer/PortableServer.h" #include "fooS.h" -ACE_RCSID (Bug_2826_Regression, - bug_2826_regression, - "$Id$") namespace { class Foo_i : public virtual POA_foo diff --git a/tests/Bug_2844_Regression/Hello.cpp b/tests/Bug_2844_Regression/Hello.cpp index eb2603dd591..46043d0d3ee 100644 --- a/tests/Bug_2844_Regression/Hello.cpp +++ b/tests/Bug_2844_Regression/Hello.cpp @@ -2,12 +2,6 @@ #include "Hello.h" - -ACE_RCSID (Recursive, - Hello, - "$Id$") - - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_2844_Regression/Makefile.am b/tests/Bug_2844_Regression/Makefile.am deleted file mode 100644 index 0a6c8f80489..00000000000 --- a/tests/Bug_2844_Regression/Makefile.am +++ /dev/null @@ -1,114 +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_2844_Regression_Idl.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_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2844_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 = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2844_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 = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/tests/Bug_2844_Regression/client.cpp b/tests/Bug_2844_Regression/client.cpp index f89dd4ed4a1..a3e741e3c9e 100644 --- a/tests/Bug_2844_Regression/client.cpp +++ b/tests/Bug_2844_Regression/client.cpp @@ -9,11 +9,6 @@ #include <algorithm> #include <functional> - -ACE_RCSID (Recursive, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/tests/Bug_2844_Regression/server.cpp b/tests/Bug_2844_Regression/server.cpp index c1d8bd1bb30..ab19d0fb0a7 100644 --- a/tests/Bug_2844_Regression/server.cpp +++ b/tests/Bug_2844_Regression/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +28,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/tests/Bug_2869_Regression/Makefile.am b/tests/Bug_2869_Regression/Makefile.am deleted file mode 100644 index 1a44e10a09c..00000000000 --- a/tests/Bug_2869_Regression/Makefile.am +++ /dev/null @@ -1,44 +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_2869_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.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/Bug_2869_Regression/client.cpp b/tests/Bug_2869_Regression/client.cpp index c0a27c7331d..290592ff2d7 100644 --- a/tests/Bug_2869_Regression/client.cpp +++ b/tests/Bug_2869_Regression/client.cpp @@ -5,8 +5,6 @@ #include "tao/SystemException.h" #include "ace/Get_Opt.h" -ACE_RCSID(Bug_2869_Regression, client, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int diff --git a/tests/Bug_2909_Regression/Makefile.am b/tests/Bug_2909_Regression/Makefile.am deleted file mode 100644 index 3caf1b598ad..00000000000 --- a/tests/Bug_2909_Regression/Makefile.am +++ /dev/null @@ -1,97 +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) - - -## Makefile.Bug_2909_Regression_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -CLEANFILES = \ - ami_test-stamp \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp - -ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl - @touch $@ - -noinst_HEADERS = \ - ami_test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.Bug_2909_Regression_Client.am - -if BUILD_AMI -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 = \ - ami_testC.cpp \ - ami_testS.cpp \ - ami_test_i.cpp \ - client.cpp \ - ami_test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## 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/Bug_2909_Regression/ami_test_i.cpp b/tests/Bug_2909_Regression/ami_test_i.cpp index 9036fb90cbc..7b31c795f47 100644 --- a/tests/Bug_2909_Regression/ami_test_i.cpp +++ b/tests/Bug_2909_Regression/ami_test_i.cpp @@ -15,8 +15,6 @@ #include "ami_test_i.h" #include "tao/debug.h" -ACE_RCSID(AMI, ami_test_i, "$Id$") - AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_2909_Regression/client.cpp b/tests/Bug_2909_Regression/client.cpp index 3986f708f0b..0c00328eb04 100644 --- a/tests/Bug_2909_Regression/client.cpp +++ b/tests/Bug_2909_Regression/client.cpp @@ -19,10 +19,6 @@ #include "ace/Synch_Traits.h" #include "ami_test_i.h" -ACE_RCSID (AMI, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 1; int niterations = 2; @@ -64,7 +60,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/tests/Bug_2918_Regression/Hello.cpp b/tests/Bug_2918_Regression/Hello.cpp index eb2603dd591..46043d0d3ee 100644 --- a/tests/Bug_2918_Regression/Hello.cpp +++ b/tests/Bug_2918_Regression/Hello.cpp @@ -2,12 +2,6 @@ #include "Hello.h" - -ACE_RCSID (Recursive, - Hello, - "$Id$") - - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_2918_Regression/Makefile.am b/tests/Bug_2918_Regression/Makefile.am deleted file mode 100644 index 86311025853..00000000000 --- a/tests/Bug_2918_Regression/Makefile.am +++ /dev/null @@ -1,114 +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_2918_Regression_Idl.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_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2918_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 = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2918_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 = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/tests/Bug_2918_Regression/client.cpp b/tests/Bug_2918_Regression/client.cpp index 803970452ba..cc5dc2a72dd 100644 --- a/tests/Bug_2918_Regression/client.cpp +++ b/tests/Bug_2918_Regression/client.cpp @@ -3,18 +3,11 @@ #include "TestC.h" #include "tao/IFR_Client/IFR_BaseC.h" #include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h" - #include "ace/Get_Opt.h" #include <algorithm> #include <functional> - -ACE_RCSID (Recursive, - client, - "$Id$") - - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/tests/Bug_2918_Regression/server.cpp b/tests/Bug_2918_Regression/server.cpp index c1d8bd1bb30..ab19d0fb0a7 100644 --- a/tests/Bug_2918_Regression/server.cpp +++ b/tests/Bug_2918_Regression/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +28,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/tests/Bug_2935_Regression/Makefile.am b/tests/Bug_2935_Regression/Makefile.am deleted file mode 100644 index 8c999ce38f1..00000000000 --- a/tests/Bug_2935_Regression/Makefile.am +++ /dev/null @@ -1,133 +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_2935_Regression_IDL.am - -BUILT_SOURCES = \ - ThreeTierC.cpp \ - ThreeTierC.h \ - ThreeTierC.inl \ - ThreeTierS.cpp \ - ThreeTierS.h \ - ThreeTierS.inl - -CLEANFILES = \ - ThreeTier-stamp \ - ThreeTierC.cpp \ - ThreeTierC.h \ - ThreeTierC.inl \ - ThreeTierS.cpp \ - ThreeTierS.h \ - ThreeTierS.inl - -ThreeTierC.cpp ThreeTierC.h ThreeTierC.inl ThreeTierS.cpp ThreeTierS.h ThreeTierS.inl: ThreeTier-stamp - -ThreeTier-stamp: $(srcdir)/ThreeTier.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/ThreeTier.idl - @touch $@ - -noinst_HEADERS = \ - ThreeTier.idl - -## Makefile.Bug_2935_Regression_Middle.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += middle - -middle_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -middle_SOURCES = \ - ThreeTierC.cpp \ - ThreeTierS.cpp \ - middle.cpp \ - middle_i.cpp \ - middle_i.h - -middle_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.Bug_2935_Regression_Sink.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += sink - -sink_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -sink_SOURCES = \ - ThreeTierC.cpp \ - ThreeTierS.cpp \ - sink.cpp \ - sink_i.cpp \ - sink_i.h - -sink_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.Bug_2935_Regression_Source.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += source - -source_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -source_SOURCES = \ - ThreeTierC.cpp \ - source.cpp \ - source_i.cpp \ - source_i.h - -source_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/Bug_2935_Regression/README.txt b/tests/Bug_2935_Regression/README.txt index d90fcb5a624..141af0bd2d9 100644 --- a/tests/Bug_2935_Regression/README.txt +++ b/tests/Bug_2935_Regression/README.txt @@ -1,11 +1,11 @@ ThreeTier Test. -This test was added in response to the bugs reported in bugzilla entries - 2934: -ORBMuxedConnectionMax didn't work correctly, and - 2935: too many connections to a server are opened in nested-upcall or - multithreaed situations. - - +This test was added in response to the bugs reported in bugzilla entries + 2934: -ORBMuxedConnectionMax didn't work correctly, and + 2935: too many connections to a server are opened in nested-upcall or + multithreaed situations. + + The test consists of three processes, source sends requests, middle passes the requests on, and sink actually processes the requests. Because source operates as fast as possible and sink has a delay, the @@ -19,7 +19,7 @@ peer connections that were logged. There should be exactly one. As an aside, these three processes have been very useful in testing various middle tier issues. Of course the best way to address this middle tier type -of application is thru a mixture of AMH and AMI, but that's a topic for a +of application is thru a mixture of AMH and AMI, but that's a topic for a different test. Dale Wilson <wilsond@ociweb.com>
\ No newline at end of file diff --git a/tests/Bug_2935_Regression/middle.conf b/tests/Bug_2935_Regression/middle.conf index b8a982933f3..0d02a4d9eea 100644 --- a/tests/Bug_2935_Regression/middle.conf +++ b/tests/Bug_2935_Regression/middle.conf @@ -1 +1,3 @@ +# $Id$ + static Resource_Factory "-ORBMuxedConnectionMax 1" diff --git a/tests/Bug_2935_Regression/middle_i.cpp b/tests/Bug_2935_Regression/middle_i.cpp index ef8c2b2cfd6..64e42e26d61 100644 --- a/tests/Bug_2935_Regression/middle_i.cpp +++ b/tests/Bug_2935_Regression/middle_i.cpp @@ -4,8 +4,6 @@ #include "ace/OS_NS_time.h" #include "ace/OS_NS_string.h" -ACE_RCSID(Time, Middle_i, "$Id$") - Middle_i::Middle_i (CORBA::ORB_ptr orb, ThreeTier_ptr target) : orb_(CORBA::ORB::_duplicate (orb)) , target_(ThreeTier::_duplicate (target)) diff --git a/tests/Bug_2935_Regression/middle_i.h b/tests/Bug_2935_Regression/middle_i.h index 74de26395d4..08ef48d788f 100644 --- a/tests/Bug_2935_Regression/middle_i.h +++ b/tests/Bug_2935_Regression/middle_i.h @@ -1,21 +1,18 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/examples/Simple/time -// -// = FILENAME -// middle_i.h -// -// = DESCRIPTION -// This class implements the Time IDL interface. -// -// = AUTHOR -// Darrell Brunsch <brunsch@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file middle_i.h + * + * $Id$ + * + * This class implements the Time IDL interface. + * + * + * @author Darrell Brunsch <brunsch@cs.wustl.edu> + */ +//============================================================================= + #ifndef MIDDLE_I_H #define MIDDLE_I_H @@ -23,15 +20,16 @@ #include "ThreeTierC.h" #include "ThreeTierS.h" +/** + * @class Middle_i: + * + * @brief ThreeTier Object Implementation as middle + * + * The middle implementaiton of the ThreeTier interface simply + * forwards requests to + */ class Middle_i: public POA_ThreeTier { - // = TITLE - // ThreeTier Object Implementation as middle - // - // = DESCRIPTION - // The middle implementaiton of the ThreeTier interface simply - // forwards requests to - // public: Middle_i (CORBA::ORB_ptr orb, ThreeTier_ptr target); ~Middle_i (); diff --git a/tests/Bug_2935_Regression/run_test.pl b/tests/Bug_2935_Regression/run_test.pl index 46c636eea08..64a4acd9aa6 100755 --- a/tests/Bug_2935_Regression/run_test.pl +++ b/tests/Bug_2935_Regression/run_test.pl @@ -18,7 +18,7 @@ sub count_matching_lines { } close FILE; return $count; -} +} $status = 0; diff --git a/tests/Bug_2935_Regression/sink_i.cpp b/tests/Bug_2935_Regression/sink_i.cpp index fc65bbcfe97..02411772fb6 100644 --- a/tests/Bug_2935_Regression/sink_i.cpp +++ b/tests/Bug_2935_Regression/sink_i.cpp @@ -2,7 +2,6 @@ #include "sink_i.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Sink, Sink_i, "$Id$") // Constructor Sink_i::Sink_i (CORBA::ORB_ptr orb) diff --git a/tests/Bug_2935_Regression/sink_i.h b/tests/Bug_2935_Regression/sink_i.h index 4b184c09e8f..5d986e5084d 100644 --- a/tests/Bug_2935_Regression/sink_i.h +++ b/tests/Bug_2935_Regression/sink_i.h @@ -1,23 +1,19 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/ThreeTier -// -// = FILENAME -// Sink_i.h -// -// = DESCRIPTION -// This class implements the ThreeTier IDL interface. -// It acts as the "end of the line" for tick and tock -// requests. -// -// = AUTHOR -// Dale Wilson <wilsond@ociweb.com> -// -// ============================================================================ + +//============================================================================= +/** + * @file sink_i.h + * + * $Id$ + * + * This class implements the ThreeTier IDL interface. + * It acts as the "end of the line" for tick and tock + * requests. + * + * @author Dale Wilson <wilsond@ociweb.com> + */ +//============================================================================= + #ifndef SINK_I_H #define SINK_I_H @@ -31,8 +27,8 @@ public: /// @param an initialized ORB Sink_i (CORBA::ORB_ptr orb); + /// Destructor ~Sink_i (); - // Destructor bool parse_args (int & argc, ACE_TCHAR * argv[]); diff --git a/tests/Bug_2935_Regression/source_i.h b/tests/Bug_2935_Regression/source_i.h index add472917c2..7c1e423ff82 100644 --- a/tests/Bug_2935_Regression/source_i.h +++ b/tests/Bug_2935_Regression/source_i.h @@ -1,35 +1,34 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/examples/Simple/ThreeTier -// -// = FILENAME -// source_i.h -// -// = DESCRIPTION -// This class implements the source for a three tier system -// Adapted from TAO/examples/Simple/time -// -// = AUTHOR -// Dale Wilson <wilsond@ociweb.com> -// -// ============================================================================ + +//============================================================================= +/** + * @file source_i.h + * + * $Id$ + * + * This class implements the source for a three tier system + * Adapted from TAO/examples/Simple/time + * + * + * @author Dale Wilson <wilsond@ociweb.com> + */ +//============================================================================= + #ifndef SOURCE_I_H #define SOURCE_I_H #include "ThreeTierC.h" +/** + * @class Source_i + * + * @brief Source interface subclass. + * + * a source of data for the three tier test + */ class Source_i { - // = TITLE - // Source interface subclass. - // - // = DESCRIPTION - // a source of data for the three tier test public: Source_i (ThreeTier_ptr target); @@ -37,8 +36,8 @@ public: bool parse_args(int argc, ACE_TCHAR *argv[]); + /// Execute the methods int run (); - // Execute the methods private: ThreeTier_var target_; diff --git a/tests/Bug_2936_Regression/DllORB.cpp b/tests/Bug_2936_Regression/DllORB.cpp index 77e0d78b0a8..4abd4b6e9ca 100644 --- a/tests/Bug_2936_Regression/DllORB.cpp +++ b/tests/Bug_2936_Regression/DllORB.cpp @@ -90,8 +90,7 @@ DllORB::init (int argc, ACE_TCHAR *argv[]) } // Initialize the ORB - ACE_Argv_Type_Converter argcon (argc, argv); - mv_orb_ = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv ()); + mv_orb_ = CORBA::ORB_init (argc, argv); if (CORBA::is_nil (mv_orb_.in ())) { ACE_DEBUG ((LM_ERROR, ACE_TEXT ("nil ORB\n"))); diff --git a/tests/Bug_2936_Regression/Makefile.am b/tests/Bug_2936_Regression/Makefile.am deleted file mode 100644 index 5b5ebca513e..00000000000 --- a/tests/Bug_2936_Regression/Makefile.am +++ /dev/null @@ -1,65 +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.bug2936_exe.am - -noinst_PROGRAMS = bug2936 - -bug2936_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) - -bug2936_SOURCES = \ - bug2936.cpp \ - DllORB.h \ - PersistentPOA.h \ - bug2936_export.h - -bug2936_LDADD = \ - $(ACE_BUILDDIR)/ace/libACE.la - -## Makefile.bug2936_lib.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_LTLIBRARIES = libbug2936.la - -libbug2936_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DBUG2936_BUILD_DLL - -libbug2936_la_SOURCES = \ - DllORB.cpp \ - PersistentPOA.cpp - -noinst_HEADERS = \ - DllORB.h \ - PersistentPOA.h - -endif BUILD_THREADS -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/Bug_2936_Regression/bug2936.cpp b/tests/Bug_2936_Regression/bug2936.cpp index dd7c7a4790d..bd982c6a498 100644 --- a/tests/Bug_2936_Regression/bug2936.cpp +++ b/tests/Bug_2936_Regression/bug2936.cpp @@ -1,8 +1,8 @@ // $Id$ -#include "ace/OS.h" #include "ace/Service_Config.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_unistd.h" char const * const scpc_orbId = "testDllOrb"; @@ -43,7 +43,8 @@ void loadunloadcycle() result = ACE_Service_Config::process_directive(scpc_loadPersistentPoa); ACE_DEBUG(( LM_DEBUG, - ACE_TEXT ("(%P|%t) loadunloadcycle - loading PersistentPoa done\n") + ACE_TEXT ("(%P|%t) loadunloadcycle - loading PersistentPoa done. Result: <%d>\n"), + result )); ACE_DEBUG(( @@ -60,7 +61,8 @@ void loadunloadcycle() result = ACE_Service_Config::process_directive(scpc_unloadPersistentPoa); ACE_DEBUG(( LM_DEBUG, - ACE_TEXT ("(%P|%t) loadunloadcycle - unloading PersistentPoa done\n") + ACE_TEXT ("(%P|%t) loadunloadcycle - unloading PersistentPoa done. Result: <%d>\n"), + result )); ACE_DEBUG(( @@ -70,7 +72,8 @@ void loadunloadcycle() result = ACE_Service_Config::process_directive(scpc_unloadOrb); ACE_DEBUG(( LM_DEBUG, - ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done\n") + ACE_TEXT ("(%P|%t) loadunloadcycle - unloading ORB done. Result: <%d>\n"), + result )); } diff --git a/tests/Bug_2953_Regression/Client_Task.cpp b/tests/Bug_2953_Regression/Client_Task.cpp index 70a7d6d3414..560ac417b3b 100644 --- a/tests/Bug_2953_Regression/Client_Task.cpp +++ b/tests/Bug_2953_Regression/Client_Task.cpp @@ -4,8 +4,6 @@ #include "Client_Task.h" -ACE_RCSID(AMI_Buffering, Client_Task, "$Id$") - Client_Task::Client_Task (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) , terminate_loop_ (0) diff --git a/tests/Bug_2953_Regression/Makefile.am b/tests/Bug_2953_Regression/Makefile.am deleted file mode 100644 index 077200589b3..00000000000 --- a/tests/Bug_2953_Regression/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.Bug_2953_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_2953_Regression_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - Client_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2953_Regression_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Client_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Client_Task.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/Bug_2953_Regression/client.cpp b/tests/Bug_2953_Regression/client.cpp index bf0b141c13f..191196967d4 100644 --- a/tests/Bug_2953_Regression/client.cpp +++ b/tests/Bug_2953_Regression/client.cpp @@ -52,7 +52,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/tests/Bug_2953_Regression/run_test.pl b/tests/Bug_2953_Regression/run_test.pl index e05cbec53be..817025c6911 100755 --- a/tests/Bug_2953_Regression/run_test.pl +++ b/tests/Bug_2953_Regression/run_test.pl @@ -14,7 +14,7 @@ $debug_level = '0'; foreach $i (@ARGV) { if ($i eq '-debug') { $debug_level = '10'; - } + } } my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; @@ -49,7 +49,7 @@ if ($server->WaitForFileTimed ($iorbaseA, print STDERR "ERROR: cannot find file <$server_iorfileA>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; -} +} $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval ()); diff --git a/tests/Bug_2953_Regression/server.cpp b/tests/Bug_2953_Regression/server.cpp index 0e6d4e2e311..92e3b2d1ee7 100644 --- a/tests/Bug_2953_Regression/server.cpp +++ b/tests/Bug_2953_Regression/server.cpp @@ -75,7 +75,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/tests/Bug_2966_Regression/Hello.cpp b/tests/Bug_2966_Regression/Hello.cpp index df5dc90d3d9..ec53524c2f8 100644 --- a/tests/Bug_2966_Regression/Hello.cpp +++ b/tests/Bug_2966_Regression/Hello.cpp @@ -1,9 +1,7 @@ -// +// -*- C++ -*- // $Id$ -// -#include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") +#include "Hello.h" Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/tests/Bug_2966_Regression/Makefile.am b/tests/Bug_2966_Regression/Makefile.am deleted file mode 100644 index 0f5809752b2..00000000000 --- a/tests/Bug_2966_Regression/Makefile.am +++ /dev/null @@ -1,127 +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_2966_Regression_Idl.am - -if BUILD_CORBA_MESSAGING -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_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.Bug_2966_Regression_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 = \ - TestC.cpp \ - client.cpp \ - Hello.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_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.Bug_2966_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_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_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 - -## 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/Bug_2966_Regression/client.cpp b/tests/Bug_2966_Regression/client.cpp index 5991a418b53..4327c459b67 100644 --- a/tests/Bug_2966_Regression/client.cpp +++ b/tests/Bug_2966_Regression/client.cpp @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ #include "tao/DynamicInterface/Request.h" @@ -6,8 +7,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -32,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/tests/Bug_2966_Regression/server.cpp b/tests/Bug_2966_Regression/server.cpp index 8dc401a83ab..4f70fadd052 100644 --- a/tests/Bug_2966_Regression/server.cpp +++ b/tests/Bug_2966_Regression/server.cpp @@ -1,13 +1,10 @@ +// -*- C++ -*- // $Id$ #include "Hello.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +29,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/tests/Bug_3000_Regression/Callback.cpp b/tests/Bug_3000_Regression/Callback.cpp index 5e34adf0b2a..aea07d5c0da 100644 --- a/tests/Bug_3000_Regression/Callback.cpp +++ b/tests/Bug_3000_Regression/Callback.cpp @@ -3,8 +3,6 @@ // #include "Callback.h" -ACE_RCSID(Callback, Callback, "$Id$") - Callback::Callback (void) : received_callback_ (false) { diff --git a/tests/Bug_3000_Regression/Makefile.am b/tests/Bug_3000_Regression/Makefile.am deleted file mode 100644 index b27da96b46f..00000000000 --- a/tests/Bug_3000_Regression/Makefile.am +++ /dev/null @@ -1,121 +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_3000_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_3000_Regression_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 = \ - Callback.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Callback.h - -client_LDADD = \ - $(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_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.Bug_3000_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Service.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Service.h - -server_LDADD = \ - $(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_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 - -## 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/Bug_3000_Regression/Service.cpp b/tests/Bug_3000_Regression/Service.cpp index 41c538898bb..c9c3e0241dc 100644 --- a/tests/Bug_3000_Regression/Service.cpp +++ b/tests/Bug_3000_Regression/Service.cpp @@ -3,8 +3,6 @@ // #include "Service.h" -ACE_RCSID(Callback, Service, "$Id$") - Service::Service (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_3000_Regression/client.cpp b/tests/Bug_3000_Regression/client.cpp index 66df617c9e5..1ae58f54545 100644 --- a/tests/Bug_3000_Regression/client.cpp +++ b/tests/Bug_3000_Regression/client.cpp @@ -6,8 +6,6 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" -ACE_RCSID(Crashed_Callback, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); bool shutdown_server = false; @@ -36,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/tests/Bug_3000_Regression/rw.conf b/tests/Bug_3000_Regression/rw.conf index 0117a350fdd..7bf9e4b052e 100644 --- a/tests/Bug_3000_Regression/rw.conf +++ b/tests/Bug_3000_Regression/rw.conf @@ -1,2 +1,4 @@ +# $Id$ + static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked" static Resource_Factory "-ORBFlushingStrategy blocking" diff --git a/tests/Bug_3000_Regression/server.cpp b/tests/Bug_3000_Regression/server.cpp index 45342dcb539..173ceb780e0 100644 --- a/tests/Bug_3000_Regression/server.cpp +++ b/tests/Bug_3000_Regression/server.cpp @@ -7,8 +7,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Crashed_Callback, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +30,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/tests/Bug_3042_Regression/Makefile.am b/tests/Bug_3042_Regression/Makefile.am deleted file mode 100644 index 2d6226140bd..00000000000 --- a/tests/Bug_3042_Regression/Makefile.am +++ /dev/null @@ -1,76 +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) - - -## Makefile.Bug_3042_Test_Client.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) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -client_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/Bug_3042_Regression/client.cpp b/tests/Bug_3042_Regression/client.cpp index 568574dec1d..857ee60a427 100644 --- a/tests/Bug_3042_Regression/client.cpp +++ b/tests/Bug_3042_Regression/client.cpp @@ -1,12 +1,9 @@ // -*- C++ -*- +// $Id$ #include "testC.h" #include "ace/Log_Msg.h" -ACE_RCSID (BoundedSeq, - client, - "$Id$") - int ACE_TMAIN(int, ACE_TCHAR *[]) { diff --git a/tests/Bug_3042_Regression/test.idl b/tests/Bug_3042_Regression/test.idl index 87dcf77a171..219ef29ed7c 100644 --- a/tests/Bug_3042_Regression/test.idl +++ b/tests/Bug_3042_Regression/test.idl @@ -14,8 +14,12 @@ module Foo { + struct Node; + + typedef sequence <Node,5> nodesequence; + struct Node { - sequence <Node,5> nodes; + nodesequence nodes; }; }; diff --git a/tests/Bug_3068_Regression/Bug_3068_Regression.mpc b/tests/Bug_3068_Regression/Bug_3068_Regression.mpc index 91440ec2c96..98bf591d37f 100644 --- a/tests/Bug_3068_Regression/Bug_3068_Regression.mpc +++ b/tests/Bug_3068_Regression/Bug_3068_Regression.mpc @@ -9,6 +9,8 @@ project(*Server): taoserver, messaging, bidir_giop, threads { project(*Client): taoserver, bidir_giop, threads { exename = client + after += *Server + Source_Files { test_i.cpp client.cpp diff --git a/tests/Bug_3068_Regression/client.conf b/tests/Bug_3068_Regression/client.conf index 57a8c2df132..0b274e1b02d 100644 --- a/tests/Bug_3068_Regression/client.conf +++ b/tests/Bug_3068_Regression/client.conf @@ -1 +1,3 @@ +# $Id$ + static Client_Strategy_Factory "-ORBConnectStrategy blocked" diff --git a/tests/Bug_3068_Regression/client.cpp b/tests/Bug_3068_Regression/client.cpp index c61101acf34..61e0b2755ea 100644 --- a/tests/Bug_3068_Regression/client.cpp +++ b/tests/Bug_3068_Regression/client.cpp @@ -8,8 +8,6 @@ #include "tao/Transport_Cache_Manager.h" #include "tao/Thread_Lane_Resources.h" -ACE_RCSID (Bug_3068_Regression, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("usage: %s -k <ior>\n"), argv [0]), -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Bug_3068_Regression/run_test.pl b/tests/Bug_3068_Regression/run_test.pl index 2ec2e3aa918..74ef14252e6 100755 --- a/tests/Bug_3068_Regression/run_test.pl +++ b/tests/Bug_3068_Regression/run_test.pl @@ -38,7 +38,7 @@ $SV = $server->CreateProcess ("server", $CL = $client->CreateProcess ("client", "-ORBSvcConf $client_conf " . "-k file://$client_iorfile"); - + $server_status = $SV->Spawn (); if ($server_status != 0) { diff --git a/tests/Bug_3068_Regression/server.conf b/tests/Bug_3068_Regression/server.conf index f39d729f6d4..d85c5c22234 100644 --- a/tests/Bug_3068_Regression/server.conf +++ b/tests/Bug_3068_Regression/server.conf @@ -1,3 +1,5 @@ +# $Id$ + static Resource_Factory "-ORBMuxedConnectionMax 1" static Client_Strategy_Factory "-ORBTransportMuxStrategy muxed -ORBConnectStrategy blocked" diff --git a/tests/Bug_3068_Regression/server.cpp b/tests/Bug_3068_Regression/server.cpp index 3708cb7eabe..6b7f44cde8a 100644 --- a/tests/Bug_3068_Regression/server.cpp +++ b/tests/Bug_3068_Regression/server.cpp @@ -8,8 +8,6 @@ #include "tao/Messaging/Messaging.h" #include "tao/BiDir_GIOP/BiDirGIOP.h" -ACE_RCSID (Bug_3068_Regression, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int iterations = 10; @@ -34,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) ACE_TEXT ("-i <iterations>\n"), argv [0]), -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Bug_3068_Regression/test_i.cpp b/tests/Bug_3068_Regression/test_i.cpp index 0aed21b49f2..863770e0ec1 100644 --- a/tests/Bug_3068_Regression/test_i.cpp +++ b/tests/Bug_3068_Regression/test_i.cpp @@ -12,8 +12,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID (Bug_3068_Regression, test_i, "$Id$") - void Callback_i::shutdown () { diff --git a/tests/Bug_3068_Regression/test_i.h b/tests/Bug_3068_Regression/test_i.h index c45883f3268..461312294b9 100644 --- a/tests/Bug_3068_Regression/test_i.h +++ b/tests/Bug_3068_Regression/test_i.h @@ -1,18 +1,15 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/BiDirectional -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Balachandran Natarajan <bala@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Balachandran Natarajan <bala@cs.wustl.edu> + */ +//============================================================================= + #ifndef TAO_BIDIRECTIONAL_TEST_I_H #define TAO_BIDIRECTIONAL_TEST_I_H @@ -20,6 +17,7 @@ #include "testS.h" #include "ace/Task.h" #include "ace/Synch.h" +#include "ace/Condition_T.h" class Caller : public ACE_Task_Base { @@ -39,43 +37,46 @@ private: }; +/** + * @class Callback_i + * + * @brief A callback object to the "client" + * + * To test that the server can call the client on the same + * connection that was established by the client + */ class Callback_i : public POA_Callback { - // = TITLE - // A callback object to the "client" - // - // = DESCRIPTION - // To test that the server can call the client on the same - // connection that was established by the client - // public: + /// ctor Callback_i (CORBA::ORB_ptr orb); - // ctor + /// Safe way to shutdown void shutdown (); - // Safe way to shutdown + /// The callback method void callback_method (const CORBA::OctetSeq& payload); - // The callback method private: + /// The orb CORBA::ORB_var orb_; - // The orb }; +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + * for (int loop = 0; loop < 10; loop++) + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // for (int loop = 0; loop < 10; loop++) public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations); - // ctor // = The Simple_Server methods. void ow_test (); @@ -87,17 +88,17 @@ public: void shutdown (); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB + /// Flag to indicate, whether we are ready for a remote call. int flag_; - // Flag to indicate, whether we are ready for a remote call. + /// Callback Object Caller *caller_; - // Callback Object + /// Number of times the callback needs to be called int iterations_; - // Number of times the callback needs to be called int ow_count_; }; diff --git a/tests/Bug_3108_Regression/Makefile.am b/tests/Bug_3108_Regression/Makefile.am deleted file mode 100644 index 80b6c1b461b..00000000000 --- a/tests/Bug_3108_Regression/Makefile.am +++ /dev/null @@ -1,105 +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_3108_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_3108_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 \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_3108_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 = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_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/Bug_3108_Regression/client.cpp b/tests/Bug_3108_Regression/client.cpp index d1ef852bb60..51c34104576 100644 --- a/tests/Bug_3108_Regression/client.cpp +++ b/tests/Bug_3108_Regression/client.cpp @@ -39,7 +39,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/tests/Bug_3108_Regression/server.cpp b/tests/Bug_3108_Regression/server.cpp index dd6f368ff78..05b6a2fd0bb 100644 --- a/tests/Bug_3108_Regression/server.cpp +++ b/tests/Bug_3108_Regression/server.cpp @@ -28,7 +28,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/tests/Bug_3154_Regression/test.idl b/tests/Bug_3154_Regression/test.idl index e4ec773839e..6534517b2cd 100644 --- a/tests/Bug_3154_Regression/test.idl +++ b/tests/Bug_3154_Regression/test.idl @@ -147,7 +147,7 @@ module FT * creation of a member of an object group, and to determine where the member * is created. * - * @param object_group Reference for the object group to which the member is + * @param object_group Reference for the object group to which the member is * to be added. * @param the_location The physical location. * @param type_id The repository identifier for the type of the object. @@ -167,10 +167,10 @@ module FT CannotMeetCriteria); /** - * This operation allows an application to add an existing object to an object + * This operation allows an application to add an existing object to an object * group at a particular location. * - * @param object_group Reference for the object group to which the existing object + * @param object_group Reference for the object group to which the existing object * is to be added. * @param the_location The physical location of the object to be added. * @param member The reference of the object to be added. @@ -184,10 +184,10 @@ module FT ObjectNotAdded); /** - * This operation allows an application to remove a member from an object + * This operation allows an application to remove a member from an object * group at a particular location. * - * @param object_group Reference for the object group to which the member + * @param object_group Reference for the object group to which the member * is to be removed. * @param the_location The physical location of the member to be removed. * @@ -196,17 +196,17 @@ module FT ObjectGroup remove_member(in ObjectGroup object_group) raises(ObjectGroupNotFound, MemberNotFound); - + /** - * This operation allows the application to select the member of the object group + * This operation allows the application to select the member of the object group * that is to be the primary. * - * @param object_group Reference for the object group whose primary is to be + * @param object_group Reference for the object group whose primary is to be * determined. - * @param the_location The physical location of the member that is to become + * @param the_location The physical location of the member that is to become * the primary. * - * @return The object group reference with the primary member at the given + * @return The object group reference with the primary member at the given * location. */ ObjectGroup set_primary_member(in ObjectGroup object_group) @@ -235,18 +235,18 @@ module FT typedef any FactoryCreationId; /** - * This operation creates an object or an object group, using the type_id + * This operation creates an object or an object group, using the type_id * parameter to determine which type of object to create and the_criteria - * parameter to determine restrictions on how and where to create the object. + * parameter to determine restrictions on how and where to create the object. * - * @param type_id The repository identifier of the object to be created by + * @param type_id The repository identifier of the object to be created by * the factory. - * + * * @param the_criteria Information passed to the factory, which the factory * evaluates before creating the object. Examples of criteria are initialization * values, constraints on the object, preferred location of the object, fault * tolerance properties for an object group, etc. - * + * * @param factory_creation_id An identifier that allows the factory to delete * the object subsequently. * diff --git a/tests/Bug_3163_Regression/Makefile.am b/tests/Bug_3163_Regression/Makefile.am deleted file mode 100644 index 920e6c3c164..00000000000 --- a/tests/Bug_3163_Regression/Makefile.am +++ /dev/null @@ -1,102 +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_3163_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 -Sp $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Bug_3163_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 \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_3163_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 = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_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/Bug_3163_Regression/client.cpp b/tests/Bug_3163_Regression/client.cpp index 1517d590490..86471b52f52 100644 --- a/tests/Bug_3163_Regression/client.cpp +++ b/tests/Bug_3163_Regression/client.cpp @@ -3,8 +3,6 @@ #include "testC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int message_size = 0; @@ -32,7 +30,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/tests/Bug_3163_Regression/server.conf b/tests/Bug_3163_Regression/server.conf index 14378c72309..3246ec311c9 100644 --- a/tests/Bug_3163_Regression/server.conf +++ b/tests/Bug_3163_Regression/server.conf @@ -1,3 +1,5 @@ -static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock thread -ORBAllowReactivationOfSystemids 0" +# $Id$ + +static Server_Strategy_Factory "-ORBConcurrency reactive -ORBAllowReactivationOfSystemids 0" static Resource_Factory "-ORBConnectionCacheMax 10 -ORBNativeWcharCodeSet 0x00010109 -ORBFlushingStrategy blocking" static Client_Strategy_Factory "-ORBWaitStrategy rw -ORBTransportMuxStrategy exclusive -ORBConnectStrategy blocked -ORBConnectionHandlerCleanup 1" diff --git a/tests/Bug_3163_Regression/server.cpp b/tests/Bug_3163_Regression/server.cpp index 02832ccdd8d..e3f2f63cbbb 100644 --- a/tests/Bug_3163_Regression/server.cpp +++ b/tests/Bug_3163_Regression/server.cpp @@ -30,7 +30,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/tests/Bug_3171_Regression/Makefile.am b/tests/Bug_3171_Regression/Makefile.am deleted file mode 100644 index 46b9bd57450..00000000000 --- a/tests/Bug_3171_Regression/Makefile.am +++ /dev/null @@ -1,55 +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_3171_Regression_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.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_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## 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/Bug_3171_Regression/server.cpp b/tests/Bug_3171_Regression/server.cpp index 79c4b0c4ac8..39bbbf250ac 100644 --- a/tests/Bug_3171_Regression/server.cpp +++ b/tests/Bug_3171_Regression/server.cpp @@ -51,7 +51,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/tests/Bug_3198_Regression/Makefile.am b/tests/Bug_3198_Regression/Makefile.am deleted file mode 100644 index 5be85cc8c4e..00000000000 --- a/tests/Bug_3198_Regression/Makefile.am +++ /dev/null @@ -1,44 +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_3198_Regression.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - bug_3198_regression.cpp - -client_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/Bug_3198_Regression/bug_3198_regression.cpp b/tests/Bug_3198_Regression/bug_3198_regression.cpp index ac31228b5e0..5579022048c 100644 --- a/tests/Bug_3198_Regression/bug_3198_regression.cpp +++ b/tests/Bug_3198_Regression/bug_3198_regression.cpp @@ -5,10 +5,6 @@ #include "tao/PolicyC.h" #include "ace/Get_Opt.h" -ACE_RCSID (Bug_3198_Regression, - bug_3198_regression, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("corbaloc:iiop:localhost:12345/MyObjectKey"); int @@ -33,7 +29,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/tests/Bug_3251_Regression/Bug_3251.conf b/tests/Bug_3251_Regression/Bug_3251.conf index b79947bdd3c..8a3ada294ba 100644 --- a/tests/Bug_3251_Regression/Bug_3251.conf +++ b/tests/Bug_3251_Regression/Bug_3251.conf @@ -1,3 +1,5 @@ +# $Id$ + dynamic DllOrb Service_Object * Bug_3251:_make_DllOrb() "DllOrb -NumThreads 12 -ORBDottedDecimalAddresses 1 -ORBCollocationStrategy thru_poa" dynamic PersistentPOA Service_Object * Bug_3251:_make_PersistentPoa() "PersistentPOA DllOrb" diff --git a/tests/Bug_3251_Regression/DllOrb.cpp b/tests/Bug_3251_Regression/DllOrb.cpp index 83708d86fde..b21f30a9b7b 100644 --- a/tests/Bug_3251_Regression/DllOrb.cpp +++ b/tests/Bug_3251_Regression/DllOrb.cpp @@ -44,8 +44,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[]) } // Initialize the ORB - ACE_Argv_Type_Converter argcon (argc, argv); - mv_orb_ = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv ()); + mv_orb_ = CORBA::ORB_init (argc, argv); if (CORBA::is_nil (mv_orb_.in ())) { ACE_DEBUG ((LM_ERROR, ACE_TEXT ("nil ORB\n"))); diff --git a/tests/Bug_3251_Regression/Makefile.am b/tests/Bug_3251_Regression/Makefile.am deleted file mode 100644 index 1b3f337f1a4..00000000000 --- a/tests/Bug_3251_Regression/Makefile.am +++ /dev/null @@ -1,76 +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_3251_Regression_Lib.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_LTLIBRARIES = libBug_3251.la - -libBug_3251_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DBUG_3251_REGRESSION_BUILD_DLL - -libBug_3251_la_SOURCES = \ - DllOrb.cpp \ - PersistentPoa.cpp - -noinst_HEADERS = \ - DllOrb.h \ - PersistentPoa.h - -endif BUILD_THREADS -endif BUILD_EXCEPTIONS - -## Makefile.Bug_3251_Regression_Server.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - DllOrb.h \ - PersistentPoa.h \ - bug_3251_export.h - -server_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_THREADS -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/Bug_3251_Regression/server.cpp b/tests/Bug_3251_Regression/server.cpp index 776e96c30b1..42e582784a2 100644 --- a/tests/Bug_3251_Regression/server.cpp +++ b/tests/Bug_3251_Regression/server.cpp @@ -1,7 +1,6 @@ // $Id$ #include "ace/ARGV.h" -#include "ace/OS.h" #include "ace/Reactor.h" #include "ace/Signal.h" #include "ace/Service_Config.h" diff --git a/tests/Bug_3276_Regression/Makefile.am b/tests/Bug_3276_Regression/Makefile.am deleted file mode 100644 index 7b4c12a9360..00000000000 --- a/tests/Bug_3276_Regression/Makefile.am +++ /dev/null @@ -1,110 +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_3276_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_3276_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 \ - testC.cpp \ - Manager.h \ - Servant_Locator.h \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_3276_Regression_Manager.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += manager - -manager_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -manager_SOURCES = \ - Manager.cpp \ - Servant_Locator.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Manager.h \ - Servant_Locator.h \ - test_i.h - -manager_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/Bug_3276_Regression/Manager.cpp b/tests/Bug_3276_Regression/Manager.cpp index 0e9d95e5df4..22350fbb485 100644 --- a/tests/Bug_3276_Regression/Manager.cpp +++ b/tests/Bug_3276_Regression/Manager.cpp @@ -26,7 +26,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) proxy_ior = get_opts.opt_arg (); break; } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Bug_3276_Regression/Manager.h b/tests/Bug_3276_Regression/Manager.h index 7531e48955f..f9c7188b6aa 100644 --- a/tests/Bug_3276_Regression/Manager.h +++ b/tests/Bug_3276_Regression/Manager.h @@ -39,7 +39,7 @@ private: // Our servant locator CORBA::Object_var server_; - // + // }; #endif /*_MANAGER_H_ */ diff --git a/tests/Bug_3276_Regression/client.cpp b/tests/Bug_3276_Regression/client.cpp index 883b625ab08..0558ff6b9b8 100644 --- a/tests/Bug_3276_Regression/client.cpp +++ b/tests/Bug_3276_Regression/client.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/tests/Bug_3299_Regression/Hello.cpp b/tests/Bug_3299_Regression/Hello.cpp index 24d5cc316f9..737e84edc88 100644 --- a/tests/Bug_3299_Regression/Hello.cpp +++ b/tests/Bug_3299_Regression/Hello.cpp @@ -1,10 +1,6 @@ -// // $Id$ -// #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_3299_Regression/Makefile.am b/tests/Bug_3299_Regression/Makefile.am deleted file mode 100644 index cc493f5d845..00000000000 --- a/tests/Bug_3299_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_3299_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 -Sp $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_3299_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 = \ - TestC.cpp \ - client.cpp \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_3299_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 = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -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/tests/Bug_3299_Regression/README b/tests/Bug_3299_Regression/README index f769a679628..4bb3faf68a0 100644 --- a/tests/Bug_3299_Regression/README +++ b/tests/Bug_3299_Regression/README @@ -1,4 +1,4 @@ -# $Id:$ +# $Id$ This test checks that the client side ORB *doesn't* transparently reinvoke COMPLETED_MAYBE exceptions. diff --git a/tests/Bug_3299_Regression/client.cpp b/tests/Bug_3299_Regression/client.cpp index e331e588f63..3ddc90434e9 100644 --- a/tests/Bug_3299_Regression/client.cpp +++ b/tests/Bug_3299_Regression/client.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -29,7 +27,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/tests/Bug_3299_Regression/server.cpp b/tests/Bug_3299_Regression/server.cpp index b16847d909e..5ff6ccea575 100644 --- a/tests/Bug_3299_Regression/server.cpp +++ b/tests/Bug_3299_Regression/server.cpp @@ -5,10 +5,6 @@ #include "ace/OS_NS_stdio.h" #include "tao/IORTable/IORTable.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -33,7 +29,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/tests/Bug_3311_Regression/Makefile.am b/tests/Bug_3311_Regression/Makefile.am deleted file mode 100644 index 16935417e2f..00000000000 --- a/tests/Bug_3311_Regression/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.Bug_3311_Regression_Test.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) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = test - -test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -test_SOURCES = \ - test.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -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/Bug_3315_Regression/Makefile.am b/tests/Bug_3315_Regression/Makefile.am deleted file mode 100644 index 8319643ae0a..00000000000 --- a/tests/Bug_3315_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_3315_Regression.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - main.cpp - -server_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_THREADS -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/Bug_3321_Regression/Makefile.am b/tests/Bug_3321_Regression/Makefile.am deleted file mode 100644 index e540e000dd3..00000000000 --- a/tests/Bug_3321_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_3321_Regression.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - main.cpp - -server_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_THREADS -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/Bug_3333_Regression/Hello.cpp b/tests/Bug_3333_Regression/Hello.cpp index f6566bfcb23..41a73fd5427 100644 --- a/tests/Bug_3333_Regression/Hello.cpp +++ b/tests/Bug_3333_Regression/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_3333_Regression/client.cpp b/tests/Bug_3333_Regression/client.cpp index f9b39e80227..3e93f3fa15e 100644 --- a/tests/Bug_3333_Regression/client.cpp +++ b/tests/Bug_3333_Regression/client.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "tao/Messaging/Messaging.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); const ACE_TCHAR *loop_forever_ior = ACE_TEXT ("file://forward_forever.ior"); bool shutdown_only = false; @@ -38,7 +36,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/tests/Bug_3333_Regression/server.cpp b/tests/Bug_3333_Regression/server.cpp index c77bbdddc64..dd7521c191d 100644 --- a/tests/Bug_3333_Regression/server.cpp +++ b/tests/Bug_3333_Regression/server.cpp @@ -6,10 +6,6 @@ #include "ace/SString.h" #include "tao/IORTable/IORTable.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); const ACE_TCHAR *ior_output_file2 = ACE_TEXT ("forward_forever.ior"); @@ -37,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/tests/Bug_3430_Regression/Hello.cpp b/tests/Bug_3430_Regression/Hello.cpp index ff5ed29321b..b9f417703c9 100644 --- a/tests/Bug_3430_Regression/Hello.cpp +++ b/tests/Bug_3430_Regression/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_3430_Regression/client.cpp b/tests/Bug_3430_Regression/client.cpp index 7536ee26f67..de34e78578e 100644 --- a/tests/Bug_3430_Regression/client.cpp +++ b/tests/Bug_3430_Regression/client.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int @@ -29,7 +27,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/tests/Bug_3430_Regression/server.cpp b/tests/Bug_3430_Regression/server.cpp index cacd790a6ff..205a7c179e0 100644 --- a/tests/Bug_3430_Regression/server.cpp +++ b/tests/Bug_3430_Regression/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int @@ -32,7 +28,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/tests/Bug_3471_Regression/Hello.cpp b/tests/Bug_3471_Regression/Hello.cpp index 3e1e492a5c1..6426b2f3d4e 100644 --- a/tests/Bug_3471_Regression/Hello.cpp +++ b/tests/Bug_3471_Regression/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_3471_Regression/client.cpp b/tests/Bug_3471_Regression/client.cpp index bc9b948ec74..a5e47f38199 100644 --- a/tests/Bug_3471_Regression/client.cpp +++ b/tests/Bug_3471_Regression/client.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int @@ -29,7 +27,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/tests/Bug_3471_Regression/server.cpp b/tests/Bug_3471_Regression/server.cpp index cacd790a6ff..205a7c179e0 100644 --- a/tests/Bug_3471_Regression/server.cpp +++ b/tests/Bug_3471_Regression/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int @@ -32,7 +28,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/tests/Bug_3479_Regression/Hello.cpp b/tests/Bug_3479_Regression/Hello.cpp index 1e272c82af2..88ef46a2a51 100644 --- a/tests/Bug_3479_Regression/Hello.cpp +++ b/tests/Bug_3479_Regression/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_3479_Regression/README b/tests/Bug_3479_Regression/README index bccd449a6f0..1e796087d76 100644 --- a/tests/Bug_3479_Regression/README +++ b/tests/Bug_3479_Regression/README @@ -1,5 +1,5 @@ /** -$Id:$ +$Id$ This is a clone of the Hello World test. The differences are that an out string argument is used rather than having ::get_string return string. diff --git a/tests/Bug_3479_Regression/client.cpp b/tests/Bug_3479_Regression/client.cpp index 25bfbefe03a..7ca9221946d 100644 --- a/tests/Bug_3479_Regression/client.cpp +++ b/tests/Bug_3479_Regression/client.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "tao/StringSeqC.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int @@ -30,7 +28,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/tests/Bug_3479_Regression/server.cpp b/tests/Bug_3479_Regression/server.cpp index cacd790a6ff..205a7c179e0 100644 --- a/tests/Bug_3479_Regression/server.cpp +++ b/tests/Bug_3479_Regression/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int @@ -32,7 +28,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/tests/Bug_3506_Regression/client.cpp b/tests/Bug_3506_Regression/client.cpp index 138f8067da0..34f24b89e24 100644 --- a/tests/Bug_3506_Regression/client.cpp +++ b/tests/Bug_3506_Regression/client.cpp @@ -28,7 +28,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/tests/Bug_3506_Regression/server.cpp b/tests/Bug_3506_Regression/server.cpp index 3e419b1e466..fe0f9a657e3 100644 --- a/tests/Bug_3506_Regression/server.cpp +++ b/tests/Bug_3506_Regression/server.cpp @@ -30,7 +30,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/tests/Bug_3513_Regression/test.idl b/tests/Bug_3513_Regression/test.idl index a358eda8ab2..ae55732a3e3 100644 --- a/tests/Bug_3513_Regression/test.idl +++ b/tests/Bug_3513_Regression/test.idl @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* We've added a comment to the effect that this file does not contain the following diff --git a/tests/Bug_3524_Regression/client.cpp b/tests/Bug_3524_Regression/client.cpp index 725b57503bd..3b511be26f8 100644 --- a/tests/Bug_3524_Regression/client.cpp +++ b/tests/Bug_3524_Regression/client.cpp @@ -1,13 +1,10 @@ +// -*- C++ -*- // $Id$ #include "ace/Get_Opt.h" #include "ace/Synch.h" #include "testC.h" -ACE_RCSID(Bug_3524_Regression, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int diff --git a/tests/Bug_3524_Regression/server.cpp b/tests/Bug_3524_Regression/server.cpp index 9052d258e5f..97ae58abd85 100644 --- a/tests/Bug_3524_Regression/server.cpp +++ b/tests/Bug_3524_Regression/server.cpp @@ -1,13 +1,10 @@ +// -*- C++ -*- // $Id$ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" #include "test_i.h" -ACE_RCSID (Bug_3524_Regression, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int @@ -31,7 +28,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/tests/Bug_3524_Regression/test_i.cpp b/tests/Bug_3524_Regression/test_i.cpp index 9e8b93eea9d..9b781340732 100644 --- a/tests/Bug_3524_Regression/test_i.cpp +++ b/tests/Bug_3524_Regression/test_i.cpp @@ -1,12 +1,9 @@ -// $Id: test_i.cpp,v 1.1 2003/08/27 22:43:35 vz Exp +// -*- C++ -*- +// $Id$ #include "test_i.h" #include "ace/Auto_Ptr.h" -ACE_RCSID (Bug_3524_Regression, - test_i, - "$Id$") - A_i::A_i (CORBA::ORB_ptr orb, CORBA::ValueFactoryBase *vtp_factory) : orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/tests/Bug_3531_Regression/client.cpp b/tests/Bug_3531_Regression/client.cpp index 43fcdd5c5b4..90a02ce55f8 100644 --- a/tests/Bug_3531_Regression/client.cpp +++ b/tests/Bug_3531_Regression/client.cpp @@ -2,22 +2,19 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -#include "ace/OS.h" #include "testS.h" - -ACE_RCSID(Bug_2494_Regression, client, "$Id$") +#include "ace/OS_NS_unistd.h" const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int do_shutdown = 0; +/** + * Simpler Server Client implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server Client implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: Simple_Server_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) @@ -80,18 +77,17 @@ 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; } +/** + * Run a server thread + * + * Use the ACE_Task_Base class to run server threads + */ class Worker : public ACE_Task_Base { - // = TITLE - // Run a server thread - // - // = DESCRIPTION - // Use the ACE_Task_Base class to run server threads - // public: Worker (CORBA::ORB_ptr orb); // ctor diff --git a/tests/Bug_3531_Regression/run_test.pl b/tests/Bug_3531_Regression/run_test.pl index c6929f8976c..4abf90d2143 100755 --- a/tests/Bug_3531_Regression/run_test.pl +++ b/tests/Bug_3531_Regression/run_test.pl @@ -52,7 +52,7 @@ my @CLS = (); for($i = 0; $i < $num_clients - 1; $i++) { $CLS[$i] = $clients[$i]->CreateProcess ("client", "-k file://$clients_iorfile[$i]"); } -$CLS[$num_clients - 1] = $clients[$i]->CreateProcess ("client", +$CLS[$num_clients - 1] = $clients[$i]->CreateProcess ("client", "-k file://$clients_iorfile[$num_clients - 1] -x"); # start server and wait for file diff --git a/tests/Bug_3531_Regression/server.cpp b/tests/Bug_3531_Regression/server.cpp index cee5c9ae87d..da635e1b7f2 100644 --- a/tests/Bug_3531_Regression/server.cpp +++ b/tests/Bug_3531_Regression/server.cpp @@ -5,8 +5,6 @@ #include "ace/Task.h" #include "tao/ORB_Core.h" -ACE_RCSID(Bug_2494_Regression, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("file://test.ior"); const ACE_TCHAR *srv_shutdown_file = ACE_TEXT("server_terminated"); @@ -42,18 +40,17 @@ 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; } +/** + * Run a server thread + * + * Use the ACE_Task_Base class to run server threads + */ class Worker : public ACE_Task_Base { - // = TITLE - // Run a server thread - // - // = DESCRIPTION - // Use the ACE_Task_Base class to run server threads - // public: Worker (CORBA::ORB_ptr orb); // ctor diff --git a/tests/Bug_3531_Regression/test_i.cpp b/tests/Bug_3531_Regression/test_i.cpp index 6485df08911..fba6b1837aa 100644 --- a/tests/Bug_3531_Regression/test_i.cpp +++ b/tests/Bug_3531_Regression/test_i.cpp @@ -2,7 +2,6 @@ #include "test_i.h" #include "tao/debug.h" -#include "ace/OS.h" #include "tao/ORB_Core.h" #include "tao/LF_Strategy.h" #include "ace/Reactor.h" @@ -11,8 +10,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Bug_2494_Regression, test_i, "$Id$") - char * Simple_Server_i::test_method (Simple_Server_ptr objref) { @@ -26,7 +23,7 @@ Simple_Server_i::test_method (Simple_Server_ptr objref) try { { - ACE_Guard<TAO_SYNCH_MUTEX> guard (this->lock_); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); if (!this->timer_registed_) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Scheduling timeout...\n")); @@ -54,7 +51,7 @@ Simple_Server_i::test_method (Simple_Server_ptr objref) void Simple_Server_i::client_done () { - ACE_Guard<TAO_SYNCH_MUTEX> guard (this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); ACE_DEBUG ((LM_DEBUG, "(%P|%t) Simple_Server_i::client_done () called\n")); this->cond_.signal (); } @@ -63,7 +60,7 @@ int Simple_Server_i::handle_timeout (const ACE_Time_Value &, const void *) { - ACE_Guard<TAO_SYNCH_MUTEX> guard (this->lock_); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0); // We are the (client) leader. Signal the leader-follower pattern to // elect a new leader TAO_ORB_Core *oc = orb_->orb_core(); diff --git a/tests/Bug_3531_Regression/test_i.h b/tests/Bug_3531_Regression/test_i.h index b89d5e7bdbf..b4900377b9e 100644 --- a/tests/Bug_3531_Regression/test_i.h +++ b/tests/Bug_3531_Regression/test_i.h @@ -6,14 +6,13 @@ #include "testS.h" #include "ace/Synch.h" +/** + * Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server, public ACE_Event_Handler { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: Simple_Server_i (CORBA::ORB_ptr orb); // ctor diff --git a/tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc b/tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc new file mode 100644 index 00000000000..d974e26d6c5 --- /dev/null +++ b/tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc @@ -0,0 +1,10 @@ +// $Id$ + +project(*Server): taoserver { + requires += dummy_label + after += *idl + Source_Files { + server.cpp + } +} + diff --git a/tests/Bug_3531b_Regression/run_test.pl b/tests/Bug_3531b_Regression/run_test.pl new file mode 100755 index 00000000000..d1d85802727 --- /dev/null +++ b/tests/Bug_3531b_Regression/run_test.pl @@ -0,0 +1,22 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; + +$SV = $server->CreateProcess ("server"); + +$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); + +if ($test != 0) { + print STDERR "ERROR: test returned $test\n"; + exit 1; +} + +exit 0; diff --git a/tests/Bug_3531b_Regression/server.cpp b/tests/Bug_3531b_Regression/server.cpp new file mode 100644 index 00000000000..5d5876a6be0 --- /dev/null +++ b/tests/Bug_3531b_Regression/server.cpp @@ -0,0 +1,1069 @@ +// $Id$ + +#include "ace/Get_Opt.h" +#include "ace/Global_Macros.h" +#include "ace/Task.h" +#include "tao/ORB_Core.h" +#include "tao/default_resource.h" +#include "tao/Leader_Follower.h" +#include "tao/LF_Event_Loop_Thread_Helper.h" +#include "tao/LF_Event.h" +#include "tao/Transport.h" +#include "ace/Task_T.h" +#include "tao/TAO_Export.h" + +int nthreads = 4; +bool debug = false; + +// TEST_ASSERT is exactly the same as ACE_ASSERT except it is active +// for both debug and *release* builds. +#define TEST_ASSERT(X) \ + do { if(!(X)) { \ + ACE_ERROR ((LM_ERROR, ACE_TEXT ("TEST_ASSERT: (%P|%t) file %N, line %l assertion failed for '%C'.%a\n"), \ + #X, -1)); \ + } } while (0) + +#define TSS_ASSERT(TSS, LF, ELT, CLT, LA) \ + TEST_ASSERT ((TSS->event_loop_thread_ == ELT)); \ + TEST_ASSERT ((TSS->client_leader_thread_ == CLT)); \ + TEST_ASSERT ((LF.leader_available () == LA)); + +class Worker; + +int +parse_args (int argc, char *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, "d"); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'd': + debug = true; + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-d" + "\n", + argv [0]), + -1); + } + // Indicates sucessful parsing of the command line + return 0; +} + +class Command: public ACE_Message_Block +{ +public: + virtual int execute (Worker*) = 0; +}; + + +////////////////////////////////////////////////////////////////////// +// NOTE: Do *NOT* put the same msg into the msg queue more than once. +// This will confuse the msg queue and result it in dropping messages +////////////////////////////////////////////////////////////////////// +class Worker: public ACE_Task<ACE_MT_SYNCH> +{ +public: + Worker (void) + : shutdown_ (false) + {} + + virtual int svc (void); + virtual int close (u_long = 0); + virtual int put (ACE_Message_Block * mblk, ACE_Time_Value * tv = 0); + int process_cmd (void); + void shutdown (bool do_shutdown); + bool shutdown (void); + +private: + bool shutdown_; +}; + +ACE_TSS<Worker> workers; + +int Worker::svc (void) +{ + if (debug) + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Worker thread starting up.\n")); + // Register this worker + workers.ts_object (const_cast<Worker*> (this)); + int retval = 0; + while (!shutdown_ && retval != -1) + { + retval = this->process_cmd (); + } + if (debug) + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Worker thread shutting down.\n")); + return retval; +} + +int Worker::close (u_long) +{ + // de-register this worker, otherwise the ACE_TSS will try to destroy it + workers.ts_object (0); + return 0; +} + +int Worker::put (ACE_Message_Block * mblk, ACE_Time_Value * tv) +{ + return this->putq (mblk, tv); +} + +int Worker::process_cmd (void) +{ + ACE_Message_Block *mb = 0; + if (this->getq (mb, 0) == -1) + { + ACE_ERROR ((LM_ERROR, "Error calling getq: $!\n")); + // Strangely, message queues return this instead of ETIME + if (errno == EWOULDBLOCK || errno == ESHUTDOWN) + return 0; + return -1; + } + Command* cmd = dynamic_cast <Command*> (mb); + ACE_ASSERT (cmd != 0); + cmd->execute (this); + cmd->release (); + return 0; +} + +void Worker::shutdown (bool do_shutdown) +{ + shutdown_ = do_shutdown; +} + +bool Worker::shutdown (void) +{ + return shutdown_; +} + +class Test_Reactor: public ACE_Reactor +{ +public: + // This is the method that the Leader_Follower object calls. + virtual int handle_events (ACE_Time_Value * = 0) + { + // This is called by client leader threads. Note, the loop here + // glosses over the fact that the Leader_Follower code does not + // work quite the way we want it to. Namely, this logic: + // 1 - client leader thread detects when there are event loop + // threads waiting + // 2 - client leader wakes up event loop threads via broadcast + // 3 - client leader temporarily gives up lock to allow event loop + // threads to take over leadership + // 4 - client leader thread takes lock again and loops around to + // become follower + // The problem is that the gap between 3 & 4 is often not long + // enough for the event loop threads to get switched in and take + // ovwnership of the lock, even though the client leader thread + // does a thr_yield! + // Thus this code, once shutdown, will continuely return and thus + // give the leader follower multiple chances to hand off to an + // event loop thread. This is not ideal but it will have to do + // until the leader follower code is fixed (if possible) + while (!workers->shutdown()) + // call this thread's (worker's) process_cmd method + workers->process_cmd (); + return 0; + }; +}; + +// Our own Resource_Factory for testing purposes. This just returns +// our Test_Reactor to the Leader_Follower object via the ORB_Core. +class Test_Resource_Factory: public TAO_Default_Resource_Factory +{ +public: + Test_Resource_Factory () + : test_reactor_ (new Test_Reactor) + {} + + virtual ACE_Reactor *get_reactor (void) + { + return test_reactor_; + } +private: + // This is allocated in the constructor and deallocated by the ORB_Core. + Test_Reactor* test_reactor_; +}; + +ACE_FACTORY_DEFINE (TAO, Test_Resource_Factory) +ACE_STATIC_SVC_DEFINE (Test_Resource_Factory, + ACE_TEXT ("Resource_Factory"), + ACE_SVC_OBJ_T, + &ACE_SVC_NAME (Test_Resource_Factory), + ACE_Service_Type::DELETE_THIS + | ACE_Service_Type::DELETE_OBJ, + 0) +ACE_STATIC_SVC_REQUIRE (Test_Resource_Factory); + +class Test_LF_Event: public TAO_LF_Event +{ +public: + Test_LF_Event() + {} + + void complete_event (TAO_Leader_Follower &lf) + { + if (debug) + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Completing event\n")); + this->state_changed (TAO_LF_Event::LFS_SUCCESS, lf); + } + + virtual int successful (void) const + { + return this->state_ == TAO_LF_Event::LFS_SUCCESS; + } + + virtual int error_detected (void) const + { + return (this->state_ == TAO_LF_Event::LFS_FAILURE + || this->state_ == TAO_LF_Event::LFS_TIMEOUT + || this->state_ == TAO_LF_Event::LFS_CONNECTION_CLOSED); + } +protected: + virtual void state_changed_i (int new_state) + { + this->state_ = new_state; + return; + } + + virtual int is_state_final (void) + { + if (this->state_ == TAO_LF_Event::LFS_TIMEOUT || + this->state_ == TAO_LF_Event::LFS_FAILURE) + return 1; + return 0; + } +}; + +class Test_Transport : public TAO_Transport +{ +public: + Test_Transport (CORBA::ULong tag, + TAO_ORB_Core *orb_core) + : TAO_Transport (tag, orb_core) + {} + + virtual int send_message (TAO_OutputCDR &, + TAO_Stub * = 0, + TAO_Message_Semantics = TAO_TWOWAY_REQUEST, + ACE_Time_Value * = 0) + { + return 0; + } + + virtual ssize_t send (iovec *, int , + size_t &, + const ACE_Time_Value * = 0) + { + return 0; + } + + virtual ssize_t recv (char *, + size_t, + const ACE_Time_Value * = 0) + { + return 0; + } + + virtual int messaging_init (CORBA::Octet, + CORBA::Octet) + { + return 0; + } + + virtual ACE_Event_Handler * event_handler_i (void) + { + return 0; + } + +protected: + virtual TAO_Connection_Handler * connection_handler_i (void) + { + return 0; + } + + virtual int send_request (TAO_Stub *, + TAO_ORB_Core *, + TAO_OutputCDR &, + TAO_Message_Semantics, + ACE_Time_Value *) + { + return 0; + } + +}; + +class Shutdown: public Command +{ +public: + virtual int execute (Worker* worker) + { + if (debug) + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Shutdown cmd\n")); + worker->shutdown (true); + return 0; + } + +}; + +class TSS_Assert: public Command +{ +public: + TSS_Assert (TAO_ORB_Core* orb_core, + int elt_count, + int clt_count, + bool leader_available) + : orb_core_ (orb_core), + elt_count_ (elt_count), + clt_count_ (clt_count), + leader_available_ (leader_available) + {} + + virtual int execute (Worker*) + { + if (debug) + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing TSS_Assert(%d,%d,%d) cmd\n", + elt_count_, clt_count_, leader_available_)); + TAO_Leader_Follower &leader_follower = orb_core_->leader_follower (); + TAO_ORB_Core_TSS_Resources* tss = orb_core_->get_tss_resources (); + TSS_ASSERT (tss, leader_follower, + elt_count_, clt_count_, leader_available_); + return 0; + } +private: + TAO_ORB_Core* orb_core_; + const int elt_count_; + const int clt_count_; + const bool leader_available_; +}; + +class Wait_For_Event: public Command +{ +public: + Wait_For_Event (Test_LF_Event& event, + Test_Transport& transport, + TAO_Leader_Follower& lf) + : event_ (event), + transport_ (transport), + lf_ (lf) + {} + virtual int execute (Worker*) + { + if (debug) + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing Wait_For_Event cmd\n")); + int retval = lf_.wait_for_event (&event_, &transport_, 0); + // The worker has probably been shutdown in order for the client + // leader event loop to exit - reactivate the worker so it from + // process msgs once we return + workers->shutdown (false); + return retval; + } +private: + Test_LF_Event& event_; + Test_Transport& transport_; + TAO_Leader_Follower& lf_; +}; + +class Cond_Signal: public Command +{ +public: + Cond_Signal () + : lock_ (), + cond_ (lock_), + ref_count_ (2) + {} + + virtual int execute (Worker*) + { + if (debug) + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing Cond_Signal cmd\n")); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard ,this->cond_.mutex (), 0); + return this->cond_.signal (); + } + TAO_SYNCH_MUTEX& lock () + { + return lock_; + } + ACE_Condition_Thread_Mutex& cond () + { + return cond_; + } + virtual ACE_Message_Block *release (void) + { + // we need to only release once both the main and worker thread + // are done with this object - each signals this by calling this + // method + --this->ref_count_; + if (this->ref_count_ == 0) + return ACE_Message_Block::release (); + return this; + } + +private: + TAO_SYNCH_MUTEX lock_; + ACE_Condition_Thread_Mutex cond_; + int ref_count_; +}; + +class Event_Loop_Thread: public Command +{ +public: + Event_Loop_Thread(TAO_Leader_Follower& lf, + TAO_LF_Strategy& lf_strategy) + : lf_ (lf), lf_strategy_ (lf_strategy) + {} + + virtual int execute (Worker* worker) + { + if (debug) + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing Event_Loop_Thread cmd\n")); + TAO_LF_Event_Loop_Thread_Helper elt (lf_, lf_strategy_, 0); + while (!worker->shutdown()) + worker->process_cmd (); + // The worker has been shutdown in order for this event loop + // thread to exit - reactivate the worker so it from process msgs + // once we return + worker->shutdown (false); + return 0; + } +private: + TAO_Leader_Follower& lf_; + TAO_LF_Strategy& lf_strategy_; +}; + +class Set_Upcall_Thread: public Command +{ +public: + Set_Upcall_Thread (TAO_Leader_Follower& lf) + : lf_ (lf) + {} + + virtual int execute (Worker*) + { + if (debug) + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing Set_Upcall_Thread cmd\n")); + lf_.set_upcall_thread (); + return 0; + } + +private: + TAO_Leader_Follower& lf_; +}; + +void synch_with_worker (Worker& worker) +{ + // This object is released by the worker thread after it has + // executed the cmd + Cond_Signal* cond = new Cond_Signal; + { + ACE_GUARD (TAO_SYNCH_MUTEX, guard, cond->lock ()); + worker.put (cond); + ACE_Time_Value tv (1, 0); + tv += ACE_OS::gettimeofday (); + TEST_ASSERT ((cond->cond ().wait (&tv) == 0)); + } +} + +// 1 - Simple event loop thread test +void Test_1 (TAO_ORB_Core* orb_core) +{ + TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy (); + TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); + TAO_ORB_Core_TSS_Resources* tss = orb_core->get_tss_resources (); + + ACE_DEBUG ((LM_DEBUG, "==========\n")); + ACE_DEBUG ((LM_DEBUG, "TEST #1 - Simple Event Loop call\n")); + + TSS_ASSERT (tss, leader_follower, 0, 0, false); + + std::auto_ptr<TAO_LF_Event_Loop_Thread_Helper> + elt (new TAO_LF_Event_Loop_Thread_Helper(leader_follower, + lf_strategy, + 0)); + TSS_ASSERT (tss, leader_follower, 1, 0, true); + + elt.reset (0); + TSS_ASSERT (tss, leader_follower, 0, 0, false); +} + +// 2 - Nested event loop threads - no set_upcall_thread call +void Test_2 (TAO_ORB_Core* orb_core) +{ + TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy (); + TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); + TAO_ORB_Core_TSS_Resources* tss = orb_core->get_tss_resources (); + ACE_DEBUG ((LM_DEBUG, "==========\n")); + ACE_DEBUG ((LM_DEBUG, "TEST #2 - 2 nested Event Loop calls\n")); + + TSS_ASSERT (tss, leader_follower, 0, 0, false); + + std::auto_ptr<TAO_LF_Event_Loop_Thread_Helper> + elt1 (new TAO_LF_Event_Loop_Thread_Helper(leader_follower, + lf_strategy, 0)); + TSS_ASSERT (tss, leader_follower, 1, 0, true); + + std::auto_ptr<TAO_LF_Event_Loop_Thread_Helper> + elt2 (new TAO_LF_Event_Loop_Thread_Helper(leader_follower, + lf_strategy, 0)); + TSS_ASSERT (tss, leader_follower, 2, 0, true); + + elt2.reset (0); + TSS_ASSERT (tss, leader_follower, 1, 0, true); + + elt1.reset (0); + TSS_ASSERT (tss, leader_follower, 0, 0, false); +} + +// 3 - Nested event loop threads - with set_upcall_thread call +void Test_3 (TAO_ORB_Core* orb_core) +{ + TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy (); + TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); + TAO_ORB_Core_TSS_Resources* tss = orb_core->get_tss_resources (); + ACE_DEBUG ((LM_DEBUG, "==========\n")); + ACE_DEBUG ((LM_DEBUG, "TEST #3 - 2 nested Event Loop calls with set_upcall_thread\n")); + + TSS_ASSERT (tss, leader_follower, 0, 0, false); + + std::auto_ptr<TAO_LF_Event_Loop_Thread_Helper> + elt1 (new TAO_LF_Event_Loop_Thread_Helper(leader_follower, + lf_strategy, 0)); + TSS_ASSERT (tss, leader_follower, 1, 0, true); + + leader_follower.set_upcall_thread (); + TSS_ASSERT (tss, leader_follower, 0, 0, false); + + std::auto_ptr<TAO_LF_Event_Loop_Thread_Helper> + elt2 (new TAO_LF_Event_Loop_Thread_Helper(leader_follower, + lf_strategy, 0)); + TSS_ASSERT (tss, leader_follower, 1, 0, true); + + elt2.reset (0); + TSS_ASSERT (tss, leader_follower, 0, 0, false); + + elt1.reset (0); + TSS_ASSERT (tss, leader_follower, 0, 0, false); +} + +// 4 - client leader thread +void Test_4 (TAO_ORB_Core* orb_core) +{ + TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); + ACE_DEBUG ((LM_DEBUG, "==========\n")); + ACE_DEBUG ((LM_DEBUG, "TEST #4 - Simple Client Leader thread\n")); + + // Activate a thread + Worker wrk1; + wrk1.activate (); + + // Test initial conditions + wrk1.put (new TSS_Assert(orb_core, 0, 0, false)); + + // Have the thread wait on an event + Test_LF_Event event; + Test_Transport transport (0, orb_core); + wrk1.put (new Wait_For_Event(event, transport, leader_follower)); + + // The thread is still waiting on the event and thus should + // now be a client-leader thread + wrk1.put (new TSS_Assert(orb_core, 0, 1, true)); + + // Synchronise with the thread before we complete its event + synch_with_worker (wrk1); + // Complete the event + event.complete_event (leader_follower); + + // The thread is still inside handle_events - shutdown the + // event processing + wrk1.put (new Shutdown); + + // The thread should now return from being a client leader + wrk1.put (new TSS_Assert(orb_core, 0, 0, false)); + + wrk1.put (new Shutdown); + wrk1.wait (); +} + +// 5 - nested client leader thread +void Test_5 (TAO_ORB_Core* orb_core) +{ + TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); + ACE_DEBUG ((LM_DEBUG, "==========\n")); + ACE_DEBUG ((LM_DEBUG, "TEST #5 - 2 nested Client Leader calls\n")); + + // Activate a thread + Worker wrk1; + wrk1.activate (); + + // Test initial conditions + wrk1.put (new TSS_Assert(orb_core, 0, 0, false)); + + // Have the thread wait on an event + Test_LF_Event event; + Test_Transport transport (0, orb_core); + wrk1.put (new Wait_For_Event(event, transport, leader_follower)); + + // The thread is still waiting on the event and thus should + // now be a client-leader thread + wrk1.put (new TSS_Assert(orb_core, 0, 1, true)); + + // Wait for another event + Test_LF_Event event2; + wrk1.put (new Wait_For_Event(event2, transport, leader_follower)); + + // The thread is still waiting on the event and thus should + // now be a client-leader thread + wrk1.put (new TSS_Assert(orb_core, 0, 2, true)); + + // Synchronise with the thread before we complete its event + synch_with_worker (wrk1); + + // Complete the first event - nothing should happen + event.complete_event (leader_follower); + + wrk1.put (new TSS_Assert(orb_core, 0, 2, true)); + + // Complete the second event - everything should unwind + synch_with_worker (wrk1); + event2.complete_event (leader_follower); + + // The thread is still inside handle_events - shutdown the + // event processing for the inner client leader + wrk1.put (new Shutdown); + + wrk1.put (new TSS_Assert(orb_core, 0, 1, true)); + + // The thread is now in the handle_events for the outter + // client-leader - the event is already complete so just + // shutdown the cmd processing. + wrk1.put (new Shutdown); + + // We should now we back at our initial state. + wrk1.put (new TSS_Assert(orb_core, 0, 0, false)); + + wrk1.put (new Shutdown); + wrk1.wait (); +} + +// 6 - nested client leader thread with set_upcall_thread +void Test_6 (TAO_ORB_Core* orb_core) +{ + TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); + ACE_DEBUG ((LM_DEBUG, "==========\n")); + ACE_DEBUG ((LM_DEBUG, "TEST #6 - 2 nested Client Leader calls with set_upcall_thread\n")); + + // Activate a thread + Worker wrk1; + wrk1.activate (); + + // Test initial conditions + wrk1.put (new TSS_Assert(orb_core, 0, 0, false)); + + // Have the thread wait on an event + Test_LF_Event event; + Test_Transport transport (0, orb_core); + wrk1.put (new Wait_For_Event(event, transport, leader_follower)); + + // The thread is still waiting on the event and thus should + // now be a client-leader thread + wrk1.put (new TSS_Assert(orb_core, 0, 1, true)); + + // Call set_upcall_thread + wrk1.put (new Set_Upcall_Thread (leader_follower)); + wrk1.put (new TSS_Assert(orb_core, 0, 0, false)); + + // Wait for another event + Test_LF_Event event2; + wrk1.put (new Wait_For_Event(event2, transport, leader_follower)); + + // The thread is still waiting on the event and thus should + // now be a client-leader thread + wrk1.put (new TSS_Assert(orb_core, 0, 1, true)); + + // Synchronise with the thread before we complete its event + synch_with_worker (wrk1); + + // Complete the first event - nothing should happen + event.complete_event (leader_follower); + + wrk1.put (new TSS_Assert(orb_core, 0, 1, true)); + + // Complete the second event - everything should unwind + synch_with_worker (wrk1); + event2.complete_event (leader_follower); + + // The thread is still inside handle_events - shutdown the + // event processing for the inner client leader + wrk1.put (new Shutdown); + + wrk1.put (new TSS_Assert(orb_core, 0, 0, false)); + + // The thread is now in the handle_events for the outter + // client-leader - the event is already complete so just + // shutdown the cmd processing. + wrk1.put (new Shutdown); + + // We should now we back at our initial state. + wrk1.put (new TSS_Assert(orb_core, 0, 0, false)); + + wrk1.put (new Shutdown); + wrk1.wait (); +} + +// 7 - 2 client leader threads with set_upcall_thread +void Test_7 (TAO_ORB_Core* orb_core) +{ + TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); + ACE_DEBUG ((LM_DEBUG, "==========\n")); + ACE_DEBUG ((LM_DEBUG, "TEST #7 - Client Leader yields to another client thread\n")); + + // Activate a thread + Worker wrk1; + wrk1.activate (); + + // Test initial conditions + wrk1.put (new TSS_Assert(orb_core, 0, 0, false)); + + // Have the thread wait on an event + Test_LF_Event event; + Test_Transport transport (0, orb_core); + wrk1.put (new Wait_For_Event(event, transport, leader_follower)); + + // The thread is still waiting on the event and thus should + // now be a client-leader thread + wrk1.put (new TSS_Assert(orb_core, 0, 1, true)); + // Wait for the firs thread to be the client leader before we start + // the second thread + synch_with_worker (wrk1); + + // Create another worker and have it do the same + Worker wrk2; + wrk2.activate (); + wrk2.put (new TSS_Assert(orb_core, 0, 0, true)); + // Make sure this test is complete before the Set_Upcall_Thread below + synch_with_worker (wrk2); + Test_LF_Event event2; + wrk2.put (new Wait_For_Event(event2, transport, leader_follower)); + // Note, we can't test the new thread here - it is block waiting on + // the follower cond var + // wrk2.put (new TSS_Assert(orb_core, 0, 1, true)); + + // Call set_upcall_thread on the first thread + wrk1.put (new Set_Upcall_Thread (leader_follower)); + // Our second thread should now be the client leader and the first + // thread should not. Note, we need to first synchronise with + // thread 2 (to make sure it is in handle_events) to avoid race + // conditions. + synch_with_worker (wrk2); + wrk2.put (new TSS_Assert(orb_core, 0, 1, true)); + wrk1.put (new TSS_Assert(orb_core, 0, 0, true)); + + // We should now be able to shutdown the first thread - have it + // return from handle_events and complete its event. If it has to + // wait it will just go back to being a follower + wrk1.put (new Shutdown); + event.complete_event (leader_follower); + synch_with_worker (wrk1); + wrk1.put (new TSS_Assert(orb_core, 0, 0, true)); + // We can now shut-down the thread + wrk1.put (new Shutdown); + wrk1.wait (); + + // Now shut-down the second thread + event2.complete_event (leader_follower); + wrk2.put (new Shutdown); + synch_with_worker (wrk2); + wrk2.put (new TSS_Assert(orb_core, 0, 0, false)); + wrk2.put (new Shutdown); + wrk2.wait (); +} + +// 8 - client becomes leader when event loop thread dispatched +void Test_8 (TAO_ORB_Core* orb_core) +{ + TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy (); + TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); + ACE_DEBUG ((LM_DEBUG, "==========\n")); + ACE_DEBUG ((LM_DEBUG, "TEST #8 - client becomes leader when event thread dispatched\n")); + + // Activate a thread + Worker wrk1; + wrk1.activate (); + + // Test initial conditions + wrk1.put (new TSS_Assert(orb_core, 0, 0, false)); + + // Have the thread become an event loop thread + wrk1.put (new Event_Loop_Thread (leader_follower, + lf_strategy)); + wrk1.put (new TSS_Assert(orb_core, 1, 0, true)); + + // Before we start the next thread synchronise with the first + synch_with_worker (wrk1); + + // Start another thread and have it wait on an event + Worker wrk2; + wrk2.activate (); + wrk2.put (new TSS_Assert(orb_core, 0, 0, true)); + Test_LF_Event event; + Test_Transport transport (0, orb_core); + synch_with_worker (wrk2); + wrk2.put (new Wait_For_Event(event, transport, leader_follower)); + + // The new thread is a follower and thus is waiting on the follower + // cond var - we can't test this other than to check if the leader + // follower has clients, however, because we can't synchronise with + // that thread such a test would contain a race condition. + + // Now dispatch the event loop thread by having it call set_upcall_thread + wrk1.put (new Set_Upcall_Thread (leader_follower)); + + // the first worker should have given up leadership and the second + // thread should have assumed leadership. We have to synchronise + // with both threads before we can test anything, otherwise we could + // catch the window where there is no leader. + synch_with_worker (wrk1); + synch_with_worker (wrk2); + wrk1.put (new TSS_Assert (orb_core, 0, 0, true)); + wrk2.put (new TSS_Assert (orb_core, 0, 1, true)); + + // OK, now shut everything down - first the event loop thread + wrk1.put (new Shutdown); + wrk1.put (new TSS_Assert (orb_core, 0, 0, true)); + wrk1.put (new Shutdown); + wrk1.wait (); + + // Now the client thread + wrk2.put (new TSS_Assert (orb_core, 0, 1, true)); + synch_with_worker (wrk2); + event.complete_event (leader_follower); + wrk2.put (new Shutdown); + wrk2.put (new TSS_Assert (orb_core, 0, 0, false)); + wrk2.put (new Shutdown); + wrk2.wait (); +} + +// 9 - client leader thread then event loop thread +void Test_9 (TAO_ORB_Core* orb_core) +{ + TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy (); + TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); + ACE_DEBUG ((LM_DEBUG, "==========\n")); + ACE_DEBUG ((LM_DEBUG, "TEST #9 - Client Leader thread yields to Event Loop thread\n")); + + // Activate a thread + Worker wrk1; + wrk1.activate (); + + // Test initial conditions + wrk1.put (new TSS_Assert(orb_core, 0, 0, false)); + + // Have the thread wait on an event + Test_LF_Event event; + Test_Transport transport (0, orb_core); + wrk1.put (new Wait_For_Event(event, transport, leader_follower)); + + // The thread is still waiting on the event and thus should + // now be a client-leader thread + wrk1.put (new TSS_Assert(orb_core, 0, 1, true)); + // We now need to synchronise with the worker, to make sure it + // has processed all the cmds we have sent it + synch_with_worker (wrk1); + + // create an event loop thread - this means a new worker + Worker wrk2; + wrk2.activate (); + wrk2.put (new Event_Loop_Thread (leader_follower, + lf_strategy)); + + // Unfortunately there is no way to test if the event loop thread is + // where we expect it to be (the + // wait_for_client_leader_to_complete() method). The only thing we + // could check is the event_loop_threads_waiting_ count, however, + // that is private to the TAO_Leader_Follower class. + + // We need to get the client leader thread to return from + // process_cmd() and allow it to surrender leadership to the waiting + // event loop thread - send it a shutdown. The TAO_Leader_Follower + // code may call handle_events a few more times, however, since the + // cmd processing is shutdown (and won't be reactivated until the + // event is complete) handle_events will just return. + wrk1.put (new Shutdown); + + // Now test the new event loop thread + wrk2.put (new TSS_Assert(orb_core, 1, 0, true)); + // Wait until the event loop thread is running before we test + // the client thread + synch_with_worker (wrk2); + + // We can't test the client thread either - it is blocked in a call + // to the event's cond var's wait() method. All we can do is + // complete the event, which will signal the cond var + event.complete_event (leader_follower); + + // The client thread should return from wait_for_event + wrk1.put (new TSS_Assert(orb_core, 0, 0, true)); + // And the event loop thread should still be 'running' + wrk2.put (new TSS_Assert(orb_core, 1, 0, true)); + + // Some other misc checks + synch_with_worker (wrk1); + TEST_ASSERT ((leader_follower.has_clients () == 0)); + + // OK, lets shut everything down now - the event loop thread + // requires two shutdown cmds, one to exit the event loop thread cmd + // and the second to exit the main cmd processor + wrk2.put (new Shutdown); + // Incidently there is now no leader + wrk2.put (new TSS_Assert(orb_core, 0, 0, false)); + wrk2.put (new Shutdown); + wrk2.wait (); + + // Shutdown the other worker + wrk1.put (new Shutdown); + wrk1.wait (); +} + +// 10 - ET1437460 (second problem) +void Test_10 (TAO_ORB_Core* orb_core ) +{ + TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy (); + TAO_Leader_Follower &leader_follower = orb_core->leader_follower (); + ACE_DEBUG ((LM_DEBUG, "==========\n")); + ACE_DEBUG ((LM_DEBUG, "TEST #10 - ET1437460\n")); + + // This scenario involves: + // - an event loop thread + // - which calls set_upcall_thread + // - then becomes a client leader + // - is dispatched and then becomes a client leader again + // (without calling set_upcall_thread) + // - calls set_upcall_thread + // - unwinds + + // Originally this caused the leaders_ member to get set to -1 + // (the inner client leader still decremented leaders_ even + // though set_upcall_thread was called) + + // Activate a thread + Worker wrk1; + wrk1.activate (); + + // Test initial conditions + wrk1.put (new TSS_Assert(orb_core, 0, 0, false)); + + // Have the thread become an event loop thread + wrk1.put (new Event_Loop_Thread (leader_follower, + lf_strategy)); + + // The thread should be an event loop thread + wrk1.put (new TSS_Assert(orb_core, 1, 0, true)); + + // call set_upcall_thread + wrk1.put (new Set_Upcall_Thread (leader_follower)); + + // The thread should no longer be an event loop thread + wrk1.put (new TSS_Assert(orb_core, 0, 0, false)); + + // Have the thread wait on an event + Test_LF_Event event; + Test_Transport transport (0, orb_core); + wrk1.put (new Wait_For_Event(event, transport, leader_follower)); + + // The thread is still waiting on the event and thus should + // now be a client-leader thread + wrk1.put (new TSS_Assert(orb_core, 0, 1, true)); + + // Have the thread wait on another event + Test_LF_Event event2; + wrk1.put (new Wait_For_Event(event2, transport, leader_follower)); + + // The thread is still waiting on the event and thus should now be a + // client-leader thread (again) + wrk1.put (new TSS_Assert(orb_core, 0, 2, true)); + + // Call set_upcall_thread + wrk1.put (new Set_Upcall_Thread(leader_follower)); + + // We now need to synchronise with the worker, to make sure it + // has processed all the cmds we have sent it + synch_with_worker (wrk1); + + // Now, complete the events, and then shutdown the cmd event loop + event.complete_event (leader_follower); + event2.complete_event (leader_follower); + wrk1.put (new Shutdown); + + // The inner client has returned + wrk1.put (new TSS_Assert(orb_core, 0, 1, true)); + + // Shutdown the outter client thread + wrk1.put (new Shutdown); + + // We should be back to the initial state + wrk1.put (new TSS_Assert(orb_core, 0, 0, false)); + + // Now shutdown the event loop thread + wrk1.put (new Shutdown); + wrk1.put (new TSS_Assert(orb_core, 0, 0, false)); + + // Shutdown the other worker + wrk1.put (new Shutdown); + wrk1.wait (); +} + + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + try + { + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + if (parse_args (argc, argv) != 0) + return 1; + + // First we need to replace the resource factory in the ORB_Core + // to our test version, which will return our special test + // reactor to the Leader_Follower object. + ACE_STATIC_SVC_REGISTER (Test_Resource_Factory); + + orb->orb_core ()->set_resource_factory ("Test_Resource_Factory"); + + // Make sure the reactor is initialised in the leader_follower + ACE_Reactor* reactor = orb->orb_core ()->leader_follower ().reactor (); + TEST_ASSERT ((reactor != 0)); + + // Ready to go + Test_1 (orb->orb_core ()); + Test_2 (orb->orb_core ()); + Test_3 (orb->orb_core ()); + Test_4 (orb->orb_core ()); + Test_5 (orb->orb_core ()); + Test_6 (orb->orb_core ()); + Test_7 (orb->orb_core ()); + Test_8 (orb->orb_core ()); + Test_9 (orb->orb_core ()); + Test_10 (orb->orb_core ()); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing complete.\n"))); + + // cleanup + orb->destroy (); + } + catch (CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + return 1; + } + + return 0; +} + +// **************************************************************** diff --git a/tests/Bug_3542_Regression/DllOrb.cpp b/tests/Bug_3542_Regression/DllOrb.cpp index 016ce3747b3..3db4aeac4d4 100644 --- a/tests/Bug_3542_Regression/DllOrb.cpp +++ b/tests/Bug_3542_Regression/DllOrb.cpp @@ -6,7 +6,6 @@ #include "ace/OS_NS_unistd.h" #include "tao/TAO_Singleton_Manager.h" - DllOrb::DllOrb (void) : ma_barrier_(), @@ -15,12 +14,10 @@ DllOrb::DllOrb (void) { } - DllOrb::~DllOrb (void) { } - int DllOrb::init (int argc, ACE_TCHAR *argv[]) { @@ -44,8 +41,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[]) } // Initialize the ORB - ACE_Argv_Type_Converter argcon (argc, argv); - mv_orb_ = CORBA::ORB_init (argcon.get_argc (), argcon.get_ASCII_argv ()); + mv_orb_ = CORBA::ORB_init (argc, argv); if (CORBA::is_nil (mv_orb_.in ())) { ACE_DEBUG ((LM_ERROR, ACE_TEXT ("nil ORB\n"))); diff --git a/tests/Bug_3542_Regression/server.cpp b/tests/Bug_3542_Regression/server.cpp index f660feaf1f3..88ec7288fe0 100644 --- a/tests/Bug_3542_Regression/server.cpp +++ b/tests/Bug_3542_Regression/server.cpp @@ -1,13 +1,11 @@ // $Id$ #include "ace/ARGV.h" -#include "ace/OS.h" #include "ace/Reactor.h" #include "ace/Signal.h" #include "ace/Service_Config.h" #include "ace/Log_Msg.h" - ACE_TCHAR const * const scpc_loadOrb = ACE_DYNAMIC_SERVICE_DIRECTIVE( "testDllOrb", "Bug_3542", diff --git a/tests/Bug_3543_Regression/README.txt b/tests/Bug_3543_Regression/README.txt index 15da44fb5b0..0f6c6b7bc78 100644 --- a/tests/Bug_3543_Regression/README.txt +++ b/tests/Bug_3543_Regression/README.txt @@ -1,7 +1,7 @@ $Id$ This test is a reproducer for bug 3543. The master starts and waits until all servers -have registered. Then master starts pinging all the servers with 10 threads. At that +have registered. Then master starts pinging all the servers with 10 threads. At that moment multiple threads are waiting for the same connection to a specific server. We observed at that moment that in TAO_Transport::register_if_necessary the check for is_registered returns false, then we get a thread switch and another thread then diff --git a/tests/Bug_3543_Regression/master.cpp b/tests/Bug_3543_Regression/master.cpp index 05b6c3da3b6..41fbd1e74ce 100644 --- a/tests/Bug_3543_Regression/master.cpp +++ b/tests/Bug_3543_Regression/master.cpp @@ -46,7 +46,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/tests/Bug_3543_Regression/server.cpp b/tests/Bug_3543_Regression/server.cpp index 499a924da35..48407d00ea6 100644 --- a/tests/Bug_3543_Regression/server.cpp +++ b/tests/Bug_3543_Regression/server.cpp @@ -28,7 +28,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/tests/Bug_3552_Regression/check.cpp b/tests/Bug_3552_Regression/check.cpp index f1b4496375a..457f54f2b52 100644 --- a/tests/Bug_3552_Regression/check.cpp +++ b/tests/Bug_3552_Regression/check.cpp @@ -3,10 +3,6 @@ #include "tao/CodecFactory/CodecFactory.h" #include "structC.h" -ACE_RCSID (Recursive, - client, - "$Id$") - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp b/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp index 4e8556742ed..1067653093e 100644 --- a/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp +++ b/tests/Bug_3553_Regression/Bug_3553_Regression_client.cpp @@ -6,8 +6,6 @@ #include "tao/Policy_Current.h" #include "ace/Get_Opt.h" -ACE_RCSID(TransportCache, client, "$Id$") - int cache_size = 512; int port_nr = 27530; @@ -37,7 +35,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/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp b/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp index 4341198321e..29f7a7e345f 100644 --- a/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp +++ b/tests/Bug_3553_Regression/Bug_3553_Regression_server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "tao/IORTable/IORTable.h" -ACE_RCSID (Hello, - server, - "$Id$") - int cache_size = 512; int diff --git a/tests/Bug_3553_Regression/Hello.cpp b/tests/Bug_3553_Regression/Hello.cpp index df5dc90d3d9..0f62f20b906 100644 --- a/tests/Bug_3553_Regression/Hello.cpp +++ b/tests/Bug_3553_Regression/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_3553_Regression/run_test.pl b/tests/Bug_3553_Regression/run_test.pl index 1a8599748b6..fb3f7a003bd 100755 --- a/tests/Bug_3553_Regression/run_test.pl +++ b/tests/Bug_3553_Regression/run_test.pl @@ -32,9 +32,9 @@ my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 fail my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-c $cache_size -ORBdebuglevel $debug_level -ORBListenEndpoints iiop://localhost:$port"); -$CL = $client->CreateProcess ("client", +$CL = $client->CreateProcess ("client", "-c $cache_size -p $port -ORBdebuglevel $debug_level"); $server_status = $SV->Spawn (); diff --git a/tests/Bug_3558_Regression/Hello.cpp b/tests/Bug_3558_Regression/Hello.cpp index ec8f6d2e485..54b23b5d560 100644 --- a/tests/Bug_3558_Regression/Hello.cpp +++ b/tests/Bug_3558_Regression/Hello.cpp @@ -4,8 +4,6 @@ #include "Hello.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_3558_Regression/Makefile.am b/tests/Bug_3558_Regression/Makefile.am deleted file mode 100644 index a0e2286e095..00000000000 --- a/tests/Bug_3558_Regression/Makefile.am +++ /dev/null @@ -1,105 +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.Hello_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 -Sp $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Hello_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 \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Hello_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_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/Bug_3558_Regression/client.cpp b/tests/Bug_3558_Regression/client.cpp index 42c66a099f6..5ab6c0afd0c 100644 --- a/tests/Bug_3558_Regression/client.cpp +++ b/tests/Bug_3558_Regression/client.cpp @@ -11,10 +11,6 @@ #include "tao/Transport_Cache_Manager.h" #include "tao/Thread_Lane_Resources.h" - - -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior1 = ACE_TEXT ("file://server1.ior"); const ACE_TCHAR *ior2 = ACE_TEXT ("file://server2.ior"); @@ -53,7 +49,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/tests/Bug_3558_Regression/server.cpp b/tests/Bug_3558_Regression/server.cpp index 97455f4ef9b..77c03392be7 100644 --- a/tests/Bug_3558_Regression/server.cpp +++ b/tests/Bug_3558_Regression/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id: ") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior"); int @@ -32,7 +28,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/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp b/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp index 4d1cd6b3688..039c71fbbbf 100644 --- a/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp +++ b/tests/Bug_3559_Regression/Bug_3559_Regression_Test.cpp @@ -6,13 +6,8 @@ #include "ace/OS_NS_stdio.h" #include "ace/ACE.h" -ACE_RCSID (Bug_3559_Regression, - server, - "$Id$") - const ACE_TCHAR* log_file_; - int parse_args (int argc, ACE_TCHAR* argv[]) { @@ -203,15 +198,15 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ex._tao_print_exception ("Exception caught:"); return 1; } - + result += check_logging (); - + if (result == 0) - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Test passed!"))); else - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Test failed. Result: %d\n"), + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Test failed. Result: %d\n"), result)); return result; } diff --git a/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp b/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp index 87e751f9887..377812a55bc 100644 --- a/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp +++ b/tests/Bug_3565_Regression/Bug_3565_Regression_Test.cpp @@ -8,10 +8,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/ACE.h" -ACE_RCSID (Bug_3559_Regression, - server, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/tests/Bug_3566_Regression/Bug_3566_Regression_Test.cpp b/tests/Bug_3566_Regression/Bug_3566_Regression_Test.cpp index 183e2ac7132..dec2418d9c2 100644 --- a/tests/Bug_3566_Regression/Bug_3566_Regression_Test.cpp +++ b/tests/Bug_3566_Regression/Bug_3566_Regression_Test.cpp @@ -8,10 +8,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/ACE.h" -ACE_RCSID (Bug_3566_Regression, - server, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/tests/Bug_3567_Regression/ami_test_i.cpp b/tests/Bug_3567_Regression/ami_test_i.cpp index 212a4a819b3..c2f5f3bf243 100644 --- a/tests/Bug_3567_Regression/ami_test_i.cpp +++ b/tests/Bug_3567_Regression/ami_test_i.cpp @@ -18,8 +18,6 @@ #include "tao/debug.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(AMI, ami_test_i, "$Id$") - AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb, CORBA::Long in_l, const char * in_str, diff --git a/tests/Bug_3567_Regression/client.cpp b/tests/Bug_3567_Regression/client.cpp index 188a2de3914..a3e7f9b8d02 100644 --- a/tests/Bug_3567_Regression/client.cpp +++ b/tests/Bug_3567_Regression/client.cpp @@ -15,10 +15,6 @@ #include "ace/OS_NS_unistd.h" #include "ami_test_i.h" -ACE_RCSID (AMI, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 5; int niterations = 10; @@ -62,18 +58,17 @@ 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; } +/** + * Run a server thread + * + * Use the ACE_Task_Base class to run server threads + */ class Worker : public ACE_Task_Base { - // = TITLE - // Run a server thread - // - // = DESCRIPTION - // Use the ACE_Task_Base class to run server threads - // public: Worker (CORBA::ORB_ptr orb); // ctor diff --git a/tests/Bug_3567_Regression/server.cpp b/tests/Bug_3567_Regression/server.cpp index 50e1fa3ac85..cdcc3991947 100644 --- a/tests/Bug_3567_Regression/server.cpp +++ b/tests/Bug_3567_Regression/server.cpp @@ -20,19 +20,16 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(AMI, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int nthreads = 5; +/** + * Run a server thread + * + * Use the ACE_Task_Base class to run server threads + */ class Worker : public ACE_Task_Base { - // = TITLE - // Run a server thread - // - // = DESCRIPTION - // Use the ACE_Task_Base class to run server threads - // public: Worker (CORBA::ORB_ptr orb); // ctor @@ -69,7 +66,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/tests/Bug_3598a_Regression/Hello.cpp b/tests/Bug_3598a_Regression/Hello.cpp index 7b9497529ec..4c72b17a7c6 100644 --- a/tests/Bug_3598a_Regression/Hello.cpp +++ b/tests/Bug_3598a_Regression/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "Hello.cpp,v 1.3 2002/01/29 20:21:07 okellogg Exp") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_3598a_Regression/client.cpp b/tests/Bug_3598a_Regression/client.cpp index 1eb9ffec04b..741c038e94f 100644 --- a/tests/Bug_3598a_Regression/client.cpp +++ b/tests/Bug_3598a_Regression/client.cpp @@ -8,8 +8,6 @@ #include "tao/Strategies/advanced_resource.h" #include "tao/Strategies/OC_Endpoint_Selector_Loader.h" -ACE_RCSID(Hello, client, "client.cpp,v 1.5 2002/01/29 20:21:07 okellogg Exp") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int @@ -34,7 +32,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/tests/Bug_3598a_Regression/server.cpp b/tests/Bug_3598a_Regression/server.cpp index 95d61429e99..2017e62d471 100644 --- a/tests/Bug_3598a_Regression/server.cpp +++ b/tests/Bug_3598a_Regression/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +28,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/tests/Bug_3598a_Regression/svc.conf b/tests/Bug_3598a_Regression/svc.conf index 75b92f3c589..320c5e26391 100644 --- a/tests/Bug_3598a_Regression/svc.conf +++ b/tests/Bug_3598a_Regression/svc.conf @@ -1 +1,3 @@ +# $Id$ + static OC_Endpoint_Selector_Factory "-connect_timeout 1300" diff --git a/tests/Bug_3630_Regression/TAO Conf File.conf b/tests/Bug_3630_Regression/TAO Conf File.conf index d02ffc26c2b..62ed5a70626 100644 --- a/tests/Bug_3630_Regression/TAO Conf File.conf +++ b/tests/Bug_3630_Regression/TAO Conf File.conf @@ -1 +1,3 @@ +# $Id$ + static Server_Strategy_Factory "-ORBConcurrency thread-per-connection" diff --git a/tests/Bug_3630_Regression/TAO_Conf_File.conf b/tests/Bug_3630_Regression/TAO_Conf_File.conf index d02ffc26c2b..62ed5a70626 100644 --- a/tests/Bug_3630_Regression/TAO_Conf_File.conf +++ b/tests/Bug_3630_Regression/TAO_Conf_File.conf @@ -1 +1,3 @@ +# $Id$ + static Server_Strategy_Factory "-ORBConcurrency thread-per-connection" diff --git a/tests/Bug_3632_Regression/Bug_3632_Regression.mpc b/tests/Bug_3632_Regression/Bug_3632_Regression.mpc index fb8d07ee600..9729ceb7f7d 100644 --- a/tests/Bug_3632_Regression/Bug_3632_Regression.mpc +++ b/tests/Bug_3632_Regression/Bug_3632_Regression.mpc @@ -9,6 +9,7 @@ project(*idl): taoidldefaults { } project(*test): taoclient { + after += *idl Source_Files { test.cpp testC.cpp diff --git a/tests/Bug_3636_Regression/Hello.cpp b/tests/Bug_3636_Regression/Hello.cpp index df5dc90d3d9..0f62f20b906 100644 --- a/tests/Bug_3636_Regression/Hello.cpp +++ b/tests/Bug_3636_Regression/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_3636_Regression/client.cpp b/tests/Bug_3636_Regression/client.cpp index d1f53d7502e..07255c9e341 100644 --- a/tests/Bug_3636_Regression/client.cpp +++ b/tests/Bug_3636_Regression/client.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int diff --git a/tests/Bug_3636_Regression/server.cpp b/tests/Bug_3636_Regression/server.cpp index 601e72a15ea..1b45c1db07a 100644 --- a/tests/Bug_3636_Regression/server.cpp +++ b/tests/Bug_3636_Regression/server.cpp @@ -5,10 +5,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/Log_Msg.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int @@ -33,7 +29,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/tests/Bug_3647_Regression/Backend_Impl.cpp b/tests/Bug_3647_Regression/Backend_Impl.cpp index d3752c32b41..9bbd6a5fc6d 100644 --- a/tests/Bug_3647_Regression/Backend_Impl.cpp +++ b/tests/Bug_3647_Regression/Backend_Impl.cpp @@ -1,7 +1,8 @@ -#include "Backend_Impl.h" -#include "ace/OS.h" +// -*- C++ -*- +// $Id$ -ACE_RCSID(Bug_3647_Regression, Backend_Impl, "$Id$") +#include "Backend_Impl.h" +#include "ace/OS_NS_unistd.h" Bug_3647_Regression::Backend_Impl:: Backend_Impl(CORBA::ORB_ptr orb, bool verbose) diff --git a/tests/Bug_3647_Regression/Middle_Impl.cpp b/tests/Bug_3647_Regression/Middle_Impl.cpp index 4a5fa30195d..1caa26c9e72 100644 --- a/tests/Bug_3647_Regression/Middle_Impl.cpp +++ b/tests/Bug_3647_Regression/Middle_Impl.cpp @@ -1,6 +1,7 @@ -#include "Middle_Impl.h" +// -*- C++ -*- +// $Id$ -ACE_RCSID(Bug_3647_Regression, Middle_Impl, "$Id$") +#include "Middle_Impl.h" Bug_3647_Regression::Middle_Impl:: Middle_Impl( @@ -34,14 +35,14 @@ startup_test() { ACE_DEBUG ((LM_INFO, "Middle_Impl::startup_test(%P|%t) - backend " - "startup call sucessful\n")); + "startup call successful\n")); } backend_->freeze(10); if (verbose_) { ACE_DEBUG ((LM_INFO, "Middle_Impl::startup_test(%P|%t) - backend " - "freeze call sucessful\n")); + "freeze call successful\n")); } } diff --git a/tests/Bug_3647_Regression/Test.idl b/tests/Bug_3647_Regression/Test.idl index e8fc5efdfdf..3aeaab4f7fb 100644 --- a/tests/Bug_3647_Regression/Test.idl +++ b/tests/Bug_3647_Regression/Test.idl @@ -14,7 +14,7 @@ module Bug_3647_Regression { typedef sequence<octet> Payload; - + interface Backend { /// This operation is called during the startup, to make sure all diff --git a/tests/Bug_3647_Regression/backend_server.cpp b/tests/Bug_3647_Regression/backend_server.cpp index 974686b3025..fa06b75a0a3 100644 --- a/tests/Bug_3647_Regression/backend_server.cpp +++ b/tests/Bug_3647_Regression/backend_server.cpp @@ -1,17 +1,11 @@ +// -*- C++ -*- // $Id$ #include "Backend_Impl.h" - #include "tao/Strategies/advanced_resource.h" - -#include "tao/Utils/Servant_Var.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Bug_3647_Regression, - backend_server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("backend.ior"); bool verbose = false; @@ -41,7 +35,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; } @@ -72,7 +66,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 1; using namespace Bug_3647_Regression; - TAO::Utils::Servant_Var<Backend_Impl> impl( + PortableServer::ServantBase_var impl( new Backend_Impl(orb.in(), verbose)); PortableServer::ObjectId_var id = diff --git a/tests/Bug_3647_Regression/client.cpp b/tests/Bug_3647_Regression/client.cpp index 993a1a76ec6..373bd1f36d7 100644 --- a/tests/Bug_3647_Regression/client.cpp +++ b/tests/Bug_3647_Regression/client.cpp @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ #include "TestC.h" @@ -7,10 +8,6 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" -ACE_RCSID(Bug_3647_Regression, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://middle.ior"); bool verbose = true; long timeout = 2; @@ -69,7 +66,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) timeout = tmp; } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Bug_3647_Regression/middle_server.cpp b/tests/Bug_3647_Regression/middle_server.cpp index 23a03de8eeb..23f29e825db 100644 --- a/tests/Bug_3647_Regression/middle_server.cpp +++ b/tests/Bug_3647_Regression/middle_server.cpp @@ -1,9 +1,9 @@ +// -*- C++ -*- // $Id$ #include "Middle_Impl.h" #include "tao/Utils/PolicyList_Destroyer.h" -#include "tao/Utils/Servant_Var.h" #include "tao/Utils/RIR_Narrow.h" #include "tao/Strategies/advanced_resource.h" #include "tao/Messaging/Messaging.h" @@ -11,10 +11,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Bug_3647_Regression, - middle_server, - "$Id$") - bool verbose = false; const ACE_TCHAR *ior_output_file = ACE_TEXT ("middle.ior"); const ACE_TCHAR *ior = ACE_TEXT ("file://backend.ior"); @@ -101,7 +97,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) timeout = tmp; } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } @@ -172,7 +168,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } using namespace Bug_3647_Regression; - TAO::Utils::Servant_Var<Middle_Impl> impl( + PortableServer::ServantBase_var impl( new Middle_Impl(backend.in(), orb.in(), verbose, timeout)); diff --git a/tests/Bug_3647_Regression/svc.conf b/tests/Bug_3647_Regression/svc.conf index b3efd649ff2..38a55ae3039 100644 --- a/tests/Bug_3647_Regression/svc.conf +++ b/tests/Bug_3647_Regression/svc.conf @@ -2,5 +2,3 @@ # $Id$ # static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null" -static Server_Strategy_Factory "-ORBPOALock null" -static Client_Strategy_Factory "-ORBProfileLock null" diff --git a/tests/Bug_3672_Regression/ami_test_i.cpp b/tests/Bug_3672_Regression/ami_test_i.cpp index 156756b90a9..9b77796e863 100644 --- a/tests/Bug_3672_Regression/ami_test_i.cpp +++ b/tests/Bug_3672_Regression/ami_test_i.cpp @@ -18,8 +18,6 @@ #include "tao/debug.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(AMI, ami_test_i, "$Id$") - AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_3672_Regression/client.cpp b/tests/Bug_3672_Regression/client.cpp index bb3b4ff2bb5..8a530fef2f8 100644 --- a/tests/Bug_3672_Regression/client.cpp +++ b/tests/Bug_3672_Regression/client.cpp @@ -16,7 +16,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ami_test_i.h" -#include "tao/ORB_Core.h" +#include "tao/ORB_Core.h" const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 1; @@ -61,7 +61,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; } @@ -81,7 +81,7 @@ public: /// The thread entry point. virtual int svc (void); - + /// Set all members to nil void clear (); @@ -102,7 +102,7 @@ public: Handler (void) { }; - + void foo (CORBA::Long result, CORBA::Long out_l) { @@ -253,7 +253,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->destroy (); CORBA::ULong ref_count = orb->_refcount(); - + if (ref_count > 1) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Refcount orb %d\n"), ref_count)); @@ -274,7 +274,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ex._tao_print_exception ("Caught exception:"); return 1; - + } return parameter_corruption; diff --git a/tests/Bug_3672_Regression/server.cpp b/tests/Bug_3672_Regression/server.cpp index 456eceb946e..18d23928d5c 100644 --- a/tests/Bug_3672_Regression/server.cpp +++ b/tests/Bug_3672_Regression/server.cpp @@ -19,8 +19,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" -ACE_RCSID(AMI, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int @@ -47,7 +45,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/tests/Bug_3674_Regression/test.cpp b/tests/Bug_3674_Regression/test.cpp index d506290225f..20d27ee5858 100644 --- a/tests/Bug_3674_Regression/test.cpp +++ b/tests/Bug_3674_Regression/test.cpp @@ -8,10 +8,6 @@ #include "testS.h" -ACE_RCSID (PICurrent, - test, - "test.cpp,v 1.7 2003/11/01 11:15:11 dhinton Exp") - #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) diff --git a/tests/Bug_3676_Regression/Hello.cpp b/tests/Bug_3676_Regression/Hello.cpp index df5dc90d3d9..0f62f20b906 100644 --- a/tests/Bug_3676_Regression/Hello.cpp +++ b/tests/Bug_3676_Regression/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_3676_Regression/client.cpp b/tests/Bug_3676_Regression/client.cpp index 4009d9b2e13..cb20eaaf8d4 100644 --- a/tests/Bug_3676_Regression/client.cpp +++ b/tests/Bug_3676_Regression/client.cpp @@ -6,8 +6,6 @@ #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int @@ -32,7 +30,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/tests/Bug_3676_Regression/server.cpp b/tests/Bug_3676_Regression/server.cpp index cacd790a6ff..205a7c179e0 100644 --- a/tests/Bug_3676_Regression/server.cpp +++ b/tests/Bug_3676_Regression/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int @@ -32,7 +28,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/tests/Bug_3683_Regression/Echo_Client_i.h b/tests/Bug_3683_Regression/Echo_Client_i.h index 2ca50272169..df2d4496a5d 100644 --- a/tests/Bug_3683_Regression/Echo_Client_i.h +++ b/tests/Bug_3683_Regression/Echo_Client_i.h @@ -1,22 +1,18 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Simple/echo -// -// = FILENAME -// Echo_Client_i.h -// -// = DESCRIPTION -// This class implements the interface calls for RMI. -// -// = AUTHOR -// -// Balachandran Natarajan <bala@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file Echo_Client_i.h + * + * $Id$ + * + * This class implements the interface calls for RMI. + * + * + * @author Balachandran Natarajan <bala@cs.wustl.edu> + */ +//============================================================================= + #ifndef ECHO_CLIENT_I_H #define ECHO_CLIENT_I_H @@ -24,30 +20,32 @@ #include "Simple_util.h" #include "EchoC.h" +/** + * @class Echo_Client_i + * + * @brief Echo_Client interface subclass. + * + * This class implements the interface between the interface + * objects and the client . + */ class Echo_Client_i { - // = TITLE - // Echo_Client interface subclass. - // - // = DESCRIPTION - // This class implements the interface between the interface - // objects and the client . public: // = Initialization and termination methods. + /// Constructor Echo_Client_i (void); - // Constructor + /// Destructor ~Echo_Client_i (void); - // Destructor + /// Execute the methods int run (const char *, int, ACE_TCHAR **); - // Execute the methods private: int parse_args (int argc, ACE_TCHAR *argv[]); + /// Instantiate the client object. Client<Echo> client_; - // Instantiate the client object. size_t payload_length_; }; diff --git a/tests/Bug_3683_Regression/Echo_i.cpp b/tests/Bug_3683_Regression/Echo_i.cpp index 9bb628c8707..f3e45069e40 100644 --- a/tests/Bug_3683_Regression/Echo_i.cpp +++ b/tests/Bug_3683_Regression/Echo_i.cpp @@ -2,8 +2,6 @@ #include "Echo_i.h" -ACE_RCSID(Echo, Echo_i, "$Id$") - // Constructor. Echo_i::Echo_i (void) diff --git a/tests/Bug_3683_Regression/Echo_i.h b/tests/Bug_3683_Regression/Echo_i.h index b048eeb8357..5afd29de0b1 100644 --- a/tests/Bug_3683_Regression/Echo_i.h +++ b/tests/Bug_3683_Regression/Echo_i.h @@ -1,63 +1,62 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Simple/echo -// -// = FILENAME -// Echo_i.h -// -// = DESCRIPTION -// This class implements the Echo IDL interface. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file Echo_i.h + * + * $Id$ + * + * This class implements the Echo IDL interface. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + #ifndef ECHO_I_H #define ECHO_I_H #include "EchoS.h" +/** + * @class Echo_i + * + * @brief Echo Object Implementation + * + * The object implementation performs teh following functions: + * -- To return the string which needs to be displayed + * from the server. + * -- shuts down the server + */ class Echo_i : public POA_Echo { - // = TITLE - // Echo Object Implementation - // - // = DESCRIPTION - // The object implementation performs teh following functions: - // -- To return the string which needs to be displayed - // from the server. - // -- shuts down the server public: // = Initialization and termination methods. + /// Constructor. Echo_i (void); - // Constructor. + /// Destructor. virtual ~Echo_i (void); - // Destructor. + /// Return the mesg string back from the server. virtual Echo::List *echo_list (const char *mesg); - // Return the mesg string back from the server. + /// Return the mesg string back from the server. virtual char *echo_string (const char *mesg); - // Return the mesg string back from the server. + /// Shutdown the server. virtual void shutdown (void); - // Shutdown the server. + /// Set the ORB pointer. void orb (CORBA::ORB_ptr o); - // Set the ORB pointer. private: + /// ORB pointer. CORBA::ORB_var orb_; - // ORB pointer. + /// Keeping g++ 2.7.2 happy.. ACE_UNIMPLEMENTED_FUNC (void operator= (const Echo_i&)) - // Keeping g++ 2.7.2 happy.. }; #endif /* ECHO_I_H */ diff --git a/tests/Bug_3683_Regression/Simple_util.h b/tests/Bug_3683_Regression/Simple_util.h index a5b2bd8304f..ccee51b7aa6 100644 --- a/tests/Bug_3683_Regression/Simple_util.h +++ b/tests/Bug_3683_Regression/Simple_util.h @@ -1,20 +1,16 @@ -//$Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Simple -// -// = FILENAME -// Simple_Util.h -// -// = DESCRIPTION -// The classe define the templates for the client and server. -// -// = AUTHOR -// Balachandran Natarajan <bala@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file Simple_util.h + * + * $Id$ + * + * The classe define the templates for the client and server. + * + * @author Balachandran Natarajan <bala@cs.wustl.edu> + */ +//============================================================================= + #ifndef TAO_UTIL_H #define TAO_UTIL_H @@ -24,101 +20,105 @@ #include "ace/Read_Buffer.h" #include "tao/Intrusive_Ref_Count_Handle_T.h" +/** + * @class Server + * + * @brief A set of useful class Templates for using the TAO CORBA + * implementation. + * + * A template server definition. This template can be used by + * single server/client projects for defintion of their + * server/clients. See the directories time, bank, echo for + * further details of implemenatation. + */ template <class Servant> class Server { - // = TITLE - // A set of useful class Templates for using the TAO CORBA - // implementation. - // - // = DESCRIPTION - // A template server definition. This template can be used by - // single server/client projects for defintion of their - // server/clients. See the directories time, bank, echo for - // further details of implemenatation. public: // = Initialization and termination methods. + /// Constructor. Server (void); - // Constructor. + /// Destructor. ~Server (void); - // Destructor. + /// Initialize the Server state - parsing arguments and waiting. + /// interface_name is the name used to register the Servant. int init (const char *servant_name, int argc, ACE_TCHAR *argv[]); - // Initialize the Server state - parsing arguments and waiting. - // interface_name is the name used to register the Servant. + /// Run the orb. int run (void); - // Run the orb. + /// Ignore this method if you are not testing the InterOperable + /// Naming Service. int test_for_ins (const char *ior); - // Ignore this method if you are not testing the InterOperable - // Naming Service. private: + /// Parses the commandline arguments. int parse_args (void); - // Parses the commandline arguments. + /// A holder of the servant that does ref counting for him. typedef TAO_Intrusive_Ref_Count_Handle<Servant> Servant_var; Servant_var servant_; - // A holder of the servant that does ref counting for him. + /// The ORB manager - a helper class for accessing the POA and + /// registering objects. TAO_ORB_Manager orb_manager_; - // The ORB manager - a helper class for accessing the POA and - // registering objects. + /// File where the IOR of the server object is stored. ACE_TCHAR *ior_output_file_; - // File where the IOR of the server object is stored. + /// Flag to indicate whether naming service could be used int naming_; - // Flag to indicate whether naming service could be used + /// Used test the INS. ACE_TCHAR *ins_; - // Used test the INS. + /// Number of command line arguments. int argc_; - // Number of command line arguments. + /// The command line arguments. ACE_TCHAR **argv_; - // The command line arguments. }; +/** + * @class Client + * + * @brief Template Client class + * + * A template client implementation for a single server/client + * model. The example usage of these usage can be found in the + * sub-directories below + */ template <class ServerInterface> class Client { - // = TITLE - // Template Client class - // - // = DESCRIPTION - // A template client implementation for a single server/client - // model. The example usage of these usage can be found in the - // sub-directories below public: // = Initialization and termination methods. + /// Constructor. Client (void); - // Constructor. + /// Destructor. ~Client (void); - // Destructor. + /// Initialize the client communication endpoint with server. int init (const char *name, int argc, ACE_TCHAR *argv[]); - // Initialize the client communication endpoint with server. + /// Return the interface object pointer. ServerInterface *operator-> () { return server_.in (); } - // Return the interface object pointer. + /// Returns the shutdown flag. int do_shutdown (void); - // Returns the shutdown flag. + /// Fills in the shutdwon flag. void do_shutdown (int); - // Fills in the shutdwon flag. + /// Initialize naming service int obtain_initial_references (const char *name); - // Initialize naming service CORBA::ORB_ptr orb (void) { @@ -126,33 +126,33 @@ public: } private: + /// Function to read the server IOR from a file. int read_ior (ACE_TCHAR *filename); - // Function to read the server IOR from a file. + /// Parses the arguments passed on the command line. int parse_args (void); - // Parses the arguments passed on the command line. + /// Remember our orb. CORBA::ORB_var orb_; - // Remember our orb. + /// # of arguments on the command line. int argc_; - // # of arguments on the command line. + /// arguments from command line. ACE_TCHAR **argv_; - // arguments from command line. + /// IOR of the obj ref of the server. ACE_CString ior_; - // IOR of the obj ref of the server. + /// Server object typedef TAO_Intrusive_Ref_Count_Handle<ServerInterface> ServerInterface_var; ServerInterface_var server_; - // Server object + /// Flag to use the naming service int naming_; - // Flag to use the naming service + /// Flag for shutting down the server int do_shutdown_; - // Flag for shutting down the server }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/tests/Bug_3683_Regression/svc.conf b/tests/Bug_3683_Regression/svc.conf index def545d4845..50836f1ec51 100644 --- a/tests/Bug_3683_Regression/svc.conf +++ b/tests/Bug_3683_Regression/svc.conf @@ -1,3 +1,5 @@ +# $Id$ + static Resource_Factory "-ORBFlushingStrategy blocking" static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW" diff --git a/tests/Bug_3695_Regression/Bug_3695.cpp b/tests/Bug_3695_Regression/Bug_3695.cpp index 2d6e49eb0af..3d1ee4218f5 100644 --- a/tests/Bug_3695_Regression/Bug_3695.cpp +++ b/tests/Bug_3695_Regression/Bug_3695.cpp @@ -18,7 +18,7 @@ struct IIOP_Profile_var explicit IIOP_Profile_var (TAO_IIOP_Profile *pro) : pro_ (pro) {} - + ~IIOP_Profile_var () { this->pro_->_decr_refcnt (); diff --git a/tests/Bug_3701_Regression/client.cpp b/tests/Bug_3701_Regression/client.cpp index bcaafc79f4a..a3cea619961 100644 --- a/tests/Bug_3701_Regression/client.cpp +++ b/tests/Bug_3701_Regression/client.cpp @@ -2,8 +2,6 @@ #include "tao/SystemException.h" -ACE_RCSID(Hello, client, "$Id$") - int ACE_TMAIN(int, ACE_TCHAR *[]) { diff --git a/tests/Bug_3746_Regression/Test.idl b/tests/Bug_3746_Regression/Test.idl index df0af811264..c566d5e04e0 100644 --- a/tests/Bug_3746_Regression/Test.idl +++ b/tests/Bug_3746_Regression/Test.idl @@ -9,7 +9,7 @@ module Test interface BoundSequences { typedef sequence<long, 10> SequenceOf10Long; - unsigned long SendSequenceOf10Long (in unsigned long LengthSent, in SequenceOf10Long inSeq); + unsigned long SendSequenceOf10Long (in unsigned long LengthSent, in SequenceOf10Long inSeq); /// A method to shutdown the ORB /** diff --git a/tests/Bug_3746_Regression/Test_i.cpp b/tests/Bug_3746_Regression/Test_i.cpp index 684b38099e8..35280a77139 100644 --- a/tests/Bug_3746_Regression/Test_i.cpp +++ b/tests/Bug_3746_Regression/Test_i.cpp @@ -3,10 +3,6 @@ // #include "Test_i.h" -ACE_RCSID(TestLargeSequence, - TestLargeSequence, - "$Id$") - BoundSequences::BoundSequences (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_3746_Regression/client.cpp b/tests/Bug_3746_Regression/client.cpp index 9093c0fa7bb..75df0ef04eb 100644 --- a/tests/Bug_3746_Regression/client.cpp +++ b/tests/Bug_3746_Regression/client.cpp @@ -3,10 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Bug_3746_Regression, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int @@ -29,7 +25,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/tests/Bug_3746_Regression/server.cpp b/tests/Bug_3746_Regression/server.cpp index c6f2435e88e..3d1d8ef00f8 100644 --- a/tests/Bug_3746_Regression/server.cpp +++ b/tests/Bug_3746_Regression/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Bug_3746_Regression, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int @@ -34,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Bug_3748_Regression/Hello.cpp b/tests/Bug_3748_Regression/Hello.cpp index df5dc90d3d9..0f62f20b906 100644 --- a/tests/Bug_3748_Regression/Hello.cpp +++ b/tests/Bug_3748_Regression/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_3748_Regression/Makefile.am b/tests/Bug_3748_Regression/Makefile.am deleted file mode 100644 index b75b16b2db8..00000000000 --- a/tests/Bug_3748_Regression/Makefile.am +++ /dev/null @@ -1,107 +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.Hello_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 -Sp $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Hello_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 \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Hello_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - Server_ORBInitializer.cpp \ - Test_Protocols_Hooks.cpp \ - server.cpp \ - Hello.h - -server_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/Bug_3748_Regression/Server_ORBInitializer.cpp b/tests/Bug_3748_Regression/Server_ORBInitializer.cpp index 1b36e3681df..78f25fc1357 100644 --- a/tests/Bug_3748_Regression/Server_ORBInitializer.cpp +++ b/tests/Bug_3748_Regression/Server_ORBInitializer.cpp @@ -8,10 +8,6 @@ #include "tao/ORB_Core.h" #include "tao/PI/ORBInitInfo.h" -ACE_RCSID (Bug_3748_Regression, - Server_ORBInitializer, - "$Id$") - Server_ORBInitializer::Server_ORBInitializer (void) { } diff --git a/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp b/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp index 549f696ee66..61a1e53f32d 100644 --- a/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp +++ b/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp @@ -6,10 +6,6 @@ #include "Test_Protocols_Hooks.h" #include "TestC.h" -ACE_RCSID (Test, - Test_Protocols_Hooks, - "$Id$") - Test_Protocols_Hooks::Test_Protocols_Hooks (void) : failure_count_ (0) { diff --git a/tests/Bug_3748_Regression/client.cpp b/tests/Bug_3748_Regression/client.cpp index ae5452bb14a..1742dd08168 100644 --- a/tests/Bug_3748_Regression/client.cpp +++ b/tests/Bug_3748_Regression/client.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int diff --git a/tests/Bug_3748_Regression/server.cpp b/tests/Bug_3748_Regression/server.cpp index d52ccb88b43..45229e6a070 100644 --- a/tests/Bug_3748_Regression/server.cpp +++ b/tests/Bug_3748_Regression/server.cpp @@ -6,10 +6,6 @@ #include "ace/OS_NS_stdio.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int @@ -33,7 +29,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/tests/Bug_3755_Ext_Regression/common.cpp b/tests/Bug_3755_Ext_Regression/common.cpp index 91241f3934d..b02ac88377b 100644 --- a/tests/Bug_3755_Ext_Regression/common.cpp +++ b/tests/Bug_3755_Ext_Regression/common.cpp @@ -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/tests/Bug_3755_Ext_Regression/dp_svc.conf b/tests/Bug_3755_Ext_Regression/dp_svc.conf index 00dd44148e4..aefa8cd4b83 100644 --- a/tests/Bug_3755_Ext_Regression/dp_svc.conf +++ b/tests/Bug_3755_Ext_Regression/dp_svc.conf @@ -1,3 +1,3 @@ # $Id$ -dynamic My_Loader Service_Object *TAO_DiffservPolicy:_make_TAO_DiffServPolicy_Initializer() "" +dynamic My_Loader Service_Object *TAO_DiffServPolicy:_make_TAO_DiffServPolicy_Initializer() "" diff --git a/tests/Bug_3755_Ext_Regression/run_test.pl b/tests/Bug_3755_Ext_Regression/run_test.pl index db6aa704d5c..2533c1d054a 100755 --- a/tests/Bug_3755_Ext_Regression/run_test.pl +++ b/tests/Bug_3755_Ext_Regression/run_test.pl @@ -10,6 +10,10 @@ use PerlACE::TestTarget; $status = 0; $debug_level = '0'; +$rt = 0; +$rtsched = 0; +$endpoint = 0; +$diffserv = 0; $bidir = 0; $messaging = 0; $csd = 0; @@ -18,6 +22,14 @@ $ziop = 0; foreach $i (@ARGV) { if ($i eq '-debug') { $debug_level = '10'; + } elsif ($i eq '-rt') { + $rt = 1; + } elsif ($i eq '-rtsched') { + $rtsched = 1; + } elsif ($i eq '-endpoint') { + $endpoint = 1; + } elsif ($i eq '-diffserv') { + $diffserv = 1; } elsif ($i eq '-bidir') { $bidir = 1; } elsif ($i eq '-messaging') { @@ -59,13 +71,25 @@ sub run_one_test { # Common tests. my @svcs = ( ["PI_Server", "pi_server_svc.conf", "pi_server_svc.conf"], - ["RTCORBA", "rt_svc.conf", "rt_svc.conf"], - ["RTScheduler", "rt_scheduler_svc.conf", "rt_scheduler_svc.conf"], - ["EndpointPolicy", "ep_svc.conf", "ep_svc.conf"], - ["DiffservPolicy", "dp_svc.conf", "dp_svc.conf"] ); -if ($bidir) { +if ($rt) { + @svcs = ( + ["RTCORBA", "rt_svc.conf", "rt_svc.conf"], + ); +} elsif ($rtsched) { + @svcs = ( + ["RTScheduler", "rt_scheduler_svc.conf", "rt_scheduler_svc.conf"], + ); +} elsif ($endpoint) { + @svcs = ( + ["EndpointPolicy", "ep_svc.conf", "ep_svc.conf"], + ); +} elsif ($diffserv) { + @svcs = ( + ["DiffServPolicy", "dp_svc.conf", "dp_svc.conf"] + ); +} elsif ($bidir) { @svcs = ( ["BiDir_GIOP", "bidir_svc.conf", "bidir_svc.conf"], ); diff --git a/tests/Bug_3755_Regression/server.cpp b/tests/Bug_3755_Regression/server.cpp index e884078b3bf..692792be9b5 100644 --- a/tests/Bug_3755_Regression/server.cpp +++ b/tests/Bug_3755_Regression/server.cpp @@ -45,7 +45,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/tests/Bug_3766_Regression/TestI.cpp b/tests/Bug_3766_Regression/TestI.cpp index 918bf39de15..9042e5fc0ed 100644 --- a/tests/Bug_3766_Regression/TestI.cpp +++ b/tests/Bug_3766_Regression/TestI.cpp @@ -27,7 +27,7 @@ * http://www.cs.wustl.edu/~schmidt/TAO.html **/ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // .\be\be_codegen.cpp:1422 #include "TestI.h" diff --git a/tests/Bug_3766_Regression/TestI.h b/tests/Bug_3766_Regression/TestI.h index 67e1a28be35..e3a4e5bf79c 100644 --- a/tests/Bug_3766_Regression/TestI.h +++ b/tests/Bug_3766_Regression/TestI.h @@ -27,7 +27,7 @@ * http://www.cs.wustl.edu/~schmidt/TAO.html **/ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // .\be\be_codegen.cpp:1364 #ifndef TESTI_H_ @@ -43,16 +43,16 @@ class Test_i : public virtual POA_Test { public: - // Constructor + // Constructor Test_i (CORBA::ORB_ptr o); - - // Destructor + + // Destructor virtual ~Test_i (void); - + virtual void do_something_FixedLength ( ::FixedLengthInfo_out my_info); - + virtual void do_something_VariableLength ( ::VariableLengthInfo_out my_info); diff --git a/tests/Bug_3766_Regression/client.cpp b/tests/Bug_3766_Regression/client.cpp index c1690c24f22..0999ff151a5 100644 --- a/tests/Bug_3766_Regression/client.cpp +++ b/tests/Bug_3766_Regression/client.cpp @@ -1,7 +1,6 @@ // $Id$ #include "TestC.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); diff --git a/tests/Bug_3766_Regression/server.cpp b/tests/Bug_3766_Regression/server.cpp index f724fa9bcf3..aaeece0c1f0 100644 --- a/tests/Bug_3766_Regression/server.cpp +++ b/tests/Bug_3766_Regression/server.cpp @@ -1,7 +1,6 @@ // $Id$ #include "TestI.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); @@ -28,7 +27,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/tests/Bug_3790_Regression/server.cpp b/tests/Bug_3790_Regression/server.cpp index 763e91666fa..321f89d50de 100644 --- a/tests/Bug_3790_Regression/server.cpp +++ b/tests/Bug_3790_Regression/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int @@ -32,7 +28,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/tests/Bug_3790_Regression/server2.cpp b/tests/Bug_3790_Regression/server2.cpp index 1920024f0bc..c5aa3b8fd39 100644 --- a/tests/Bug_3790_Regression/server2.cpp +++ b/tests/Bug_3790_Regression/server2.cpp @@ -38,7 +38,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/tests/Bug_3801_Regression/Makefile.am b/tests/Bug_3801_Regression/Makefile.am deleted file mode 100644 index 56fad7dc3e7..00000000000 --- a/tests/Bug_3801_Regression/Makefile.am +++ /dev/null @@ -1,166 +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.AMI_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -CLEANFILES = \ - ami_test-stamp \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp - -ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl - @touch $@ - -noinst_HEADERS = \ - ami_test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.AMI_Client.am - -if BUILD_AMI -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 = \ - ami_testC.cpp \ - ami_testS.cpp \ - client.cpp \ - ami_test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.AMI_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - ami_testC.cpp \ - ami_testS.cpp \ - ami_test_i.cpp \ - server.cpp \ - ami_test_i.h - -server_LDADD = \ - $(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_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 -endif BUILD_AMI - -## Makefile.AMI_Simple_Client.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += simple_client - -simple_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -simple_client_SOURCES = \ - ami_testC.cpp \ - ami_testS.cpp \ - simple_client.cpp \ - ami_test_i.h - -simple_client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## 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/Bug_3801_Regression/ami_test.idl b/tests/Bug_3801_Regression/ami_test.idl index be446bc290b..9b24ec68d59 100644 --- a/tests/Bug_3801_Regression/ami_test.idl +++ b/tests/Bug_3801_Regression/ami_test.idl @@ -36,7 +36,7 @@ module A raises (DidTheRightThing); oneway void shutdown (); - + void inout_arg_test (inout string str); }; }; diff --git a/tests/Bug_3801_Regression/ami_test_i.cpp b/tests/Bug_3801_Regression/ami_test_i.cpp index d03bec106b8..d58451eb346 100644 --- a/tests/Bug_3801_Regression/ami_test_i.cpp +++ b/tests/Bug_3801_Regression/ami_test_i.cpp @@ -17,8 +17,6 @@ #include "ami_test_i.h" #include "tao/debug.h" -ACE_RCSID(AMI, ami_test_i, "$Id$") - AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_3801_Regression/exclusive.conf b/tests/Bug_3801_Regression/exclusive.conf index b269154099f..e03ea06380b 100644 --- a/tests/Bug_3801_Regression/exclusive.conf +++ b/tests/Bug_3801_Regression/exclusive.conf @@ -1,2 +1,3 @@ +# $Id$ -static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBclientconnectionhandler ST" +static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler ST" diff --git a/tests/Bug_3801_Regression/exclusive.conf.xml b/tests/Bug_3801_Regression/exclusive.conf.xml index 6724ae56996..33db7f50d83 100644 --- a/tests/Bug_3801_Regression/exclusive.conf.xml +++ b/tests/Bug_3801_Regression/exclusive.conf.xml @@ -1,5 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/AMI/exclusive.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBclientconnectionhandler ST"/> + <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler ST"/> </ACE_Svc_Conf> diff --git a/tests/Bug_3801_Regression/muxed.conf b/tests/Bug_3801_Regression/muxed.conf index a7f2f5f608a..117767bce28 100644 --- a/tests/Bug_3801_Regression/muxed.conf +++ b/tests/Bug_3801_Regression/muxed.conf @@ -1,2 +1,3 @@ +# $Id$ -static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED -ORBProfileLock null -ORBClientConnectionHandler ST" +static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED -ORBClientConnectionHandler ST" diff --git a/tests/Bug_3801_Regression/muxed.conf.xml b/tests/Bug_3801_Regression/muxed.conf.xml index 812cb7376db..cf063034ce0 100644 --- a/tests/Bug_3801_Regression/muxed.conf.xml +++ b/tests/Bug_3801_Regression/muxed.conf.xml @@ -1,5 +1,5 @@ <?xml version='1.0'?> <!-- Converted from ./tests/AMI/muxed.conf by svcconf-convert.pl --> <ACE_Svc_Conf> - <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED -ORBProfileLock null -ORBClientConnectionHandler ST"/> + <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy MUXED -ORBClientConnectionHandler ST"/> </ACE_Svc_Conf> diff --git a/tests/Bug_3801_Regression/server.cpp b/tests/Bug_3801_Regression/server.cpp index 456eceb946e..18d23928d5c 100644 --- a/tests/Bug_3801_Regression/server.cpp +++ b/tests/Bug_3801_Regression/server.cpp @@ -19,8 +19,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" -ACE_RCSID(AMI, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int @@ -47,7 +45,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/tests/Bug_3801_Regression/simple_client.cpp b/tests/Bug_3801_Regression/simple_client.cpp index ba7b75e8634..b91b1602926 100644 --- a/tests/Bug_3801_Regression/simple_client.cpp +++ b/tests/Bug_3801_Regression/simple_client.cpp @@ -19,10 +19,6 @@ #include "ami_testS.h" -ACE_RCSID (AMI, - simple_client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int shutdown_flag = 0; int debug = 0; @@ -56,7 +52,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; } @@ -74,7 +70,7 @@ public: ACE_ERROR ((LM_ERROR, "Error: Callback method <get_yadda> called: result <%d>\n", result)); - result = 1; + result = 1; }; void get_yadda_excep (::Messaging::ExceptionHolder *excep_holder) @@ -116,7 +112,7 @@ public: { ACE_ERROR ((LM_ERROR, "Error: Callback method <set_yadda> called:\n")); - result = 1; + result = 1; }; void set_yadda_excep (::Messaging::ExceptionHolder *excep_holder) @@ -159,7 +155,7 @@ public: ACE_ERROR ((LM_ERROR, "Error: Callback method <get_dadda> called: result <%d>\n", result)); - result = 1; + result = 1; }; void get_dadda_excep (::Messaging::ExceptionHolder *excep_holder) @@ -271,7 +267,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } CORBA::String_var mystring = CORBA::string_dup ("Hello"); - + ami_test_var->inout_arg_test (mystring.inout ()); if (shutdown_flag) diff --git a/tests/Bug_3812_Regression/Bug_3812_Regression.cpp b/tests/Bug_3812_Regression/Bug_3812_Regression.cpp deleted file mode 100644 index e485f7447a6..00000000000 --- a/tests/Bug_3812_Regression/Bug_3812_Regression.cpp +++ /dev/null @@ -1,132 +0,0 @@ -// $Id$ -#include "ace/Get_Opt.h" -#include "ace/Argv_Type_Converter.h" -#include "ace/SString.h" -#include "ace/Manual_Event.h" -#include "ace/Task.h" -#include "ace/OS.h" - -#include "tao/Transport_Cache_Manager_T.h" -#include "tao/ORB.h" -#include "tao/Condition.h" - -class mock_transport; -class mock_tdi; -class mock_ps; - -static int global_purged_count = 0; - -#include "mock_tdi.h" -#include "mock_transport.h" -#include "mock_ps.h" - -static TCM* tcm = 0; -static int result = 0; -static TAO_SYNCH_MUTEX test_lock; -static TAO_Condition<TAO_SYNCH_MUTEX> test_condition(test_lock); -static int n_threads = 1; - -int -parse_args (int argc, ACE_TCHAR *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("t:")); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 't': - n_threads = ACE_OS::atoi(get_opts.opt_arg()); - break; - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-t <n_threads>" - "\n", - argv [0]), - -1); - } - // Indicates sucessful parsing of the command line - return 0; -} - -class Client_Task : public ACE_Task_Base -{ - public : - Client_Task (mock_tdi& tdi, mock_transport& trans) - : tdi_ (tdi), - trans_ (trans) - { - } - - - ~Client_Task () {}; - - void process_listen_point () - { - this->trans_.purge_entry (); - // Allocate a new char to avoid the cache_transport malloc/free entry - // on same address which makes it harder to verify test result. - char*x = new char[1]; - tcm->cache_transport (&tdi_, &trans_); - this->trans_.make_idle(); - delete x; - } - - int svc () - { - ACE_Guard<TAO_SYNCH_MUTEX> lock (test_lock); - process_listen_point (); - test_condition.signal (); - return 0; - }; - - - private: - mock_tdi& tdi_; - mock_transport& trans_; -}; - - - - -int -ACE_TMAIN(int argc, ACE_TCHAR *argv[]) -{ - try - { - // We need an ORB to get an ORB core - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - - if (parse_args (argc, argv) != 0) - return 1; - - size_t const transport_max = 10; - int cache_maximum = 10; - int purging_percentage = 20; - mock_transport mytransport(orb->orb_core ()); - mock_tdi mytdi; - mock_ps* myps = new mock_ps(1); - TCM my_cache (purging_percentage, myps, cache_maximum, false, 0); - - tcm = &my_cache; - tcm->cache_transport (&mytdi, &mytransport); - - Client_Task client_task(mytdi, mytransport); - if (client_task.activate (THR_NEW_LWP | THR_JOINABLE, 2, 1) == -1) - { - ACE_ERROR ((LM_ERROR, "Error activating client task\n")); - } - - client_task.wait (); - - orb->destroy (); - - } - catch (const CORBA::Exception&) - { - // Ignore exceptions.. - } - return result; -} diff --git a/tests/Bug_3812_Regression/Makefile.am b/tests/Bug_3812_Regression/Makefile.am deleted file mode 100755 index ec325af2e83..00000000000 --- a/tests/Bug_3812_Regression/Makefile.am +++ /dev/null @@ -1,72 +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: -## C:\OCI\TAO\doc\ACE\bin\mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.TCM_Bug_3549_Regression.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += Bug_3549_Regression - -Bug_3549_Regression_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Bug_3549_Regression_SOURCES = \ - Bug_3549_Regression.cpp \ - mock_ps.h \ - mock_tdi.h \ - mock_transport.h - -Bug_3549_Regression_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.TCM_Bug_3558_Regression.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += Bug_3558_Regression - -Bug_3558_Regression_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Bug_3558_Regression_SOURCES = \ - Bug_3558_Regression.cpp \ - mock_ps.h \ - mock_tdi.h \ - mock_transport.h - -Bug_3558_Regression_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/Bug_3812_Regression/mock_ps.h b/tests/Bug_3812_Regression/mock_ps.h deleted file mode 100644 index 6c6631d8c07..00000000000 --- a/tests/Bug_3812_Regression/mock_ps.h +++ /dev/null @@ -1,13 +0,0 @@ -// $Id$ - -class mock_ps -{ -public: - mock_ps (int max) : maximum_ (max) {} - void update_item (mock_transport*) {} - int cache_maximum () { return this->maximum_;} -private: - int maximum_; -}; - - diff --git a/tests/Bug_3812_Regression/mock_tdi.h b/tests/Bug_3812_Regression/mock_tdi.h deleted file mode 100644 index 341b9b31626..00000000000 --- a/tests/Bug_3812_Regression/mock_tdi.h +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ - -class mock_tdi -{ -public: - mock_tdi () {} - u_long hash (void) {return static_cast<u_long> (reinterpret_cast<ptrdiff_t> (this));} - mock_tdi *duplicate (void) {return 0;} - CORBA::Boolean is_equivalent (const mock_tdi *) {return true;} - -}; - diff --git a/tests/Bug_3812_Regression/mock_transport.h b/tests/Bug_3812_Regression/mock_transport.h deleted file mode 100644 index 5101d883f2b..00000000000 --- a/tests/Bug_3812_Regression/mock_transport.h +++ /dev/null @@ -1,125 +0,0 @@ -// $Id$ - -#include "tao/ORB_Core.h" - -typedef TAO::Transport_Cache_Manager_T<mock_transport, mock_tdi, mock_ps> TCM; - -extern TCM* tcm; -extern int result; -extern TAO_SYNCH_MUTEX test_lock; -extern TAO_Condition<TAO_SYNCH_MUTEX> test_condition; - - -class mock_transport -{ -public: - mock_transport (TAO_ORB_Core *orb_core) - : id_(0) - , is_connected_(false) - , entry_(0) - , purging_order_ (0) - , purged_count_ (0) - , handler_lock_ (orb_core->resource_factory ()->create_cached_connection_lock ()) - {} - - size_t id (void) const {return id_;} - void id (size_t id) { this->id_ = id;} - unsigned long purging_order (void) const {return purging_order_;} - void purging_order (unsigned long purging_order) { this->purging_order_ = purging_order;} - bool is_connected (void) const {return is_connected_;} - void is_connected (bool is_connected) { this->is_connected_ = is_connected;} - ACE_Event_Handler::Reference_Count add_reference (void) {return 0;} - ACE_Event_Handler::Reference_Count remove_reference (void) {return 0;} - - // Implementation needs be similar to TAO_Transport::cache_map_entry(). - void cache_map_entry (TCM::HASH_MAP_ENTRY *entry) { - ACE_GUARD (ACE_Lock, ace_mon, *this->handler_lock_); - ACE_DEBUG ((LM_DEBUG, "(%P|%t)cache_map_entry %X\n", entry)); - this->entry_ = entry; - } - TCM::HASH_MAP_ENTRY *cache_map_entry (void) {return this->entry_;} - void close_connection (void) { purged_count_ = ++global_purged_count;}; - int purged_count (void) { return this->purged_count_;} - bool can_be_purged (void) { return true;} - - // Implementation needs be similar to TAO_Transport::purge_entry(). - int purge_entry (void) - { - TCM::HASH_MAP_ENTRY* entry = 0; - { - ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1); - ACE_DEBUG ((LM_DEBUG, "(%P|%t)purge_entry %X\n", this->entry_)); - entry = this->entry_; - this->entry_ = 0; - } - return tcm->purge_entry (entry); - } - - // Implementation needs be similar to TAO_Transport::make_idle(). - // - // int - // TAO_Transport::make_idle (void) - // { - // if (TAO_debug_level > 3) - // { - // ACE_DEBUG ((LM_DEBUG, - // ACE_TEXT ("TAO (%P|%t) - Transport[%d]::make_idle\n"), - // this->id ())); - // } - // - // return this->transport_cache_manager ().make_idle (this->cache_map_entry_); - // } - - // Code are added to simulate the situation that the cached entry pointer passed - // to TCM to make entry idle is deleted by another thread b/c of re-cache transport - // and cause TCM make idle on an invalid entry. Otherwise we need delay and similar - // code in TCM::make_idl() to reproduce the problem. - - int make_idle (void) - { - static bool is_first = true; - - ACE_DEBUG ((LM_DEBUG, "(%P|%t)make_idle pass entry %X\n", this->entry_)); - - TCM::HASH_MAP_ENTRY* entry = this->entry_; - - // The first thread comes to this point, record the entry - // and wait for second thread to process listen point which - // re-cache transport. - if (is_first) - { - is_first = false; - test_condition.wait (); - } - - ACE_DEBUG ((LM_DEBUG, "(%P|%t)make_idle execute on entry %X and now entry %X\n", - entry, this->entry_)); - - // When the first thread is at this point, the entry is - // deleted by second thread, so make idle on the invalid - // entry cause SEGV. It's possible that the memory is still - // available then next checking if entry is changed should - // confirm if the entry is valid or not. - int ret = tcm->make_idle (entry); - if (entry != this->entry_) - { - ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t)ERROR: Entry was changed ") - ACE_TEXT ("after passing to TCM and before calling make_idl.\n"))); - result = 1; - } - - return ret; - } - - -private: - size_t id_; - bool is_connected_; - TCM::HASH_MAP_ENTRY *entry_; - unsigned long purging_order_; - /// When did we got purged - int purged_count_; - mutable ACE_Lock *handler_lock_; -}; - - diff --git a/tests/Bug_3812_Regression/run_test.pl b/tests/Bug_3812_Regression/run_test.pl deleted file mode 100755 index 231ddcd7576..00000000000 --- a/tests/Bug_3812_Regression/run_test.pl +++ /dev/null @@ -1,37 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::TestTarget; -use strict; - -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib "$ENV{ACE_ROOT}/bin"; -use PerlACE::TestTarget; - -my $status = 0; -my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; -my $P = $server->CreateProcess ("Bug_3812_Regression"); -print "Running Bug_3812_Regression ...\n"; -my $result = $P->Spawn (); -if ($result != 0) { - print "test FAILED\n"; - $status = 1; -} -$result = $P->WaitKill(100*$server->ProcessStartWaitInterval()); -if ($result != 0) { - print "test FAILED\n"; - $status = 1; -} - -exit $status; diff --git a/tests/Bug_3821_Regression/test.cpp b/tests/Bug_3821_Regression/test.cpp index bd24defe508..fb63782b2cc 100644 --- a/tests/Bug_3821_Regression/test.cpp +++ b/tests/Bug_3821_Regression/test.cpp @@ -3,10 +3,6 @@ #include "testC.h" #include "tao/CDR.h" -ACE_RCSID(Test, - test, - "$Id$") - namespace { template<typename T> diff --git a/tests/Bug_3826_Regression/server.cpp b/tests/Bug_3826_Regression/server.cpp index 2c0a1c33360..012ab8304cf 100644 --- a/tests/Bug_3826_Regression/server.cpp +++ b/tests/Bug_3826_Regression/server.cpp @@ -41,7 +41,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/tests/Bug_3837_Regression/Hello.cpp b/tests/Bug_3837_Regression/Hello.cpp index df5dc90d3d9..0f62f20b906 100644 --- a/tests/Bug_3837_Regression/Hello.cpp +++ b/tests/Bug_3837_Regression/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Bug_3837_Regression/client.cpp b/tests/Bug_3837_Regression/client.cpp index 106d1e5a879..21984fb845a 100644 --- a/tests/Bug_3837_Regression/client.cpp +++ b/tests/Bug_3837_Regression/client.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int @@ -30,7 +28,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/tests/Bug_3837_Regression/logger.conf b/tests/Bug_3837_Regression/logger.conf index acf197284a0..f5b9a410471 100644 --- a/tests/Bug_3837_Regression/logger.conf +++ b/tests/Bug_3837_Regression/logger.conf @@ -1 +1,3 @@ +# $Id$ + dynamic Logger Service_Object * ACE:_make_ACE_Logging_Strategy() "-s log.out -f STDERR|OSTREAM -m 1 -i 1 -N 4 -w" diff --git a/tests/Bug_3837_Regression/server.cpp b/tests/Bug_3837_Regression/server.cpp index bf7ae83a9c4..beb88556a6c 100644 --- a/tests/Bug_3837_Regression/server.cpp +++ b/tests/Bug_3837_Regression/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int @@ -32,7 +28,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/tests/Bug_3853_Regression/Client_ORBInitializer.cpp b/tests/Bug_3853_Regression/Client_ORBInitializer.cpp index db0e3fc7cf0..3d6c5915bd6 100644 --- a/tests/Bug_3853_Regression/Client_ORBInitializer.cpp +++ b/tests/Bug_3853_Regression/Client_ORBInitializer.cpp @@ -3,9 +3,6 @@ #include "Client_ORBInitializer.h" #include "client_interceptor.h" - -ACE_RCSID (Service_Context_Manipulation, Client_ORBInitializer, "$Id$") - Client_ORBInitializer::Client_ORBInitializer () { diff --git a/tests/Bug_3853_Regression/Hello.idl b/tests/Bug_3853_Regression/Hello.idl index 13926dd3d61..b707d501a1a 100644 --- a/tests/Bug_3853_Regression/Hello.idl +++ b/tests/Bug_3853_Regression/Hello.idl @@ -3,7 +3,7 @@ // module Demo { - interface HelloWorld + interface HelloWorld { void sayHello(in string msg); oneway void shutdown(); diff --git a/tests/Bug_3853_Regression/Hello_i.cpp b/tests/Bug_3853_Regression/Hello_i.cpp index b354ffa12c0..478a4fc6902 100644 --- a/tests/Bug_3853_Regression/Hello_i.cpp +++ b/tests/Bug_3853_Regression/Hello_i.cpp @@ -1,12 +1,7 @@ -// // $Id$ -// #include "Hello_i.h" -#include "ace/OS.h" - -#include <iostream> -using namespace std; +#include "ace/OS_NS_unistd.h" // Implementation skeleton constructor Demo_HelloWorld_i::Demo_HelloWorld_i (CORBA::ORB_ptr orb) @@ -25,16 +20,16 @@ void Demo_HelloWorld_i::sayHello ( { ACE_OS::sleep(1); // Add your implementation here - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%P|%t)Demo_HelloWorld_i::sayHello %s \n"), msg)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%P|%t)Demo_HelloWorld_i::sayHello %C\n"), msg)); } -void +void Demo_HelloWorld_i::shutdown() { ACE_DEBUG ((LM_DEBUG, "(%P|%t)Demo_HelloWorld_i::shutdown \n")); this->orb_->shutdown (0); } - + diff --git a/tests/Bug_3853_Regression/Hello_i.h b/tests/Bug_3853_Regression/Hello_i.h index 4713d8d771c..2f7fc11e8f1 100644 --- a/tests/Bug_3853_Regression/Hello_i.h +++ b/tests/Bug_3853_Regression/Hello_i.h @@ -15,18 +15,18 @@ class Demo_HelloWorld_i : public virtual POA_Demo::HelloWorld { public: - // Constructor + // Constructor Demo_HelloWorld_i (CORBA::ORB_ptr orb); - - // Destructor + + // Destructor virtual ~Demo_HelloWorld_i (void); - + virtual void sayHello ( const char * msg ); - + virtual void shutdown(); - + private: CORBA::ORB_var orb_; diff --git a/tests/Bug_3853_Regression/client.cpp b/tests/Bug_3853_Regression/client.cpp index cf192bcfad5..765f8677cfd 100644 --- a/tests/Bug_3853_Regression/client.cpp +++ b/tests/Bug_3853_Regression/client.cpp @@ -7,8 +7,8 @@ #include "tao/PI_Server/PI_Server.h" #include "tao/debug.h" #include "ace/Task.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" +#include "ace/OS_NS_unistd.h" #include <iostream> const ACE_TCHAR *ior_output_file = ACE_TEXT("client.ior"); @@ -103,7 +103,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/tests/Bug_3853_Regression/client_interceptor.cpp b/tests/Bug_3853_Regression/client_interceptor.cpp index 0e5ee8f3bdc..1f93f524181 100644 --- a/tests/Bug_3853_Regression/client_interceptor.cpp +++ b/tests/Bug_3853_Regression/client_interceptor.cpp @@ -7,10 +7,6 @@ extern const ACE_TCHAR *server2_ior; extern CORBA::ORB_var orb; -ACE_RCSID (Service_Context_Manipulation, - interceptors, - "$Id$") - const IOP::ServiceId service_id = 0xdeadbeef; int isRecursive = 0; diff --git a/tests/Bug_3853_Regression/run_test.pl b/tests/Bug_3853_Regression/run_test.pl index 6616f62667f..332df733501 100755 --- a/tests/Bug_3853_Regression/run_test.pl +++ b/tests/Bug_3853_Regression/run_test.pl @@ -105,7 +105,7 @@ if ($server_status != 0) { $CL->Kill (); $CL->TimedWait (1); exit 1; } - + $server_status = $SV1->Spawn (); if ($server_status != 0) { diff --git a/tests/Bug_3853_Regression/server.cpp b/tests/Bug_3853_Regression/server.cpp index d5f9e0b93b2..8f258f5656c 100644 --- a/tests/Bug_3853_Regression/server.cpp +++ b/tests/Bug_3853_Regression/server.cpp @@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Bug_3896_Regression/Bug_3896_Regression.mpc b/tests/Bug_3896_Regression/Bug_3896_Regression.mpc new file mode 100644 index 00000000000..75e2eb600fa --- /dev/null +++ b/tests/Bug_3896_Regression/Bug_3896_Regression.mpc @@ -0,0 +1,37 @@ +// -*- MPC -*- +// $Id$ + +project(*idl): taoidldefaults { + idlflags += -Sp + IDL_Files { + Test.idl + } + custom_only = 1 +} + +project(*Server): taoserver { + after += *idl + Source_Files { + Hello.cpp + server.cpp + } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } +} + +project(*Client): taoclient, messaging { + after += *idl + Source_Files { + client.cpp + } + Source_Files { + TestC.cpp + } + IDL_Files { + } +} + diff --git a/tests/Bug_3896_Regression/Hello.cpp b/tests/Bug_3896_Regression/Hello.cpp new file mode 100644 index 00000000000..a43d2445314 --- /dev/null +++ b/tests/Bug_3896_Regression/Hello.cpp @@ -0,0 +1,22 @@ +// $Id$ +#include "Hello.h" +#include "ace/OS_NS_unistd.h" + +Hello::Hello (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + +char * +Hello::get_string (void) +{ + ACE_OS::sleep (10); + + return CORBA::string_dup ("Hello there!"); +} + +void +Hello::shutdown (void) +{ + this->orb_->shutdown (0); +} diff --git a/tests/Bug_3896_Regression/Hello.h b/tests/Bug_3896_Regression/Hello.h new file mode 100644 index 00000000000..f87205c3011 --- /dev/null +++ b/tests/Bug_3896_Regression/Hello.h @@ -0,0 +1,31 @@ +// +// $Id$ +// + +#ifndef HELLO_H +#define HELLO_H +#include /**/ "ace/pre.h" + +#include "TestS.h" + +/// Implement the Test::Hello interface +class Hello + : public virtual POA_Test::Hello +{ +public: + /// Constructor + Hello (CORBA::ORB_ptr orb); + + // = The skeleton methods + virtual char * get_string (void); + + virtual void shutdown (void); + +private: + /// Use an ORB reference to conver strings to objects and shutdown + /// the application. + CORBA::ORB_var orb_; +}; + +#include /**/ "ace/post.h" +#endif /* HELLO_H */ diff --git a/tests/Bug_3896_Regression/Test.idl b/tests/Bug_3896_Regression/Test.idl new file mode 100644 index 00000000000..3c0976e106d --- /dev/null +++ b/tests/Bug_3896_Regression/Test.idl @@ -0,0 +1,20 @@ +// +// $Id$ +// + +/// Put the interfaces in a module, to avoid global namespace pollution +module Test +{ + /// A very simple interface + interface Hello + { + /// Return a simple string + string get_string (); + + /// A method to shutdown the ORB + /** + * This method is used to simplify the test shutdown process + */ + oneway void shutdown (); + }; +}; diff --git a/tests/Bug_3896_Regression/client.cpp b/tests/Bug_3896_Regression/client.cpp new file mode 100644 index 00000000000..9187ddc46eb --- /dev/null +++ b/tests/Bug_3896_Regression/client.cpp @@ -0,0 +1,159 @@ +// $Id$ + +#include "TestC.h" +#include "ace/Get_Opt.h" +#include "ace/Task_T.h" +#include "ace/OS_NS_unistd.h" +#include "tao/TimeBaseC.h" +#include "tao/Messaging/Messaging.h" + +const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); +bool shutdown_server = false; + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:x")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'k': + ior = get_opts.opt_arg (); + break; + case 'x': + shutdown_server = true; + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-k <ior> " + "\n", + argv [0]), + -1); + } + // Indicates successful parsing of the command line + return 0; +} + +class Client : public ACE_Task_Base +{ +public: + Client (CORBA::ORB_ptr server); + + virtual int svc (void); + +private: + CORBA::ORB_var orb_; +}; + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + try + { + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + + if (parse_args (argc, argv) != 0) + return 1; + + // Set round-trip timeout + const int timeout_secs = 5; + + CORBA::Object_var obj = orb->resolve_initial_references ("ORBPolicyManager"); + CORBA::PolicyManager_var policy_manager = + CORBA::PolicyManager::_narrow (obj.in()); + + CORBA::PolicyList policy_list; + policy_list.length(0); + policy_manager->set_policy_overrides(policy_list, CORBA::SET_OVERRIDE); + + TimeBase::TimeT timeout = timeout_secs * 10000000; + CORBA::Any orb_timeout; + orb_timeout <<= timeout; + policy_list.length(1); + policy_list[0] = orb->create_policy( + Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, orb_timeout); + + policy_manager->set_policy_overrides(policy_list, CORBA::SET_OVERRIDE); + + CORBA::Object_var tmp = orb->string_to_object(ior); + + Test::Hello_var hello = Test::Hello::_narrow(tmp.in ()); + + if (CORBA::is_nil (hello.in ())) + { + ACE_ERROR_RETURN ((LM_DEBUG, + "Nil Test::Hello reference <%s>\n", + ior), + 1); + } + + if (shutdown_server) + { + hello->shutdown (); + } + else + { + Client client (orb.in ()); + if (client.activate (THR_NEW_LWP | THR_JOINABLE, 1) != 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot activate client threads\n"), + 1); + + CORBA::String_var the_string; + try + { + the_string = hello->get_string (); + } + catch (const CORBA::TIMEOUT&) + { + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Error: got timeout\n")); + } + catch (const CORBA::COMM_FAILURE&) + { + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Ok: got comm exception\n")); + } + + ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%C>\n", + the_string.in ())); + + client.thr_mgr ()->wait (); + } + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + return 1; + } + + return 0; +} + +Client::Client (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + +int +Client::svc (void) +{ + try + { + ACE_OS::sleep (2); + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) Shutting down ORB\n")); + orb_->shutdown (true); + } + catch (const CORBA::Exception&) + { + } + return 0; +} diff --git a/tests/Bug_3896_Regression/run_test.pl b/tests/Bug_3896_Regression/run_test.pl new file mode 100755 index 00000000000..af90f7751c8 --- /dev/null +++ b/tests/Bug_3896_Regression/run_test.pl @@ -0,0 +1,82 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; + +$status = 0; +$debug_level = '0'; + +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } +} + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +my $iorbase = "server.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); +$CL = $client->CreateProcess ("client", "-ORBdebuglevel $debug_level -k file://$client_iorfile"); +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; +} + +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval()); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; + $status = 1; +} + +$CL->Arguments ("-x -ORBdebuglevel $debug_level -k file://$client_iorfile"); + +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval()); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; + $status = 1; +} + +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + $status = 1; +} + +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +exit $status; diff --git a/tests/Bug_3896_Regression/server.cpp b/tests/Bug_3896_Regression/server.cpp new file mode 100644 index 00000000000..205a7c179e0 --- /dev/null +++ b/tests/Bug_3896_Regression/server.cpp @@ -0,0 +1,101 @@ +// $Id$ + +#include "Hello.h" +#include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" + +const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'o': + ior_output_file = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-o <iorfile>" + "\n", + argv [0]), + -1); + } + // Indicates successful parsing of the command line + return 0; +} + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + try + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + + CORBA::Object_var poa_object = + orb->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + if (CORBA::is_nil (root_poa.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Panic: nil RootPOA\n"), + 1); + + PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); + + if (parse_args (argc, argv) != 0) + return 1; + + Hello *hello_impl = 0; + ACE_NEW_RETURN (hello_impl, + Hello (orb.in ()), + 1); + PortableServer::ServantBase_var owner_transfer(hello_impl); + + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Test::Hello_var hello = Test::Hello::_narrow (object.in ()); + + CORBA::String_var ior = orb->object_to_string (hello.in ()); + + // Output the IOR to the <ior_output_file> + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s\n", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + + poa_manager->activate (); + + orb->run (); + + ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); + + root_poa->destroy (1, 1); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + return 1; + } + + return 0; +} diff --git a/tests/Bug_3919_Regression/Bug_3919_Regression.mpc b/tests/Bug_3919_Regression/Bug_3919_Regression.mpc new file mode 100644 index 00000000000..25f0f8e8f5f --- /dev/null +++ b/tests/Bug_3919_Regression/Bug_3919_Regression.mpc @@ -0,0 +1,41 @@ +// -*- MPC -*- +// +// $Id$ + +project(*idl): taoidldefaults, valuetype { + idlflags += -Sp + idlflags -= -ae + idlflags += -as + IDL_Files { + Test.idl + Test2.idl + } + custom_only = 1 +} + +project(*Server): taoserver, valuetype { + after += *idl + + Source_Files { + Hello.cpp + server.cpp + TestC.cpp + TestS.cpp + Test2C.cpp + Test2S.cpp + } + IDL_Files { + } +} + +project(*Client): taoclient, valuetype, typecodefactory { + after += *idl + + Source_Files { + TestC.cpp + Test2C.cpp + client.cpp + } + IDL_Files { + } +} diff --git a/tests/Bug_3919_Regression/Hello.cpp b/tests/Bug_3919_Regression/Hello.cpp new file mode 100644 index 00000000000..46043d0d3ee --- /dev/null +++ b/tests/Bug_3919_Regression/Hello.cpp @@ -0,0 +1,27 @@ +// $Id$ + +#include "Hello.h" + +Hello::Hello (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + +CORBA::Any * +Hello::get_any (CORBA::Any const & the_any) +{ + CORBA::Any * retval = 0; + + ACE_NEW_THROW_EX (retval, + CORBA::Any (the_any), + CORBA::NO_MEMORY ()); + + return retval; +} + + +void +Hello::shutdown (void) +{ + this->orb_->shutdown (0); +} diff --git a/tests/Bug_3919_Regression/Hello.h b/tests/Bug_3919_Regression/Hello.h new file mode 100644 index 00000000000..64c39d87300 --- /dev/null +++ b/tests/Bug_3919_Regression/Hello.h @@ -0,0 +1,41 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file Hello.h + * + * $Id$ + * + * Header file for recursive type Any insertion and extraction test. + * + * @author Ossama Othman + */ +//============================================================================= + + +#ifndef HELLO_H +#define HELLO_H + +#include "TestS.h" + +class Hello + : public virtual POA_Test::Hello +{ +public: + + /// Constructor + Hello (CORBA::ORB_ptr orb); + + // Return the any provide as an "in" argument. + virtual CORBA::Any * get_any (CORBA::Any const & the_any); + + virtual void shutdown (void); + +private: + + /// The ORB which will be shutdown by Hello::shutdown(). + CORBA::ORB_var orb_; + +}; + +#endif /* HELLO_H */ diff --git a/tests/Bug_3919_Regression/Test.idl b/tests/Bug_3919_Regression/Test.idl new file mode 100644 index 00000000000..f15c0dd0e0e --- /dev/null +++ b/tests/Bug_3919_Regression/Test.idl @@ -0,0 +1,44 @@ +// +// $Id$ +// + +#include "tao/OctetSeq.pidl" +#include "tao/StringSeq.pidl" + +/// Put the interfaces in a module, to avoid global namespace pollution +module Test +{ + exception Recursive_Type_In_Any_Test_Failed {}; + exception Demarshaling_From_Any_Failed {}; + + enum MyAttRefValEnum { + ArvAttribute, + ArvInteger, + ArvComposition + }; + + // NOTE: the (deprecated) anonymous sequence type in the union + // is intentional; the IDL compiler generated different + // code for this case as compared to using a proper + // forward and typedef. + struct MyAttRef { + string attRefName; + string attRefQualifier; + union MyAttRefValue switch(MyAttRefValEnum) { + case ArvAttribute: string attrValue; //value of a simple attribute + case ArvInteger: long intValue; // just for testing + case ArvComposition: sequence <MyAttRef> compValue; //a composition by specifying a sequence of MyAttRef elements. + } attRefValue; + }; + typedef sequence <MyAttRef> MyAttRefSequence; + + /// Simple test interface. + interface Hello + { + /// Return the any provided as the "in" argument. + any get_any (in any the_any); + + /// Shutdown the server ORB. + oneway void shutdown (); + }; +}; diff --git a/tests/Bug_3919_Regression/Test2.idl b/tests/Bug_3919_Regression/Test2.idl new file mode 100644 index 00000000000..d66a82bc32c --- /dev/null +++ b/tests/Bug_3919_Regression/Test2.idl @@ -0,0 +1,10 @@ +// $Id$ + +#include "Test.idl" + +module Test2 +{ + struct MyAttRefSeqStruct { + Test::MyAttRefSequence attRefSeq; + }; +}; diff --git a/tests/Bug_3919_Regression/client.cpp b/tests/Bug_3919_Regression/client.cpp new file mode 100644 index 00000000000..a1aa68d5292 --- /dev/null +++ b/tests/Bug_3919_Regression/client.cpp @@ -0,0 +1,263 @@ +// $Id$ + +#include "Test2C.h" +#include "tao/IFR_Client/IFR_BaseC.h" +#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h" + +#include "ace/Get_Opt.h" + +#include <algorithm> +#include <functional> + +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'k': + ior = get_opts.opt_arg (); + break; + + case '?': + case 'h': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-k <ior> " + "\n", + argv [0]), + -1); + } + + // Successful command line parsing. + return 0; +} + +template<typename T> void dump (T *); // Forward declaration. + +template<typename T> +void +perform_invocation (Test::Hello_ptr hello, + CORBA::Any const & the_any) +{ + // Execute more than once to help verify that mutable recursive + // TypeCode state is managed correctly. + for (unsigned int n = 0; n < 2; ++n) + { + CORBA::Any_var my_any = + hello->get_any (the_any); + + T * my_foo = 0; + if (!(my_any.in () >>= my_foo)) + throw Test::Demarshaling_From_Any_Failed (); + + CORBA::TypeCode_var the_tc = the_any.type (); + CORBA::TypeCode_var my_tc = my_any->type (); + + CORBA::Boolean const equal_tc = + the_tc->equal (my_tc.in ()); + + if (!equal_tc) + throw Test::Recursive_Type_In_Any_Test_Failed (); + + CORBA::Boolean const equiv_tc = + the_tc->equivalent (my_tc.in ()); + + if (!equiv_tc) + throw Test::Recursive_Type_In_Any_Test_Failed (); + } +} + +void +recursive_typecode_test (CORBA::ORB_ptr /* orb */, + Test::Hello_ptr hello) +{ + ACE_DEBUG ((LM_INFO, + "Executing recursive typecode test\n")); + + CORBA::Any the_any; + + Test::MyAttRefSequence test; + + Test::MyAttRef attr; + attr.attRefName="attr"; + attr.attRefValue.attrValue("value"); + attr.attRefQualifier="atrQ1"; + + Test::MyAttRef attr2; + attr2.attRefName="attr2"; + attr2.attRefValue.attrValue("value2"); + attr2.attRefQualifier="atrQ2"; + + Test::MyAttRef comp; + comp.attRefName="comp1"; + comp.attRefQualifier="compQ"; + + Test::MyAttRef::MyAttRefValue::_compValue_seq compSeq(1); + compSeq.length(1); + compSeq[0]=attr2; + comp.attRefValue.compValue(compSeq); + + Test::MyAttRef inti; + inti.attRefName="intval"; + inti.attRefValue.intValue(0xAFFEAFFE); + + test.length(3); + test[0] = comp; + test[1] = inti; + test[2] = attr; + + the_any <<= test; + + ::perform_invocation<Test::MyAttRefSequence> (hello, the_any); + +} + +void +nested_recursive_typecode_test (CORBA::ORB_ptr /* orb */, + Test::Hello_ptr hello) +{ + ACE_DEBUG ((LM_INFO, + "Executing nested recursive typecode test\n")); + + CORBA::Any the_any; + + Test2::MyAttRefSeqStruct test; + + Test::MyAttRef attr; + attr.attRefName="attr"; + attr.attRefValue.attrValue("value"); + attr.attRefQualifier="atrQ1"; + + Test::MyAttRef attr2; + attr2.attRefName="attr2"; + attr2.attRefValue.attrValue("value2"); + attr2.attRefQualifier="atrQ2"; + + Test::MyAttRef comp; + comp.attRefName="comp1"; + comp.attRefQualifier="compQ"; + + Test::MyAttRef::MyAttRefValue::_compValue_seq compSeq(1); + compSeq.length(1); + compSeq[0]=attr2; + comp.attRefValue.compValue(compSeq); + + Test::MyAttRef inti; + inti.attRefName="intval"; + inti.attRefValue.intValue(0xAFFEAFFE); + + test.attRefSeq.length(3); + test.attRefSeq[0] = comp; + test.attRefSeq[1] = inti; + test.attRefSeq[2] = attr; + + the_any <<= test; + + ::perform_invocation<Test2::MyAttRefSeqStruct> (hello, the_any); + +} + +/** + * @struct Caller + * + * @brief Test method invocation functor. + * + * Test method invocation functor. + */ +template <typename T> +struct Caller : public std::unary_function<T, void> +{ + /// Constructor. + Caller (CORBA::ORB_ptr o, Test::Hello_ptr h) + : orb (CORBA::ORB::_duplicate (o)) + , hello (Test::Hello::_duplicate (h)) + , success (true) + { + } + + /// Function call operator overload. + void operator() (T f) + { + try + { + f (orb.in (), + hello.in ()); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception thrown:"); + + success = false; + } + } + + CORBA::ORB_var orb; + Test::Hello_var hello; + bool success; +}; + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + try + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + + if (parse_args (argc, argv) != 0) + return 1; + + CORBA::Object_var tmp = + orb->string_to_object(ior); + + Test::Hello_var hello = + Test::Hello::_narrow(tmp.in ()); + + if (CORBA::is_nil (hello.in ())) + { + ACE_ERROR_RETURN ((LM_DEBUG, + "Nil Test::Hello reference <%s>\n", + ior), + 1); + } + + typedef void (*test_func) (CORBA::ORB_ptr, + Test::Hello_ptr); + + static test_func const tests[] = + { + recursive_typecode_test, + nested_recursive_typecode_test + }; + + static size_t const test_count = sizeof (tests) / sizeof (test_func); + + // Have some fun with the STL. :-) + Caller<test_func> c = + std::for_each (tests, + tests + test_count, + Caller<test_func> (orb.in (), + hello.in ())); + + if (!c.success) + throw Test::Recursive_Type_In_Any_Test_Failed (); + + hello->shutdown (); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + return 1; + } + + return 0; +} diff --git a/tests/Bug_3919_Regression/run_test.pl b/tests/Bug_3919_Regression/run_test.pl new file mode 100755 index 00000000000..719974e5c50 --- /dev/null +++ b/tests/Bug_3919_Regression/run_test.pl @@ -0,0 +1,73 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; + +$status = 0; +$debug_level = '0'; + +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } +} + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +my $iorbase = "server.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); +$CL = $client->CreateProcess ("client", "-k file://$client_iorfile"); +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; +} + +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval()); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; + $status = 1; +} + +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + $status = 1; +} + +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +exit $status; diff --git a/tests/Bug_3919_Regression/server.cpp b/tests/Bug_3919_Regression/server.cpp new file mode 100644 index 00000000000..ab19d0fb0a7 --- /dev/null +++ b/tests/Bug_3919_Regression/server.cpp @@ -0,0 +1,104 @@ +// $Id$ + +#include "Hello.h" +#include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" + +const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'o': + ior_output_file = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-o <iorfile>" + "\n", + argv [0]), + -1); + } + // Indicates successful parsing of the command line + return 0; +} + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + try + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + + CORBA::Object_var poa_object = + orb->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + if (CORBA::is_nil (root_poa.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Panic: nil RootPOA\n"), + 1); + + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (); + + if (parse_args (argc, argv) != 0) + return 1; + + Hello *hello_impl; + ACE_NEW_RETURN (hello_impl, + Hello (orb.in ()), + 1); + PortableServer::ServantBase_var owner_transfer(hello_impl); + + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Test::Hello_var hello = + Test::Hello::_narrow (object.in ()); + + CORBA::String_var ior = + orb->object_to_string (hello.in ()); + + // Output the IOR to the <ior_output_file> + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + + poa_manager->activate (); + + orb->run (); + + ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); + + root_poa->destroy (1, 1); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + return 1; + } + + return 0; +} diff --git a/tests/Bug_3926_Regression/Bug_3926_Regression.mpc b/tests/Bug_3926_Regression/Bug_3926_Regression.mpc new file mode 100644 index 00000000000..342e78b964b --- /dev/null +++ b/tests/Bug_3926_Regression/Bug_3926_Regression.mpc @@ -0,0 +1,39 @@ +// -*- MPC -*- +// $Id$ + +project(*idl): taoidldefaults { + IDL_Files { + test.idl + } + custom_only = 1 +} + +project(*Server): taoserver { + after += *idl + + Source_Files { + test_i.cpp + server.cpp + } + Source_Files { + testC.cpp + testS.cpp + } + IDL_Files { + } +} + +project(*Client): taoclient, pi, interceptors { + after += *idl + + Source_Files { + Client_ORBInitializer.cpp + Client_Request_Interceptor.cpp + client.cpp + } + Source_Files { + testC.cpp + } + IDL_Files { + } +} diff --git a/tests/Bug_3926_Regression/Client_ORBInitializer.cpp b/tests/Bug_3926_Regression/Client_ORBInitializer.cpp new file mode 100644 index 00000000000..bc817f79d96 --- /dev/null +++ b/tests/Bug_3926_Regression/Client_ORBInitializer.cpp @@ -0,0 +1,54 @@ +// -*- C++ -*- +// $Id$ + +#include "Client_ORBInitializer.h" + +#if TAO_HAS_INTERCEPTORS == 1 + +#include "Client_Request_Interceptor.h" + +#include "ace/OS_NS_string.h" + +void +Client_ORBInitializer::pre_init ( + PortableInterceptor::ORBInitInfo_ptr) +{ +} + +void +Client_ORBInitializer::post_init ( + PortableInterceptor::ORBInitInfo_ptr info) +{ + CORBA::String_var orb_id = info->orb_id (); + + CORBA::StringSeq_var args = info->arguments (); + + CORBA::String_var forward_str; + + // Extract the last forward reference from the argument list. + CORBA::ULong args_len = args->length (); + for (CORBA::ULong i = 0; i < args_len; ++i) + if (ACE_OS::strcmp ("-k", args[i]) == 0 + && i < (args_len - 1)) + forward_str = args[i + 1]; + + PortableInterceptor::ClientRequestInterceptor_ptr interceptor = + PortableInterceptor::ClientRequestInterceptor::_nil (); + + // Install the client request interceptor. + ACE_NEW_THROW_EX (interceptor, + Client_Request_Interceptor (orb_id.in (), + forward_str.in ()), + CORBA::NO_MEMORY ( + CORBA::SystemException::_tao_minor_code ( + TAO::VMCID, + ENOMEM), + CORBA::COMPLETED_NO)); + + PortableInterceptor::ClientRequestInterceptor_var + client_interceptor = interceptor; + + info->add_client_request_interceptor (client_interceptor.in ()); +} + +#endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/tests/Bug_3926_Regression/Client_ORBInitializer.h b/tests/Bug_3926_Regression/Client_ORBInitializer.h new file mode 100644 index 00000000000..65f0a38924b --- /dev/null +++ b/tests/Bug_3926_Regression/Client_ORBInitializer.h @@ -0,0 +1,31 @@ +// -*- C++ -*- +// $Id$ + +#ifndef TAO_CLIENT_ORB_INITIALIZER_H +#define TAO_CLIENT_ORB_INITIALIZER_H + +#include /**/ "ace/pre.h" + +#include "tao/PI/PI.h" + +#if TAO_HAS_INTERCEPTORS == 1 + +#include "tao/LocalObject.h" + +/// Client side ORB initializer. +class Client_ORBInitializer : + public virtual PortableInterceptor::ORBInitializer, + public virtual CORBA::LocalObject +{ +public: + + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); + + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); +}; + +#endif /* TAO_HAS_INTERCEPTORS == 1 */ + +#include /**/ "ace/post.h" + +#endif /* TAO_CLIENT_ORB_INITIALIZER_H */ diff --git a/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp b/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp new file mode 100644 index 00000000000..86e2837dc17 --- /dev/null +++ b/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp @@ -0,0 +1,130 @@ +// -*- C++ -*- +// $Id$ + +#include "Client_Request_Interceptor.h" +#include "testC.h" + +#include "ace/Log_Msg.h" + +Client_Request_Interceptor::Client_Request_Interceptor ( + const char *orb_id, + const char *forward_str) + : orb_id_ (CORBA::string_dup (orb_id)), + orb_ (), + request_count_ (0), + forward_str_ (CORBA::string_dup (forward_str)) +{ +} + +char * +Client_Request_Interceptor::name () +{ + return CORBA::string_dup ("Client_Request_Interceptor"); +} + +void +Client_Request_Interceptor::destroy (void) +{ +} + +void +Client_Request_Interceptor::send_request ( + PortableInterceptor::ClientRequestInfo_ptr ri) +{ + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("CRI: in send_request\n"))); + + ++this->request_count_; + + CORBA::Boolean response_expected = + ri->response_expected (); + + if (!response_expected) // A one-way request. + return; + + // Request 1 -- non-forwarded + // Request 2 -- forwarded by this interception point. + // Request 3 -- non-forwarded + + if (this->request_count_ == 2) + { + if (CORBA::is_nil (this->orb_.in ())) + { + int argc = 0; + char **const argv= 0; + this->orb_ = CORBA::ORB_init (argc, + argv, + this->orb_id_.in ()); + } + + CORBA::Object_var forward = + this->orb_->string_to_object (this->forward_str_.in ()); + + CORBA::String_var forward_str = + this->orb_->object_to_string (forward.in ()); + + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("CRI: request %d will be forwarded via send_request()\n"), + this->request_count_)); + + // Notice that this is not a permanent forward. + throw PortableInterceptor::ForwardRequest (forward.in ()); + } +} + +void +Client_Request_Interceptor::send_poll ( + PortableInterceptor::ClientRequestInfo_ptr) +{ + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("CRI: in send_poll\n"))); +} + +void +Client_Request_Interceptor::receive_reply ( + PortableInterceptor::ClientRequestInfo_ptr) +{ + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("CRI: in receive_reply\n"))); +} + +void +Client_Request_Interceptor::receive_exception ( + PortableInterceptor::ClientRequestInfo_ptr) +{ + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("CRI: in receive_exception\n"))); +} + +void +Client_Request_Interceptor::receive_other ( + PortableInterceptor::ClientRequestInfo_ptr ri) +{ + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("CRI: in receive_other\n"))); + + CORBA::Boolean response_expected = + ri->response_expected (); + + // Oneway + if (!response_expected) + return; + + PortableInterceptor::ReplyStatus reply_status; + + try + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("CRI: in receive_other, before reply_status\n"))); + + reply_status = ri->reply_status (); + ACE_UNUSED_ARG (reply_status); + } + catch(CORBA::BAD_INV_ORDER const &e) + { + e._tao_print_exception ("CRI: exception"); + } + + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("CRI: in receive_other, after reply_status\n"))); +} diff --git a/tests/Bug_3926_Regression/Client_Request_Interceptor.h b/tests/Bug_3926_Regression/Client_Request_Interceptor.h new file mode 100644 index 00000000000..0328ecbeb55 --- /dev/null +++ b/tests/Bug_3926_Regression/Client_Request_Interceptor.h @@ -0,0 +1,77 @@ +// -*- C++ -*- +// $Id$ + +#ifndef CLIENT_REQUEST_INTERCEPTOR_H +#define CLIENT_REQUEST_INTERCEPTOR_H + +#include "ace/config-all.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "tao/PI/PI.h" +#include "tao/PortableInterceptorC.h" +#include "tao/LocalObject.h" +#include "tao/ORB.h" +#include "tao/CORBA_String.h" + +class Client_Request_Interceptor + : public virtual PortableInterceptor::ClientRequestInterceptor, + public virtual CORBA::LocalObject +{ +public: + + /// Constructor. + Client_Request_Interceptor (const char *orb_id, + const char *forward_str); + + /** + * @name Methods Required by the Client Request Interceptor + * Interface + * + * These are methods that must be implemented since they are pure + * virtual in the abstract base class. They are the canonical + * methods required for all client request interceptors. + */ + //@{ + /// Return the name of this ClientRequestinterceptor. + virtual char * name (void); + + virtual void destroy (void); + + virtual void send_request ( + PortableInterceptor::ClientRequestInfo_ptr ri); + + virtual void send_poll ( + PortableInterceptor::ClientRequestInfo_ptr ri); + + virtual void receive_reply ( + PortableInterceptor::ClientRequestInfo_ptr ri); + + virtual void receive_exception ( + PortableInterceptor::ClientRequestInfo_ptr ri); + + virtual void receive_other ( + PortableInterceptor::ClientRequestInfo_ptr ri); + //@} + +private: + + ///The ID of the ORB this interceptor is registered with. + CORBA::String_var orb_id_; + + /// Pseudo-reference to the ORB this interceptor is registered + /// with. + CORBA::ORB_var orb_; + + /// The number of requests intercepted by this interceptor. + CORBA::ULong request_count_; + + /// Stringified reference to the object the initial request will be + /// forwarded to by this interceptor. + CORBA::String_var forward_str_; + +}; + +#endif /* CLIENT_REQUEST_INTERCEPTOR_H */ diff --git a/tests/Bug_3926_Regression/README b/tests/Bug_3926_Regression/README new file mode 100644 index 00000000000..00be79aab75 --- /dev/null +++ b/tests/Bug_3926_Regression/README @@ -0,0 +1,85 @@ +// $Id$ + +The scenario for this test is the following. + +The client: + +- makes a first request to the server, the send_request interception point does nothing +- receives a reply, receive_reply interception point called -> *OK* +- makes another request, the send_request interception point forwards it to the server IOR +- receives a reply, receive_reply interception point called -> *OK* +- makes a third request, the send_request interception does nothing + +At this point server is instructed to throw an exception. + +If the server throws one exception in the following set +*COMM_FAILURE* +*TRANSIENT* +*NO_RESPONSE* +*OBJ_ADAPTER* +with completion status *COMPLETED_NO* the client's *receive_other* interception point is +called *with an invalid ClientRequestInfo object*. Reading this object will result in a +BAD_INV_ORDER exception to be raised with minor code of 1330446350. + +If the server throws any other exception, the receive_exception interception point is +called as expected. + + +__Successful Output__ + +$> ./run_test.pl +SERVER: test_i servant: <IOR:....> +CLIENT: Issuing request 1. +CRI: in send_request +CRI: in receive_reply +CLIENT: Request 1 returns 1. +CLIENT: Issuing request 2. +CRI: in send_request +CRI: request 2 will be forwarded via send_request() +CRI: in send_request +CRI: in receive_reply +CLIENT: Request 2 returns 2. +CLIENT: Issuing request 3. +CRI: in send_request +CRI: in receive_other +CRI: in receive_other, before reply_status +CRI: in receive_other, after reply_status +CRI: in send_request +CRI: in receive_reply +CLIENT: Request 3 returns 4. +CRI: in send_request +SERVER: Server is shutting down at 4. +SERVER: Event loop finished. +CRI: in receive_other + + +__Regression Output__ + +$> ./run_test.pl +SERVER: test_i servant: <IOR:....> +CLIENT: Issuing request 1. +CRI: in send_request +CRI: in receive_reply +CLIENT: Request 1 returns 1. +CLIENT: Issuing request 2. +CRI: in send_request +CRI: request 2 will be forwarded via send_request() +CRI: in send_request +CRI: in receive_reply +CLIENT: Request 2 returns 2. +CLIENT: Issuing request 3. +CRI: in send_request +CRI: in receive_other +CRI: in receive_other, before reply_status +(15042|46912532998624) EXCEPTION, CRI: exception +system exception, ID 'IDL:omg.org/CORBA/BAD_INV_ORDER:1.0' +OMG minor code (14), described as 'Invalid portable interceptor call', completed = NO + +CRI: in receive_other, after reply_status +CRI: in send_request +CRI: in receive_reply +CLIENT: Request 3 returns 4. +CRI: in send_request +SERVER: Server is shutting down at 4. +SERVER: Event loop finished. +CRI: in receive_other diff --git a/tests/Bug_3926_Regression/client.cpp b/tests/Bug_3926_Regression/client.cpp new file mode 100644 index 00000000000..e56deca7d19 --- /dev/null +++ b/tests/Bug_3926_Regression/client.cpp @@ -0,0 +1,104 @@ +// -*- C++ -*- +// $Id$ + +#include "testC.h" +#include "Client_ORBInitializer.h" + +#include "tao/ORBInitializer_Registry.h" + +#include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" + +const ACE_TCHAR *ior = 0; + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("k:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'k': + ior = get_opts.opt_arg (); + break; + default: + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("Usage: %s ") + ACE_TEXT ("-k IOR\n"), + argv[0]), + -1); + } + + return 0; +} + +int +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) +{ + int status = 0; + + try + { +#if TAO_HAS_INTERCEPTORS == 1 + PortableInterceptor::ORBInitializer_ptr temp_initializer = + PortableInterceptor::ORBInitializer::_nil (); + + ACE_NEW_RETURN (temp_initializer, + Client_ORBInitializer, + -1); // No exceptions yet! + PortableInterceptor::ORBInitializer_var orb_initializer = + temp_initializer; + + PortableInterceptor::register_orb_initializer (orb_initializer.in ()); +#endif /* TAO_HAS_INTERCEPTORS == 1 */ + + ACE_Argv_Type_Converter narrow (argc, argv); + CORBA::ORB_var orb = + CORBA::ORB_init (narrow.get_argc (), narrow.get_ASCII_argv (), "ClientORB"); + + ACE_Argv_Type_Converter wide (narrow.get_argc (), narrow.get_ASCII_argv ()); + if (::parse_args (wide.get_argc (), wide.get_TCHAR_argv ()) != 0) + return -1; + + CORBA::Object_var object = + orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior)); + + hello::GoodDay_var server = + hello::GoodDay::_narrow (object.in ()); + + if (CORBA::is_nil (server.in ())) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("Object reference <%s> is nil\n"), + ior), + 1); + } + + for (int i = 1; i <= 3; ++i) + { + ACE_DEBUG ((LM_INFO, + ACE_TEXT ("CLIENT: Issuing request %d.\n"), + i)); + + CORBA::Short number = server->number (); + + ACE_DEBUG ((LM_INFO, + ACE_TEXT ("CLIENT: Request %d returns %d.\n"), + i, + number)); + } + + server->shutdown (); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Caught exception:"); + return -1; + } + + return status; +} diff --git a/tests/Bug_3926_Regression/run_test.pl b/tests/Bug_3926_Regression/run_test.pl new file mode 100755 index 00000000000..effdc975fb0 --- /dev/null +++ b/tests/Bug_3926_Regression/run_test.pl @@ -0,0 +1,74 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; + +$status = 0; +$debug_level = '0'; + +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } +} + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +my $iorbase = "server.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); +$CL = $client->CreateProcess ("client", "-k file://$client_iorfile"); + +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; +} + +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$client_status = $CL->SpawnWaitKill ($server->ProcessStartWaitInterval()); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; + $status = 1; +} + +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + $status = 1; +} + +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +exit $status; diff --git a/tests/Bug_3926_Regression/server.cpp b/tests/Bug_3926_Regression/server.cpp new file mode 100644 index 00000000000..99a2277b57c --- /dev/null +++ b/tests/Bug_3926_Regression/server.cpp @@ -0,0 +1,109 @@ +// -*- C++ -*- +// $Id$ + +#include "test_i.h" + +#include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" + +const ACE_TCHAR *ior_file = 0; + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'o': + ior_file = get_opts.opt_arg (); + break; + default: + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("Usage: %s ") + ACE_TEXT ("-o IOR\n"), + argv[0]), + -1); + } + + return 0; +} + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + try + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + + CORBA::Object_var poa_object = + orb->resolve_initial_references ("RootPOA"); + + if (CORBA::is_nil (poa_object.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("SERVER: Unable to initialize the POA.\n")), + 1); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (); + + if (::parse_args (argc, argv) != 0) + return -1; + + // Servant + test_i *servant = 0; + ACE_NEW_RETURN (servant, + test_i (0, orb.in ()), + -1); + PortableServer::ServantBase_var safe (servant); + + PortableServer::ObjectId_var oid = + root_poa->activate_object (servant); + + CORBA::Object_var obj = + root_poa->servant_to_reference (servant); + + CORBA::String_var ior = + orb->object_to_string (obj.in ()); + + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("SERVER: test_i servant: <%C>\n"), + ior.in ())); + + poa_manager->activate (); + + // IOR + FILE *output_file= ACE_OS::fopen (ior_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("SERVER: Cannot open output file <%s> ") + ACE_TEXT ("for writting IOR: %C"), + ior_file, + ior.in ()), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + + // Run the ORB event loop. + orb->run (); + + root_poa->destroy (1, 1); + + orb->destroy (); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SERVER: Event loop finished.\n"))); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Caught exception:"); + return -1; + } + + return 0; +} diff --git a/tests/Bug_3926_Regression/test.idl b/tests/Bug_3926_Regression/test.idl new file mode 100644 index 00000000000..3c60aba7dd8 --- /dev/null +++ b/tests/Bug_3926_Regression/test.idl @@ -0,0 +1,8 @@ +// $Id$ + +module hello { + interface GoodDay { + short number (); + oneway void shutdown (); + }; +}; diff --git a/tests/Bug_3926_Regression/test_i.cpp b/tests/Bug_3926_Regression/test_i.cpp new file mode 100644 index 00000000000..bbaee56dd3e --- /dev/null +++ b/tests/Bug_3926_Regression/test_i.cpp @@ -0,0 +1,46 @@ +// -*- C++ -*- +// $Id$ + +#include "test_i.h" + +test_i::test_i (CORBA::Short num, + CORBA::ORB_ptr orb) + : number_ (num), + orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + +test_i::~test_i (void) +{ +} + +CORBA::Short +test_i::number (void) +{ + ++this->number_; + if (this->number_ == 3) + { +#if 1 + // Either throw any of these 4 exceptions with completion status + // COMPLETED_NO and see how it's handled in receive_other() point. + throw ::CORBA::TRANSIENT (0, CORBA::COMPLETED_NO); + // throw ::CORBA::NO_RESPONSE (0, CORBA::COMPLETED_NO); + // throw ::CORBA::COMM_FAILURE (0, CORBA::COMPLETED_NO); + // throw ::CORBA::OBJ_ADAPTER (0, CORBA::COMPLETED_NO); +#else + // Or throw any other exception and see how it's handled in + // receive_exception() point on the client side. + throw ::CORBA::INTERNAL (0, CORBA::COMPLETED_NO); +#endif + } + return this->number_; +} + +void +test_i::shutdown (void) +{ + ACE_DEBUG ((LM_DEBUG, + "SERVER: Server is shutting down at %d.\n", + this->number_)); + this->orb_->shutdown (0); +} diff --git a/tests/Bug_3926_Regression/test_i.h b/tests/Bug_3926_Regression/test_i.h new file mode 100644 index 00000000000..81f75665a8d --- /dev/null +++ b/tests/Bug_3926_Regression/test_i.h @@ -0,0 +1,55 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * Implementation header for the "test" IDL interface for the + * PortableInterceptor::ForwardRequest test. + * + * @author Ossama Othman <ossama@uci.edu> + */ +//============================================================================= + +#ifndef TEST_I_H +#define TEST_I_H + +#include "testS.h" + +/** + * @class test_i + * + * @brief Simple test class. + * + * This class implements the "test" interface used in this test. + */ +class test_i : public virtual POA_hello::GoodDay +{ +public: + + /// Constructor. + test_i (CORBA::Short num, + CORBA::ORB_ptr orb); + + /// Destructor. + ~test_i (void); + + /// Return the number assigned to this object. + virtual CORBA::Short number (void); + + /// Shutdown the ORB. + virtual void shutdown (void); + +private: + + /// The number assigned to this object. + CORBA::Short number_; + + /// Pseudo-reference to the ORB. + CORBA::ORB_var orb_; + +}; + +#endif /* TEST_I_H */ diff --git a/tests/Bug_3941_Regression/Bug_3941_Regression.mpc b/tests/Bug_3941_Regression/Bug_3941_Regression.mpc new file mode 100644 index 00000000000..da3efeb647e --- /dev/null +++ b/tests/Bug_3941_Regression/Bug_3941_Regression.mpc @@ -0,0 +1,23 @@ +// -*- MPC -*- +// $Id$ + +project(*idl): taoidldefaults, anytypecode { + IDL_Files { + test.idl + } + custom_only = 1 +} + +project(*Test): taoclient, anytypecode, valuetype { + after += *idl + exename = test3941 + + Source_Files { + test.cpp + } + Source_Files { + testC.cpp + } + IDL_Files { + } +} diff --git a/tests/Bug_3941_Regression/README b/tests/Bug_3941_Regression/README new file mode 100644 index 00000000000..e8cd4738f6d --- /dev/null +++ b/tests/Bug_3941_Regression/README @@ -0,0 +1,20 @@ +// $Id$ + +The problem is described in the corresponding issue. In short tao_idl +incorrectly generated _tao_unmarshal() function for valuetypes so that +it returned true even when the types stored in CDR and attempted to +extract were completely different. + + +__Successful Output__ + +$> ./run_test.pl +Test passed. + + +__Regression Output__ + +$> ./run_test.pl +ERROR: unmarshal shouldn't work +ERROR: <test3941> failed: +ERROR: test returned 255 diff --git a/tests/Bug_3941_Regression/run_test.pl b/tests/Bug_3941_Regression/run_test.pl new file mode 100755 index 00000000000..bb0a2aaa5b6 --- /dev/null +++ b/tests/Bug_3941_Regression/run_test.pl @@ -0,0 +1,22 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; + +$SV = $server->CreateProcess ("test3941"); + +$test = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); + +if ($test != 0) { + print STDERR "ERROR: test returned $test\n"; + exit 1; +} + +exit 0; diff --git a/tests/Bug_3941_Regression/test.cpp b/tests/Bug_3941_Regression/test.cpp new file mode 100644 index 00000000000..7cc3784843d --- /dev/null +++ b/tests/Bug_3941_Regression/test.cpp @@ -0,0 +1,99 @@ +// $Id$ + +#include "testC.h" + +int +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) +{ + try + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + + test::event0_init *ev0_fac = 0; + ACE_NEW_RETURN (ev0_fac, + test::event0_init, + -1); + CORBA::ValueFactoryBase_var ev0_fac_owner (ev0_fac); + + test::event1_init *ev1_fac = 0; + ACE_NEW_RETURN (ev1_fac, + test::event1_init, + -1); + CORBA::ValueFactoryBase_var ev1_fac_owner (ev1_fac); + + orb->register_value_factory (ev0_fac->tao_repository_id (), ev0_fac); + orb->register_value_factory (ev1_fac->tao_repository_id (), ev1_fac); + + test::event0_var ev0; + ACE_NEW_RETURN (ev0, + OBV_test::event0, + -1); + ev0->message ("one"); + + // write ev0 to CDR + TAO_OutputCDR cdr ((size_t) 0, // size + (int) ACE_CDR_BYTE_ORDER, + (ACE_Allocator *) 0, // buffer_allocator + (ACE_Allocator *) 0, // data_block_allocator + (ACE_Allocator *) 0, // message_block_allocator + 0, // memcpy_tradeoff + 1, + 1); + cdr.reset (); + + if (!(cdr << ev0)) + { + ACE_ERROR_RETURN ((LM_DEBUG, + "ERROR: cdr << ev1\n"), + -1); + } + + // convert cdr into safe_octet_seq + CORBA::OctetSeq safe_octet_seq (cdr.total_length ()); + safe_octet_seq.length (cdr.total_length ()); + + CORBA::Octet *buffer = safe_octet_seq.get_buffer (); + for (ACE_Message_Block const *i = cdr.begin (); + i != 0; + i = i->cont ()) + { + CORBA::ULong len = i->length (); + ACE_OS_String::memcpy (buffer, i->rd_ptr (), (size_t) len); + buffer += len; + } + + // Use TAO_InputCDR for unmarshalling + buffer = safe_octet_seq.get_buffer (); + size_t char_len = safe_octet_seq.length () * sizeof (CORBA::Octet); + TAO_InputCDR input ((char const*) buffer, + char_len, + ACE_CDR_BYTE_ORDER, + TAO_DEF_GIOP_MAJOR, + TAO_DEF_GIOP_MINOR, + orb->orb_core ()); + + // Read ev1 from CDR, this should fail (we actually encoded a ev0), + // but *NOT* leak memory. + test::event1_var ev1; + if (input >> ev1.out ()) + { + ACE_ERROR_RETURN ((LM_DEBUG, + "ERROR: unmarshal shouldn't work\n"), + -1); + } + + ACE_DEBUG ((LM_DEBUG, + "Test passed.\n")); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ( + "Caught exception in server:"); + return 1; + } + + return 0; +} diff --git a/tests/Bug_3941_Regression/test.idl b/tests/Bug_3941_Regression/test.idl new file mode 100644 index 00000000000..6bb4c5056be --- /dev/null +++ b/tests/Bug_3941_Regression/test.idl @@ -0,0 +1,15 @@ +// $Id$ + +module test { + abstract valuetype EventBase { }; + + valuetype event0 : EventBase + { + public string message; + }; + + valuetype event1 : EventBase + { + public long l; + }; +}; diff --git a/tests/Bug_3942_Regression/Bug_3942_Regression.cpp b/tests/Bug_3942_Regression/Bug_3942_Regression.cpp new file mode 100644 index 00000000000..2efbc1589ae --- /dev/null +++ b/tests/Bug_3942_Regression/Bug_3942_Regression.cpp @@ -0,0 +1,85 @@ +// $Id$ +#include "FooS.h" +#include "tao/LocalObject.h" +#include "tao/Version.h" + +#if TAO_MAJOR_VERSION < 2 && TAO_MINOR_VERSION < 6 +# define RV refcount_.value +#else +# define RV _refcount_value +#endif + +#define ASSERT_REFCOUNT(count, message) \ + if (ximpl->RV () != count) \ + { \ + ACE_ERROR_RETURN((LM_ERROR, ACE_TEXT("%l %C: expected %d actual %d\n"), \ + message, count, ximpl->RV ()), -1); \ + } + +struct XImpl +#ifdef LOCAL + : X +# if TAO_MAJOR_VERSION < 2 && TAO_MINOR_VERSION < 6 +// FUZZ: disable check_for_TAO_Local_RefCounted_Object + , TAO_Local_RefCounted_Object +# endif +#else + : POA_X +#endif +{ +#if defined LOCAL && (TAO_MAJOR_VERSION < 2 && TAO_MINOR_VERSION < 6) + unsigned long _refcount_value () const { return refcount_.value (); } +#endif + + void op () {} +}; + +int ACE_TMAIN (int, ACE_TCHAR *[]) +{ +#ifdef LOCAL + XImpl* ximpl = new XImpl; + X_var x = ximpl; +#else + int zero_args = 0; + CORBA::ORB_var orb = CORBA::ORB_init (zero_args, + static_cast<ACE_TCHAR **> (0)); + CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); + PortableServer::POA_var poa = PortableServer::POA::_narrow (obj); + XImpl* x_servant = new XImpl; + PortableServer::ServantBase_var sbv (x_servant); + X_var x = x_servant->_this (); + X* ximpl = x; +#endif + + ASSERT_REFCOUNT (1, "baseline"); + + { + Y y; + y.theX = x; + ASSERT_REFCOUNT (2, "in struct"); + X_var x2 = y.theX; + ASSERT_REFCOUNT (3, "from struct"); + } + + ASSERT_REFCOUNT (1, "baseline reestablished"); + + { + XSeq xseq (1); + xseq.length (1); + xseq[0] = x; + ASSERT_REFCOUNT (2, "in sequence"); +#ifdef _MSC_VER + // For now, only attempt to compile this on MSVC -- it doesn't compile + // on GCC (and possibly others) due to: + // error: conversion from 'TAO::details::object_reference_sequence_element<TAO::details::object_reference_traits<X, TAO_Objref_Var_T<X>, true> >' to non-scalar type 'X_var' requested + // When the bug is fixed, the #ifdef should be removed. Until then, the + // test will appear to pass on other compilers, but the MSVC failures should + // be enough to notice that the bug needs fixing. + X_var x2 = xseq[0]; + if (ximpl->RV () < 3) x2._retn (); // avoid a crash + ASSERT_REFCOUNT (3, "from sequence"); +#endif + } + + return 0; +} diff --git a/tests/Bug_3942_Regression/Bug_3942_Regression.mpc b/tests/Bug_3942_Regression/Bug_3942_Regression.mpc new file mode 100644 index 00000000000..2d2ba812208 --- /dev/null +++ b/tests/Bug_3942_Regression/Bug_3942_Regression.mpc @@ -0,0 +1,5 @@ +// $Id$ +project: taoexe { + macros += LOCAL + idlflags += -DLOCAL +} diff --git a/tests/Bug_3942_Regression/Foo.idl b/tests/Bug_3942_Regression/Foo.idl new file mode 100644 index 00000000000..a3d1a343e9b --- /dev/null +++ b/tests/Bug_3942_Regression/Foo.idl @@ -0,0 +1,12 @@ +// $Id$ + +#ifdef LOCAL +local +#endif +interface X { + void op(); +}; +struct Y { + X theX; +}; +typedef sequence<X> XSeq; diff --git a/tests/Bug_3942_Regression/run_test.pl b/tests/Bug_3942_Regression/run_test.pl new file mode 100755 index 00000000000..10298b7d280 --- /dev/null +++ b/tests/Bug_3942_Regression/run_test.pl @@ -0,0 +1,20 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; +use strict; + +my $target = PerlACE::TestTarget::create_target(1) + or die "Create target failed\n"; +my $test = $target->CreateProcess("Bug_3942_Regression"); +my $result = $test->SpawnWaitKill($target->ProcessStartWaitInterval()); +if ($result != 0) { + print STDERR "ERROR: test returned $result\n"; + exit 1; +} +exit 0; diff --git a/tests/Bug_3953_Regression/Bug_3953_Regression.mpc b/tests/Bug_3953_Regression/Bug_3953_Regression.mpc new file mode 100644 index 00000000000..ad221b73797 --- /dev/null +++ b/tests/Bug_3953_Regression/Bug_3953_Regression.mpc @@ -0,0 +1,34 @@ +// -*- MPC -*- +// $Id$ + +project(*_Idl): taoidldefaults { + IDL_Files { + test.idl + } + custom_only = 1 +} + +project(*_Server): taoserver, messaging { + after += *_Idl + Source_Files { + testC.cpp + testS.cpp + server_i.cpp + server.cpp + } + IDL_Files { + } +} + +project(*_Client): taoserver { + exename = client + after += *_Idl + Source_Files { + testC.cpp + testS.cpp + client_i.cpp + client.cpp + } + IDL_Files { + } +} diff --git a/tests/Bug_3953_Regression/README b/tests/Bug_3953_Regression/README new file mode 100644 index 00000000000..ab058d902f6 --- /dev/null +++ b/tests/Bug_3953_Regression/README @@ -0,0 +1,9 @@ +This is a test of the nested upcall feature in TAO using mt_noupcall. +start off by calling the server and providing a callback object and a +time-to-live number. The server will callback the client (using the +callback object) and decrement the time-to-live number. + +With mt_noupcall enabled the client should drop the nested upcall from the +server and which leads to a timeout exception in the server and than in the +client. + diff --git a/tests/Bug_3953_Regression/client.cpp b/tests/Bug_3953_Regression/client.cpp new file mode 100644 index 00000000000..38dd592717e --- /dev/null +++ b/tests/Bug_3953_Regression/client.cpp @@ -0,0 +1,167 @@ +// $Id$ + +#include "client_i.h" +#include "ace/Get_Opt.h" +#include "ace/Task.h" + +static const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); +// Server IOR. + +static int shutdown_server = 0; +// Flag to tell server to shutdown. + +static CORBA::UShort call_count = 2; +// # of nested calls to be made. + +static int quiet = 0; +// The test is quiet... + +class Client_Task +{ +public: + Client_Task (client_ptr c, + server_ptr s); + int svc (void); + + bool exception (void) const; + +private: + client_var client_; + server_var server_; +}; + +Client_Task::Client_Task (client_ptr c, + server_ptr s) + : client_ (client::_duplicate (c)), + server_ (server::_duplicate (s)) +{ +} + +int +Client_Task::svc (void) +{ + try + { + if (!quiet) + ACE_DEBUG ((LM_DEBUG, + "(%t) Client_Task::svc calling start -> time to live = %d\n", + call_count)); + + // Now, we can invoke an operation on the remote side. + this->server_->start (this->client_.in (), + call_count); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Client_Task::svc"); + return -1; + } + return 0; +} + +static int +parse_args (int argc, + ACE_TCHAR **argv) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("qxn:k:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'q': + quiet = 1; + break; + + case 'x': + shutdown_server = 1; + break; + + case 'n': + call_count = ACE_OS::atoi (get_opts.opt_arg ()); + break; + + case 'k': + ior = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s" + " [-n number of nested calls]" + " [-k ior]" + " [-q (quite)]" + " [-x (shutdown server)]" + "\n", + argv[0]), + -1); + } + + if (ior == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "%s: no nested up calls server ior specified\n", + argv[0]), + -1); + + // Indicates successful parsing of command line. + return 0; +} + +int +ACE_TMAIN (int argc, + ACE_TCHAR **argv) +{ + int result = 0; + try + { + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + + result = parse_args (argc, argv); + if (result != 0) + return result; + + CORBA::Object_var object = orb->resolve_initial_references ("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (object.in ()); + + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (); + + poa_manager->activate (); + + object = orb->string_to_object (ior); + + server_var server = server::_narrow (object.in ()); + + // Create an client object to hand to the other side... + client_i client_servant (quiet, + server.in ()); + + PortableServer::ObjectId_var id = + root_poa->activate_object (&client_servant); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + + client_var client_object = client::_narrow (object_act.in ()); + + Client_Task client_tasks (client_object.in (), + server.in ()); + + client_tasks.svc (); + + if (shutdown_server) + { + server->shutdown (); + } + + root_poa->destroy (1, 1); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("client::main"); + return -1; + } + return result; +} diff --git a/tests/Bug_3953_Regression/client_i.cpp b/tests/Bug_3953_Regression/client_i.cpp new file mode 100644 index 00000000000..7525ef2160c --- /dev/null +++ b/tests/Bug_3953_Regression/client_i.cpp @@ -0,0 +1,26 @@ +// $Id$ + +#include "client_i.h" + +client_i::client_i (int quiet, + server_ptr s) + : quiet_ (quiet), + server_ (server::_duplicate (s)) +{ +} + +void +client_i::ping (CORBA::UShort time_to_live) +{ + if (!this->quiet_) + ACE_DEBUG ((LM_DEBUG, + "(%t) client_i::ping -> time to live = %d\n", + time_to_live)); + + --time_to_live; + + if (time_to_live > 0) + { + this->server_->ping (time_to_live); + } +} diff --git a/tests/Bug_3953_Regression/client_i.h b/tests/Bug_3953_Regression/client_i.h new file mode 100644 index 00000000000..b0d308f04b8 --- /dev/null +++ b/tests/Bug_3953_Regression/client_i.h @@ -0,0 +1,20 @@ +// $Id$ + +#include "testS.h" + +class client_i : public POA_client +{ +public: + client_i (int quiet, + server_ptr s); + // Constructor. + + void ping (CORBA::UShort time_to_live); + +private: + int quiet_; + // Be quiet. + + server_var server_; + // Pointer to server. +}; diff --git a/tests/Bug_3953_Regression/run_test.pl b/tests/Bug_3953_Regression/run_test.pl new file mode 100755 index 00000000000..5d3abb11162 --- /dev/null +++ b/tests/Bug_3953_Regression/run_test.pl @@ -0,0 +1,76 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; + +$status = 0; +$debug_level = '0'; + +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } +} + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +my $iorbase = "server.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -f $server_iorfile"); +$CL = $client->CreateProcess ("client", "-ORBdebuglevel $debug_level -k file://$client_iorfile -x"); + +print STDERR "\nrunning ST version of the client and the server\n\n"; + +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; +} + +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 45); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; + $status = 1; +} + +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + $status = 1; +} + +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +exit $status; diff --git a/tests/Bug_3953_Regression/server.cpp b/tests/Bug_3953_Regression/server.cpp new file mode 100644 index 00000000000..64f35567258 --- /dev/null +++ b/tests/Bug_3953_Regression/server.cpp @@ -0,0 +1,198 @@ +// $Id$ + +#include "server_i.h" + +#include "ace/Get_Opt.h" +#include "ace/Task.h" +#include "tao/Messaging/Messaging.h" + +static int quiet = 0; +// The test is quiet... + +static const ACE_TCHAR *ior_file = ACE_TEXT ("test.ior"); +// File of file to which the ior is written + +static int number_of_threads = 1; +// Number of server threads. + +class Server_Task : public ACE_Task_Base +{ +public: + Server_Task (CORBA::ORB_ptr orb); + int svc (void); + +private: + CORBA::ORB_var orb_; +}; + +Server_Task::Server_Task (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + +int +Server_Task::svc (void) +{ + try + { + CORBA::Object_var object = + this->orb_->resolve_initial_references ("PolicyCurrent"); + + CORBA::PolicyCurrent_var policy_current = + CORBA::PolicyCurrent::_narrow (object.in ()); + + TimeBase::TimeT timeout_period = 100 * 100000; + + CORBA::Any timeout_as_any; + timeout_as_any <<= timeout_period; + + CORBA::PolicyList policy_list (1); + policy_list.length (1); + policy_list[0] = + this->orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, + timeout_as_any); + + policy_current->set_policy_overrides (policy_list, + CORBA::ADD_OVERRIDE); + + policy_list[0]->destroy(); + + this->orb_->run (); + } + catch (const CORBA::Exception&) + { + return -1; + } + return 0; +} + +static int +write_ior_to_file (const char *ior) +{ + FILE *output_file = ACE_OS::fopen (ior_file, "w"); + + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IOR: %s\n", + ior_file), + -1); + + int result = 0; + + result = ACE_OS::fprintf (output_file, + "%s", + ior); + if (result < 0 || + static_cast<size_t> (result) != ACE_OS::strlen (ior)) + ACE_ERROR_RETURN ((LM_ERROR, + "ACE_OS::fprintf failed while writing %C to %s\n", + ior, + ior_file), + -1); + + ACE_OS::fclose (output_file); + + return 0; +} + +static int +parse_args (int argc, + ACE_TCHAR **argv) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("q:f:t:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'q': + quiet = 1; + break; + + case 't': + number_of_threads = ACE_OS::atoi (get_opts.opt_arg ()); + break; + + case 'f': + ior_file = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s" + " [-t number of threads]" + " [-f ior file]" + " [-q (quite)]" + "\n", + argv[0]), + -1); + } + + return 0; +} + +int +ACE_TMAIN (int argc, ACE_TCHAR **argv) +{ + int result = 0; + + try + { + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + + result = parse_args (argc, argv); + if (result != 0) + return result; + + CORBA::Object_var object = orb->resolve_initial_references ("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (object.in ()); + + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (); + + poa_manager->activate (); + + server_i server_servant (quiet, + orb.in ()); + + PortableServer::ObjectId_var id = + root_poa->activate_object (&server_servant); + + CORBA::Object_var object_act = root_poa->id_to_reference (id.in ()); + + server_var server_object = server::_narrow (object_act.in ()); + + CORBA::String_var ior = orb->object_to_string (server_object.in ()); + + result = write_ior_to_file (ior.in ()); + if (result != 0) + return result; + + Server_Task server_tasks (orb.in ()); + + result = server_tasks.activate (THR_BOUND, + number_of_threads); + + if (result != 0) + return result; + + result = ACE_Thread_Manager::instance ()->wait (); + + if (result != 0) + return result; + + root_poa->destroy (1, 1); + + if (!server_servant.exception ()) + ++result; + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("server::main"); + return -1; + } + + return result; +} diff --git a/tests/Bug_3953_Regression/server_i.cpp b/tests/Bug_3953_Regression/server_i.cpp new file mode 100644 index 00000000000..d0a374dc038 --- /dev/null +++ b/tests/Bug_3953_Regression/server_i.cpp @@ -0,0 +1,56 @@ +// $Id$ + +#include "server_i.h" + +server_i::server_i (int quiet, + CORBA::ORB_ptr orb) + : quiet_ (quiet), + orb_ (CORBA::ORB::_duplicate (orb)), + exception_ (false) +{ +} + +void +server_i::start (client_ptr c, + CORBA::UShort time_to_live) +{ + this->client_ = client::_duplicate (c); + this->ping (time_to_live); +} + +bool +server_i::exception (void) const +{ + return this->exception_; +} + +void +server_i::ping (CORBA::UShort time_to_live) +{ + if (!this->quiet_) + ACE_DEBUG ((LM_DEBUG, + "(%t) server_i::ping -> time to live = %d\n", + time_to_live)); + + try + { + --time_to_live; + + if (time_to_live > 0) + { + this->client_->ping (time_to_live); + } + } + catch (const CORBA::TIMEOUT&) + { + this->exception_ = true; + ACE_DEBUG ((LM_DEBUG, + "server ping received an expected except.\n")); + } +} + +void +server_i::shutdown (void) +{ + this->orb_->shutdown (0); +} diff --git a/tests/Bug_3953_Regression/server_i.h b/tests/Bug_3953_Regression/server_i.h new file mode 100644 index 00000000000..a60c9f8876d --- /dev/null +++ b/tests/Bug_3953_Regression/server_i.h @@ -0,0 +1,30 @@ +// $Id$ + +#include "testS.h" + +class server_i : public POA_server +{ +public: + server_i (int quiet, + CORBA::ORB_ptr orb); + + void ping (CORBA::UShort time_to_live); + + void start (client_ptr c, + CORBA::UShort time_to_live); + + void shutdown (void); + + bool exception (void) const; +private: + int quiet_; + // Be quiet. + + client_var client_; + // Pointer to server. + + CORBA::ORB_var orb_; + // Pointer to orb. + + bool exception_; +}; diff --git a/tests/Bug_3953_Regression/svc.conf b/tests/Bug_3953_Regression/svc.conf new file mode 100644 index 00000000000..1878e4a33c5 --- /dev/null +++ b/tests/Bug_3953_Regression/svc.conf @@ -0,0 +1,3 @@ +# $Id$ + +static Client_Strategy_Factory '-ORBWaitStrategy mt_noupcall' diff --git a/tests/Bug_3953_Regression/svc.conf.xml b/tests/Bug_3953_Regression/svc.conf.xml new file mode 100644 index 00000000000..91c9afd3b3e --- /dev/null +++ b/tests/Bug_3953_Regression/svc.conf.xml @@ -0,0 +1,5 @@ +<?xml version='1.0'?> +<ACE_Svc_Conf> + <!-- $Id$ --> + <static Client_Strategy_Factory '-ORBWaitStrategy mt_noupcall'"> +</ACE_Svc_Conf> diff --git a/tests/Bug_3953_Regression/test.idl b/tests/Bug_3953_Regression/test.idl new file mode 100644 index 00000000000..45664cfb035 --- /dev/null +++ b/tests/Bug_3953_Regression/test.idl @@ -0,0 +1,38 @@ +// $Id$ +// +// ============================================================================ +// +// = LIBRARY +// TAO/tests/NestedUpcall +// +// = FILENAME +// test.idl +// +// = DESCRIPTION +// A simple test of nested upcalls. +// +// = AUTHOR +// Irfan Pyarali +// +// ============================================================================ + +interface client +{ + void ping (in unsigned short time_to_live); + // Decrements <time_to_live>. If <time_to_live> becomes zero, it + // stops. Otherwise, it pings the server. +}; + +interface server +{ + void start (in client c, + in unsigned short time_to_live); + // Turns around and starts pinging the client. + + void ping (in unsigned short time_to_live); + // Decrements <time_to_live>. If <time_to_live> becomes zero, it + // stops. Otherwise, it pings the client. + + oneway void shutdown (); + // Shutdown the server. +}; diff --git a/tests/Bug_3954_Regression/Bug_3954_Regression.mpc b/tests/Bug_3954_Regression/Bug_3954_Regression.mpc new file mode 100644 index 00000000000..fbab84719e4 --- /dev/null +++ b/tests/Bug_3954_Regression/Bug_3954_Regression.mpc @@ -0,0 +1,37 @@ +// -*- MPC -*- +// $Id$ + +project(*idl): taoidldefaults { + idlflags += -Sp + IDL_Files { + Test.idl + } + custom_only = 1 +} + +project(*Server): taoserver { + after += *idl + Source_Files { + Hello.cpp + server.cpp + } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } +} + +project(*Client): taoclient { + after += *idl + Source_Files { + client.cpp + } + Source_Files { + TestC.cpp + } + IDL_Files { + } +} + diff --git a/tests/Bug_3954_Regression/Hello.cpp b/tests/Bug_3954_Regression/Hello.cpp new file mode 100644 index 00000000000..df49d37a507 --- /dev/null +++ b/tests/Bug_3954_Regression/Hello.cpp @@ -0,0 +1,19 @@ +// $Id$ +#include "Hello.h" + +Hello::Hello (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + +char * +Hello::get_string (void) +{ + return CORBA::string_dup ("Hello there!"); +} + +void +Hello::shutdown (void) +{ + this->orb_->shutdown (0); +} diff --git a/tests/Bug_3954_Regression/Hello.h b/tests/Bug_3954_Regression/Hello.h new file mode 100644 index 00000000000..f87205c3011 --- /dev/null +++ b/tests/Bug_3954_Regression/Hello.h @@ -0,0 +1,31 @@ +// +// $Id$ +// + +#ifndef HELLO_H +#define HELLO_H +#include /**/ "ace/pre.h" + +#include "TestS.h" + +/// Implement the Test::Hello interface +class Hello + : public virtual POA_Test::Hello +{ +public: + /// Constructor + Hello (CORBA::ORB_ptr orb); + + // = The skeleton methods + virtual char * get_string (void); + + virtual void shutdown (void); + +private: + /// Use an ORB reference to conver strings to objects and shutdown + /// the application. + CORBA::ORB_var orb_; +}; + +#include /**/ "ace/post.h" +#endif /* HELLO_H */ diff --git a/tests/Bug_3954_Regression/README b/tests/Bug_3954_Regression/README new file mode 100644 index 00000000000..7960a9143e0 --- /dev/null +++ b/tests/Bug_3954_Regression/README @@ -0,0 +1,11 @@ +/** + +@page Hello Test README File + +Test whether wait strategy mt_noupcall works with just basic hello server + +$ ./run_test.pl + + the script returns 0 if the test was successful. + +*/ diff --git a/tests/Bug_3954_Regression/Test.idl b/tests/Bug_3954_Regression/Test.idl new file mode 100644 index 00000000000..3c0976e106d --- /dev/null +++ b/tests/Bug_3954_Regression/Test.idl @@ -0,0 +1,20 @@ +// +// $Id$ +// + +/// Put the interfaces in a module, to avoid global namespace pollution +module Test +{ + /// A very simple interface + interface Hello + { + /// Return a simple string + string get_string (); + + /// A method to shutdown the ORB + /** + * This method is used to simplify the test shutdown process + */ + oneway void shutdown (); + }; +}; diff --git a/tests/Bug_3954_Regression/client.cpp b/tests/Bug_3954_Regression/client.cpp new file mode 100644 index 00000000000..1bb3e718137 --- /dev/null +++ b/tests/Bug_3954_Regression/client.cpp @@ -0,0 +1,72 @@ +// $Id$ + +#include "TestC.h" +#include "ace/Get_Opt.h" + +const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'k': + ior = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-k <ior> " + "\n", + argv [0]), + -1); + } + // Indicates successful parsing of the command line + return 0; +} + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + try + { + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + + if (parse_args (argc, argv) != 0) + return 1; + + CORBA::Object_var tmp = orb->string_to_object(ior); + + Test::Hello_var hello = Test::Hello::_narrow(tmp.in ()); + + if (CORBA::is_nil (hello.in ())) + { + ACE_ERROR_RETURN ((LM_DEBUG, + "Nil Test::Hello reference <%s>\n", + ior), + 1); + } + + CORBA::String_var the_string = hello->get_string (); + + ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%C>\n", + the_string.in ())); + + hello->shutdown (); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + return 1; + } + + return 0; +} diff --git a/tests/Bug_3954_Regression/run_test.pl b/tests/Bug_3954_Regression/run_test.pl new file mode 100755 index 00000000000..f2566947eaf --- /dev/null +++ b/tests/Bug_3954_Regression/run_test.pl @@ -0,0 +1,73 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; + +$status = 0; +$debug_level = '0'; + +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } +} + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +my $iorbase = "server.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); +$CL = $client->CreateProcess ("client", "-ORBDebuglevel $debug_level -k file://$client_iorfile"); +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; +} + +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval()); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; + $status = 1; +} + +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + $status = 1; +} + +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +exit $status; diff --git a/tests/Bug_3954_Regression/server.cpp b/tests/Bug_3954_Regression/server.cpp new file mode 100644 index 00000000000..205a7c179e0 --- /dev/null +++ b/tests/Bug_3954_Regression/server.cpp @@ -0,0 +1,101 @@ +// $Id$ + +#include "Hello.h" +#include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" + +const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'o': + ior_output_file = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-o <iorfile>" + "\n", + argv [0]), + -1); + } + // Indicates successful parsing of the command line + return 0; +} + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + try + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + + CORBA::Object_var poa_object = + orb->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + if (CORBA::is_nil (root_poa.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Panic: nil RootPOA\n"), + 1); + + PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); + + if (parse_args (argc, argv) != 0) + return 1; + + Hello *hello_impl = 0; + ACE_NEW_RETURN (hello_impl, + Hello (orb.in ()), + 1); + PortableServer::ServantBase_var owner_transfer(hello_impl); + + PortableServer::ObjectId_var id = + root_poa->activate_object (hello_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Test::Hello_var hello = Test::Hello::_narrow (object.in ()); + + CORBA::String_var ior = orb->object_to_string (hello.in ()); + + // Output the IOR to the <ior_output_file> + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s\n", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + + poa_manager->activate (); + + orb->run (); + + ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); + + root_poa->destroy (1, 1); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + return 1; + } + + return 0; +} diff --git a/tests/Bug_3954_Regression/svc.conf b/tests/Bug_3954_Regression/svc.conf new file mode 100644 index 00000000000..1878e4a33c5 --- /dev/null +++ b/tests/Bug_3954_Regression/svc.conf @@ -0,0 +1,3 @@ +# $Id$ + +static Client_Strategy_Factory '-ORBWaitStrategy mt_noupcall' diff --git a/tests/Bug_3954_Regression/test.pl b/tests/Bug_3954_Regression/test.pl new file mode 100755 index 00000000000..cd1181052d6 --- /dev/null +++ b/tests/Bug_3954_Regression/test.pl @@ -0,0 +1,73 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; + +$status = 0; +$debug_level = '0'; + +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } +} + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +my $iorbase = "server.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("server", "-o $server_iorfile"); +$CL = $client->CreateProcess ("client", "-k file://$client_iorfile"); +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; +} + +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval()); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; + $status = 1; +} + +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + $status = 1; +} + +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +exit $status; diff --git a/tests/Bug_933_Regression/Makefile.am b/tests/Bug_933_Regression/Makefile.am deleted file mode 100644 index 92cce8158c8..00000000000 --- a/tests/Bug_933_Regression/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.Bug_933_Regression_Idl.am - -BUILT_SOURCES = \ - MessengerC.cpp \ - MessengerC.h \ - MessengerC.inl \ - MessengerS.cpp \ - MessengerS.h \ - MessengerS.inl - -CLEANFILES = \ - Messenger-stamp \ - MessengerC.cpp \ - MessengerC.h \ - MessengerC.inl \ - MessengerS.cpp \ - MessengerS.h \ - MessengerS.inl - -MessengerC.cpp MessengerC.h MessengerC.inl MessengerS.cpp MessengerS.h MessengerS.inl: Messenger-stamp - -Messenger-stamp: $(srcdir)/Messenger.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Messenger.idl - @touch $@ - -noinst_HEADERS = \ - Messenger.idl - -## Makefile.Bug_933_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 = \ - MessengerC.cpp \ - MessengerClient.cpp \ - Messenger_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_933_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 = \ - MessengerC.cpp \ - MessengerS.cpp \ - MessengerServer.cpp \ - Messenger_i.cpp \ - Messenger_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/Bug_933_Regression/MessengerClient.cpp b/tests/Bug_933_Regression/MessengerClient.cpp index 4eedb67f458..d21be49dd53 100644 --- a/tests/Bug_933_Regression/MessengerClient.cpp +++ b/tests/Bug_933_Regression/MessengerClient.cpp @@ -28,7 +28,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/tests/Bug_933_Regression/MessengerServer.cpp b/tests/Bug_933_Regression/MessengerServer.cpp index 7f348ed2f6e..37959ffa361 100644 --- a/tests/Bug_933_Regression/MessengerServer.cpp +++ b/tests/Bug_933_Regression/MessengerServer.cpp @@ -27,7 +27,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/tests/CDR/Makefile.am b/tests/CDR/Makefile.am deleted file mode 100644 index 35c44b161a1..00000000000 --- a/tests/CDR/Makefile.am +++ /dev/null @@ -1,152 +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) - -noinst_PROGRAMS = - -## Makefile.CDR_Alignment.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += alignment - -alignment_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -alignment_SOURCES = \ - alignment.cpp - -alignment_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.CDR_Allocator.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += allocator - -allocator_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -allocator_SOURCES = \ - allocator.cpp - -allocator_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.CDR_Basic_Types.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += basic_types - -basic_types_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -basic_types_SOURCES = \ - basic_types.cpp - -basic_types_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.CDR_Growth.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += growth - -growth_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -growth_SOURCES = \ - growth.cpp - -growth_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.CDR_Octet_Sequence.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += octet_sequence - -octet_sequence_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -octet_sequence_SOURCES = \ - octet_sequence.cpp - -octet_sequence_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.CDR_Tc.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += tc - -tc_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -tc_SOURCES = \ - tc.cpp - -tc_LDADD = \ - $(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/CDR/alignment.cpp b/tests/CDR/alignment.cpp index 4f77c1cf601..bd4b8574737 100644 --- a/tests/CDR/alignment.cpp +++ b/tests/CDR/alignment.cpp @@ -1,21 +1,18 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/CDR -// -// = FILENAME -// alignment.cpp -// -// = DESCRIPTION -// Verifies that octet sequence marshaling does not affect -// marshaling. -// -// = AUTHORS -// Carlos O'Ryan (coryan@cs.wustl.edu) -// -// ============================================================================ + +//============================================================================= +/** + * @file alignment.cpp + * + * $Id$ + * + * Verifies that octet sequence marshaling does not affect + * marshaling. + * + * + * @author Carlos O'Ryan (coryan@cs.wustl.edu) + */ +//============================================================================= + #include "tao/CDR.h" @@ -62,7 +59,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) if (input.read_double (read_dbl) == 0) ACE_DEBUG ((LM_DEBUG, "Failure reading double...\n")); - if (read_dbl != dbl) + if (!ACE::is_equal (read_dbl, dbl)) { status = 1; ACE_DEBUG ((LM_DEBUG, diff --git a/tests/CDR/allocator.cpp b/tests/CDR/allocator.cpp index 9a81adb0688..59feefc454c 100644 --- a/tests/CDR/allocator.cpp +++ b/tests/CDR/allocator.cpp @@ -1,25 +1,22 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/CDR -// -// = FILENAME -// allocator.cpp -// -// = DESCRIPTION -// Compares the performance of a TSS allocator, with no locks, to -// the global allocator (with locks) even in the abscence of -// contention. -// The idea behind this test is to measure the predictability of -// each allocator, specially under the light of potential -// fragmentation in the main allocator. -// -// = AUTHORS -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file allocator.cpp + * + * $Id$ + * + * Compares the performance of a TSS allocator, with no locks, to + * the global allocator (with locks) even in the abscence of + * contention. + * The idea behind this test is to measure the predictability of + * each allocator, specially under the light of potential + * fragmentation in the main allocator. + * + * + * @author Carlos O'Ryan + */ +//============================================================================= + #include "tao/ORB_Core.h" #include "tao/ORB.h" @@ -27,41 +24,44 @@ #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" -ACE_RCSID(CDR, allocator, "$Id$") - #define DEFAULT_BUFFER_SIZE 512 +/** + * @class Application_Simulator + * + * Tries to simulate the behavior of an application: it randomly + * acquires and releases memory, of variable sizes. + * The intention is to produce some level of fragmentation in main + * memory. + */ class Application_Simulator { - // = DESCRIPTION - // Tries to simulate the behavior of an application: it randomly - // acquires and releases memory, of variable sizes. - // The intention is to produce some level of fragmentation in main - // memory. public: + /// Constructor, limits the amount of fragmentation and memory this + /// class takes. Application_Simulator (int max_fragments, int max_fragment_size); - // Constructor, limits the amount of fragmentation and memory this - // class takes. + /// Destructor, releases any memory left behind. ~Application_Simulator (void); - // Destructor, releases any memory left behind. - void upcall (ACE_RANDR_TYPE& seed); - // Simulate an upcall. The class allocates some memory and then - // releases some memory too, the amount of memory allocated and the - // number of allocations is random. + /** + * Simulate an upcall. The class allocates some memory and then + * releases some memory too, the amount of memory allocated and the + * number of allocations is random. + */ + void upcall (unsigned int* seed); private: + /// The allocated buffers. char** buffers_; - // The allocated buffers. + /// The size of the <buffers_> array. int max_fragments_; - // The size of the <buffers_> array. + /// The maximum size of any element of <buffers_> int max_fragment_size_; - // The maximum size of any element of <buffers_> }; int @@ -78,7 +78,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int max_arguments = 16; int max_argument_size = 1024; int quiet = 0; - ACE_RANDR_TYPE seed = static_cast<ACE_RANDR_TYPE> (ACE_OS::time(0)); + unsigned int seed = static_cast<unsigned int> (ACE_OS::time(0)); ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("tn:f:m:s:a:b:r:q")); int opt; @@ -153,13 +153,13 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int* argument_sizes; ACE_NEW_RETURN (argument_sizes, int[max_arguments], 1); - int n = ACE_OS::rand_r (seed) % max_arguments + 1; + int n = ACE_OS::rand_r (&seed) % max_arguments + 1; for (int k = 0; k < n; ++k) - argument_sizes[k] = ACE_OS::rand_r (seed) % max_argument_size + 1; + argument_sizes[k] = ACE_OS::rand_r (&seed) % max_argument_size + 1; for (int i = 0; i < iterations; ++i) { - simulator.upcall (seed); + simulator.upcall (&seed); // @@ TODO this is the place to put the other allocators. ACE_High_Res_Timer cdr_encoding; @@ -227,7 +227,7 @@ Application_Simulator::~Application_Simulator (void) } void -Application_Simulator::upcall (ACE_RANDR_TYPE& seed) +Application_Simulator::upcall (unsigned int* seed) { for (char** i = this->buffers_; i != this->buffers_ + this->max_fragments_; diff --git a/tests/CDR/basic_types.cpp b/tests/CDR/basic_types.cpp index 6064e05ece0..b4341bddaf0 100644 --- a/tests/CDR/basic_types.cpp +++ b/tests/CDR/basic_types.cpp @@ -1,21 +1,18 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/CDR -// -// = FILENAME -// basic_types.cpp -// -// = DESCRIPTION -// Test the basic funcionality of a CDR stream by encoding some -// basic types and then decoding them again. -// -// = AUTHORS -// Carlos O'Ryan -// -// ============================================================================ +//============================================================================= +/** + * @file basic_types.cpp + * + * $Id$ + * + * Test the basic funcionality of a CDR stream by encoding some + * basic types and then decoding them again. + * + * + * @author Carlos O'Ryan + */ +//============================================================================= + #include "tao/ORB.h" #include "tao/debug.h" @@ -25,10 +22,6 @@ #include "ace/Get_Opt.h" #include "ace/Log_Msg.h" -ACE_RCSID (CDR, - basic_types, - "$Id$") - static int n = 4096; static int nloops = 100; diff --git a/tests/CDR/growth.cpp b/tests/CDR/growth.cpp index 5997edbe1c2..270aff91fb4 100644 --- a/tests/CDR/growth.cpp +++ b/tests/CDR/growth.cpp @@ -1,21 +1,18 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/CDR -// -// = FILENAME -// growth.cpp -// -// = DESCRIPTION -// Helps in measuring how the growth strategy affects the -// performance of CDR streams. -// -// = AUTHORS -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file growth.cpp + * + * $Id$ + * + * Helps in measuring how the growth strategy affects the + * performance of CDR streams. + * + * + * @author Carlos O'Ryan + */ +//============================================================================= + #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" @@ -26,8 +23,6 @@ #include "tao/CDR.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(CDR, growth, "$Id$") - static int test_write (TAO_OutputCDR &cdr, int n) { diff --git a/tests/CDR/octet_sequence.cpp b/tests/CDR/octet_sequence.cpp index 8518aec1aec..22888c58360 100644 --- a/tests/CDR/octet_sequence.cpp +++ b/tests/CDR/octet_sequence.cpp @@ -1,22 +1,18 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/CDR -// -// = FILENAME -// octet_sequence.cpp -// -// = DESCRIPTION -// Verifies that reference counting is performed correctly for octet -// sequence marshaling. -// -// = AUTHORS -// Dave Meyer (dmeyer@std.saic.com) -// Carlos O'Ryan (coryan@cs.wustl.edu) -// -// ============================================================================ +//============================================================================= +/** + * @file octet_sequence.cpp + * + * $Id$ + * + * Verifies that reference counting is performed correctly for octet + * sequence marshaling. + * + * + * @author Dave Meyer (dmeyer@std.saic.com)Carlos O'Ryan (coryan@cs.wustl.edu) + */ +//============================================================================= + #include "ace/Log_Msg.h" diff --git a/tests/CDR/tc.cpp b/tests/CDR/tc.cpp index 5d54012c4af..f15126eceb2 100644 --- a/tests/CDR/tc.cpp +++ b/tests/CDR/tc.cpp @@ -1,21 +1,18 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/CDR -// -// = FILENAME -// tc.cpp -// -// = DESCRIPTION -// Verify that the basic typecodes are able to interpret their CDR -// buffers. -// -// = AUTHORS -// Carlos O'Ryan -// -// ============================================================================ +//============================================================================= +/** + * @file tc.cpp + * + * $Id$ + * + * Verify that the basic typecodes are able to interpret their CDR + * buffers. + * + * + * @author Carlos O'Ryan + */ +//============================================================================= + #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Constants.h" @@ -25,14 +22,8 @@ #include "ace/Log_Msg.h" - -ACE_RCSID (CDR, - tc, - "$Id$") - // In this version of TAO typecodes are based on CDR, we have to // verify that CDR offers the services needed for Typecode... - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { diff --git a/tests/COIOP/COIOP_Test.cpp b/tests/COIOP/COIOP_Test.cpp index 6d20ffbb864..3307a10c1fc 100644 --- a/tests/COIOP/COIOP_Test.cpp +++ b/tests/COIOP/COIOP_Test.cpp @@ -40,7 +40,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) // This is a hack but that is okay! return 0; } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/COIOP/Client_Task.cpp b/tests/COIOP/Client_Task.cpp index 802bb456e7b..4618639b2b0 100644 --- a/tests/COIOP/Client_Task.cpp +++ b/tests/COIOP/Client_Task.cpp @@ -1,13 +1,10 @@ -// +// -*- C++ -*- // $Id$ -// #include "Client_Task.h" #include "tao/ORB_Core.h" #include "TestC.h" -ACE_RCSID(Muxing, Client_Task, "$Id$") - Client_Task::Client_Task (const ACE_TCHAR *ior, CORBA::ORB_ptr corb, ACE_Thread_Manager *thr_mgr, diff --git a/tests/COIOP/Hello.cpp b/tests/COIOP/Hello.cpp index 5d2383f3a68..71272b4add1 100644 --- a/tests/COIOP/Hello.cpp +++ b/tests/COIOP/Hello.cpp @@ -1,18 +1,16 @@ -// +// -*- C++ -*- // $Id$ -// + #include "Hello.h" #include "tao/ORB_Core.h" #include "tao/ORB_Table.h" #include "tao/ORB_Core_Auto_Ptr.h" #include "tao/Strategies/advanced_resource.h" -ACE_RCSID(Hello, Hello, "$Id$") - - Hello::Hello (CORBA::ORB_ptr orb, - ACE_thread_t thrid) - : orb_ (CORBA::ORB::_duplicate (orb)) - , thr_id_ (thrid) +Hello::Hello (CORBA::ORB_ptr orb, + ACE_thread_t thrid) +: orb_ (CORBA::ORB::_duplicate (orb)) + , thr_id_ (thrid) { } diff --git a/tests/COIOP/Hello.h b/tests/COIOP/Hello.h index 556409e5d00..1d5e27d075f 100644 --- a/tests/COIOP/Hello.h +++ b/tests/COIOP/Hello.h @@ -8,8 +8,6 @@ #include "TestS.h" -#include "ace/OS.h" - /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello diff --git a/tests/COIOP/Makefile.am b/tests/COIOP/Makefile.am deleted file mode 100644 index 02a21c418f1..00000000000 --- a/tests/COIOP/Makefile.am +++ /dev/null @@ -1,119 +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.COIOP_Tests_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.COIOP_Simple_Test.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += COIOP_Simple_Test - -COIOP_Simple_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -COIOP_Simple_Test_SOURCES = \ - COIOP_Simple_Test.cpp \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - Hello.h - -COIOP_Simple_Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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.COIOP_Test.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += COIOP_Test - -COIOP_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -COIOP_Test_SOURCES = \ - COIOP_Test.cpp \ - Client_Task.cpp \ - Hello.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - Client_Task.h \ - Hello.h \ - Server_Task.h - -COIOP_Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/COIOP/Server_Task.cpp b/tests/COIOP/Server_Task.cpp index f2f09819674..f7bf8b30613 100644 --- a/tests/COIOP/Server_Task.cpp +++ b/tests/COIOP/Server_Task.cpp @@ -1,17 +1,12 @@ -// +// -*- C++ -*- // $Id$ -// + #include "Server_Task.h" #include "TestS.h" #include "Hello.h" #include "ace/Manual_Event.h" -ACE_RCSID(Collocated_Test, - Server_Task, - "$Id$") - - Server_Task::Server_Task (const ACE_TCHAR *output, CORBA::ORB_ptr sorb, ACE_Manual_Event &me, diff --git a/tests/CORBA_e_Implicit_Activation/Hello.cpp b/tests/CORBA_e_Implicit_Activation/Hello.cpp index bd54904034f..8f65ca11062 100644 --- a/tests/CORBA_e_Implicit_Activation/Hello.cpp +++ b/tests/CORBA_e_Implicit_Activation/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (void) { } diff --git a/tests/CORBA_e_Implicit_Activation/Makefile.am b/tests/CORBA_e_Implicit_Activation/Makefile.am deleted file mode 100644 index fd36f2a9a95..00000000000 --- a/tests/CORBA_e_Implicit_Activation/Makefile.am +++ /dev/null @@ -1,80 +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) - - -## Makefile.CORBA_e_Implicit_Activation.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) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_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/CORBA_e_Implicit_Activation/server.cpp b/tests/CORBA_e_Implicit_Activation/server.cpp index 73fd48d4d35..9062a8c7220 100644 --- a/tests/CORBA_e_Implicit_Activation/server.cpp +++ b/tests/CORBA_e_Implicit_Activation/server.cpp @@ -3,10 +3,6 @@ #include "Hello.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/tests/CSD_Collocation/Collocation.cpp b/tests/CSD_Collocation/Collocation.cpp index 22932237fef..1daaff56119 100644 --- a/tests/CSD_Collocation/Collocation.cpp +++ b/tests/CSD_Collocation/Collocation.cpp @@ -7,8 +7,6 @@ #include "tao/CSD_ThreadPool/CSD_ThreadPool.h" #include "ace/Thread_Manager.h" -ACE_RCSID(Collocation, main, "$Id$") - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try diff --git a/tests/CSD_Collocation/Collocation_Tester.h b/tests/CSD_Collocation/Collocation_Tester.h index 8756a731843..025f0398008 100644 --- a/tests/CSD_Collocation/Collocation_Tester.h +++ b/tests/CSD_Collocation/Collocation_Tester.h @@ -1,18 +1,17 @@ -// $Id$ - -//============================================================================ -// -// = FILENAME -// Collocation_Test.h -// -// = DESCRIPTION -// Server class to perform testing of TAO's collocation mechanism. -// -// = AUTHOR -// Nanbor Wang -// + +//============================================================================= +/** + * @file Collocation_Tester.h + * + * $Id$ + * + * Server class to perform testing of TAO's collocation mechanism. + * + * @author Nanbor Wang + */ //============================================================================= + #if !defined (TAO_COLLOCATION_TEST_H) #define TAO_COLLOCATION_TEST_H @@ -29,18 +28,18 @@ public: void shutdown (void); + /// Initializing the Collocation_Test object. int init (int argc, ACE_TCHAR *argv[]); - // Initializing the Collocation_Test object. + /// Parse the test specific arguments. int parse_args (int argc, ACE_TCHAR *argv[]); - // Parse the test specific arguments. + /// This test narrow an object reference to its base class and see + /// if it works correctly. int test_narrow (void); - // This test narrow an object reference to its base class and see - // if it works correctly. + /// Run the test. int run (void); - // Run the test. private: CORBA::ORB_var orb_; @@ -49,14 +48,14 @@ private: PortableServer::POAManager_var poa_manager_; + /// Our basic test object. CORBA::Object_var diamond_obj_; - // Our basic test object. + /// A collection of servant for basic narrowing test. Top_i top_servant_; Left_i left_servant_; Right_i right_servant_; Buttom_i diamond_servant_; - // A collection of servant for basic narrowing test. }; #endif /* TAO_COLLOCATION_TEST_H */ diff --git a/tests/CSD_Collocation/Makefile.am b/tests/CSD_Collocation/Makefile.am deleted file mode 100644 index b43b1e71de0..00000000000 --- a/tests/CSD_Collocation/Makefile.am +++ /dev/null @@ -1,89 +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) - - -## Makefile.CSD_Collocation.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -BUILT_SOURCES = \ - DiamondC.cpp \ - DiamondC.h \ - DiamondC.inl \ - DiamondS.cpp \ - DiamondS.h \ - DiamondS.inl - -CLEANFILES = \ - Diamond-stamp \ - DiamondC.cpp \ - DiamondC.h \ - DiamondC.inl \ - DiamondS.cpp \ - DiamondS.h \ - DiamondS.inl - -DiamondC.cpp DiamondC.h DiamondC.inl DiamondS.cpp DiamondS.h DiamondS.inl: Diamond-stamp - -Diamond-stamp: $(srcdir)/Diamond.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Gd -St -Sa $(srcdir)/Diamond.idl - @touch $@ - -noinst_PROGRAMS = Collocation - -Collocation_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocation_SOURCES = \ - Collocation.cpp \ - Collocation_Tester.cpp \ - DiamondC.cpp \ - DiamondS.cpp \ - Diamond_i.cpp \ - Collocation_Tester.h \ - DiamondC.h \ - DiamondC.inl \ - DiamondS.h \ - DiamondS.inl \ - Diamond_i.h - -Collocation_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_THREADS -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/CSD_Collocation/svc.conf b/tests/CSD_Collocation/svc.conf index 285b1297bd4..826ce10d8f7 100644 --- a/tests/CSD_Collocation/svc.conf +++ b/tests/CSD_Collocation/svc.conf @@ -8,7 +8,7 @@ static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocato # Make sure we use RW client handler so if something goes wrong, the program will bloc, # i.e., won't work. -static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW" +static Client_Strategy_Factory "-ORBClientConnectionHandler RW" # Not absolutely necessary for this test, but we add it for fun. -static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null" +static Server_Strategy_Factory "-ORBConcurrency reactive" diff --git a/tests/CSD_Collocation/svc.conf.xml b/tests/CSD_Collocation/svc.conf.xml index 36246c69725..f5c0a307879 100644 --- a/tests/CSD_Collocation/svc.conf.xml +++ b/tests/CSD_Collocation/svc.conf.xml @@ -9,7 +9,7 @@ <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null"/> <!-- Make sure we use RW client handler so if something goes wrong, the program will bloc, --> <!-- i.e., won't work. --> - <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/> + <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/> <!-- Not absolutely necessary for this test, but we add it for fun. --> - <static id="Server_Strategy_Factory" params="-ORBConcurrency reactive -ORBPOALock null"/> + <static id="Server_Strategy_Factory" params="-ORBConcurrency reactive"/> </ACE_Svc_Conf> diff --git a/tests/CSD_Strategy_Tests/Broken/Makefile.am b/tests/CSD_Strategy_Tests/Broken/Makefile.am deleted file mode 100644 index e3676875549..00000000000 --- a/tests/CSD_Strategy_Tests/Broken/Makefile.am +++ /dev/null @@ -1,104 +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) - -noinst_PROGRAMS = - -## Makefile.CSD_TP_Broken_Client.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += client_main - -client_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_B - -client_main_SOURCES = \ - ClientApp.cpp \ - client_main.cpp \ - ClientApp.h - -client_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B - -client_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_B/libCSD_TP_Foo_B.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_THREADS -endif BUILD_EXCEPTIONS - -## Makefile.CSD_TP_Broken_Server.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += server_main - -server_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_B - -server_main_SOURCES = \ - ServerApp.cpp \ - server_main.cpp \ - ServerApp.h - -server_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B - -server_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_B/libCSD_TP_Foo_B.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_THREADS -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/CSD_Strategy_Tests/Broken/ServerApp.cpp b/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp index 5e37ac5617e..4ca2dc82800 100644 --- a/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp +++ b/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp @@ -6,7 +6,6 @@ #include "TestAppExceptionC.h" #include "Foo_B_SimpleClientEngine.h" #include "Callback_i.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" // To force static load the service. #include "tao/PI/PI.h" diff --git a/tests/CSD_Strategy_Tests/Makefile.am b/tests/CSD_Strategy_Tests/Makefile.am deleted file mode 100644 index a8ba990b33b..00000000000 --- a/tests/CSD_Strategy_Tests/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 = \ - TP_Common \ - TP_Foo_A \ - TP_Foo_B \ - Broken \ - TP_Foo_C \ - TP_Test_1 \ - TP_Test_2 \ - TP_Test_3 \ - TP_Test_4 \ - TP_Test_Dynamic \ - TP_Test_Static - diff --git a/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h b/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h index e3b8a8a84eb..1799f1032f3 100644 --- a/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h +++ b/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h @@ -6,7 +6,6 @@ #include "TestAppExceptionC.h" #include "tao/PortableServer/PortableServer.h" #include "tao/ORB.h" -#include "ace/OS.h" #include "ace/Log_Msg.h" diff --git a/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp b/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp index c290dc54c5b..cfb13da0cd9 100644 --- a/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp +++ b/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp @@ -53,12 +53,7 @@ AppShutdown::client_done() return; } - unsigned cur_shutdown; - - { - GuardType guard(this->lock_); - cur_shutdown = ++this->num_clients_shutdown_; - } + unsigned cur_shutdown = ++this->num_clients_shutdown_; if (cur_shutdown == this->num_clients_) { diff --git a/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h b/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h index 50aa093f9a6..097249686ee 100644 --- a/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h +++ b/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h @@ -23,14 +23,9 @@ class CSD_TP_Test_Export AppShutdown static AppShutdown* instance (); private: - - typedef TAO_SYNCH_MUTEX LockType; - typedef ACE_Guard<LockType> GuardType; - - LockType lock_; CORBA::ORB_var orb_; unsigned num_clients_; - unsigned num_clients_shutdown_; + ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned> num_clients_shutdown_; OrbShutdownTask orb_shutdown_task_; }; diff --git a/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp b/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp index 388a559c8c1..dbc71737f99 100644 --- a/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp +++ b/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp @@ -58,7 +58,7 @@ ClientTask::svc() ClientEngine_Handle engine; { - GuardType guard(this->lock_); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0); this->engines_.get(engine, this->engines_.size() - 1); this->engines_.pop_back(); } @@ -68,7 +68,7 @@ ClientTask::svc() bool exec_ret = engine->execute(); if (exec_ret == false) { - GuardType guard(this->lock_); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0); this->failure_count_ ++; } } @@ -77,7 +77,7 @@ ClientTask::svc() ex._tao_print_exception ( "ClientTask::svc Caught exception from execute():"); - GuardType guard(this->lock_); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0); this->failure_count_ ++; } catch (...) @@ -85,7 +85,7 @@ ClientTask::svc() ACE_ERROR((LM_ERROR, "(%P|%t) ClientTask::svc caught unknown (...) exception "\ "in execute() " )); - GuardType guard(this->lock_); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0); this->failure_count_ ++; } @@ -99,14 +99,12 @@ ClientTask::svc() return 0; } - int ClientTask::close(u_long) { return 0; } - unsigned ClientTask::failure_count () const { diff --git a/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h b/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h index 006035f2347..2279b3a90e3 100644 --- a/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h +++ b/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h @@ -37,12 +37,9 @@ class CSD_TP_Test_Export ClientTask : public ACE_Task_Base private: - typedef TAO_SYNCH_MUTEX LockType; - typedef ACE_Guard<LockType> GuardType; - typedef ACE_Vector<ClientEngine_Handle> EngineVector; - LockType lock_; + TAO_SYNCH_MUTEX lock_; EngineVector engines_; bool shutdown_after_done_; unsigned failure_count_; diff --git a/tests/CSD_Strategy_Tests/TP_Common/Makefile.am b/tests/CSD_Strategy_Tests/TP_Common/Makefile.am deleted file mode 100644 index 82a2d815bb7..00000000000 --- a/tests/CSD_Strategy_Tests/TP_Common/Makefile.am +++ /dev/null @@ -1,190 +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) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.CSD_TP_Test_Lib.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -BUILT_SOURCES += \ - FooExceptionC.cpp \ - FooExceptionC.h \ - FooExceptionC.inl \ - FooExceptionS.cpp \ - FooExceptionS.h \ - FooExceptionS.inl - -CLEANFILES += \ - FooException-stamp \ - FooExceptionC.cpp \ - FooExceptionC.h \ - FooExceptionC.inl \ - FooExceptionS.cpp \ - FooExceptionS.h \ - FooExceptionS.inl - -FooExceptionC.cpp FooExceptionC.h FooExceptionC.inl FooExceptionS.cpp FooExceptionS.h FooExceptionS.inl: FooException-stamp - -FooException-stamp: $(srcdir)/FooException.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_TP_Test_Export -Wb,export_include=CSD_TP_Test_Export.h $(srcdir)/FooException.idl - @touch $@ - -BUILT_SOURCES += \ - TestAppExceptionC.cpp \ - TestAppExceptionC.h \ - TestAppExceptionC.inl \ - TestAppExceptionS.cpp \ - TestAppExceptionS.h \ - TestAppExceptionS.inl - -CLEANFILES += \ - TestAppException-stamp \ - TestAppExceptionC.cpp \ - TestAppExceptionC.h \ - TestAppExceptionC.inl \ - TestAppExceptionS.cpp \ - TestAppExceptionS.h \ - TestAppExceptionS.inl - -TestAppExceptionC.cpp TestAppExceptionC.h TestAppExceptionC.inl TestAppExceptionS.cpp TestAppExceptionS.h TestAppExceptionS.inl: TestAppException-stamp - -TestAppException-stamp: $(srcdir)/TestAppException.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_TP_Test_Export -Wb,export_include=CSD_TP_Test_Export.h $(srcdir)/TestAppException.idl - @touch $@ - -BUILT_SOURCES += \ - CancelledExceptionC.cpp \ - CancelledExceptionC.h \ - CancelledExceptionC.inl \ - CancelledExceptionS.cpp \ - CancelledExceptionS.h \ - CancelledExceptionS.inl - -CLEANFILES += \ - CancelledException-stamp \ - CancelledExceptionC.cpp \ - CancelledExceptionC.h \ - CancelledExceptionC.inl \ - CancelledExceptionS.cpp \ - CancelledExceptionS.h \ - CancelledExceptionS.inl - -CancelledExceptionC.cpp CancelledExceptionC.h CancelledExceptionC.inl CancelledExceptionS.cpp CancelledExceptionS.h CancelledExceptionS.inl: CancelledException-stamp - -CancelledException-stamp: $(srcdir)/CancelledException.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_TP_Test_Export -Wb,export_include=CSD_TP_Test_Export.h $(srcdir)/CancelledException.idl - @touch $@ - -BUILT_SOURCES += \ - CustomExceptionC.cpp \ - CustomExceptionC.h \ - CustomExceptionC.inl \ - CustomExceptionS.cpp \ - CustomExceptionS.h \ - CustomExceptionS.inl - -CLEANFILES += \ - CustomException-stamp \ - CustomExceptionC.cpp \ - CustomExceptionC.h \ - CustomExceptionC.inl \ - CustomExceptionS.cpp \ - CustomExceptionS.h \ - CustomExceptionS.inl - -CustomExceptionC.cpp CustomExceptionC.h CustomExceptionC.inl CustomExceptionS.cpp CustomExceptionS.h CustomExceptionS.inl: CustomException-stamp - -CustomException-stamp: $(srcdir)/CustomException.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_TP_Test_Export -Wb,export_include=CSD_TP_Test_Export.h $(srcdir)/CustomException.idl - @touch $@ - -noinst_LTLIBRARIES = libCSD_TP_Test.la - -libCSD_TP_Test_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tao \ - -DCSD_TP_TEST_BUILD_DLL - -libCSD_TP_Test_la_SOURCES = \ - AppHelper.cpp \ - AppShutdown.cpp \ - CancelledExceptionC.cpp \ - CancelledExceptionS.cpp \ - ClientEngine.cpp \ - ClientTask.cpp \ - CustomExceptionC.cpp \ - CustomExceptionS.cpp \ - FooExceptionC.cpp \ - FooExceptionS.cpp \ - OrbRunner.cpp \ - OrbShutdownTask.cpp \ - OrbTask.cpp \ - StatisticsHelper.cpp \ - TestAppBase.cpp \ - TestAppExceptionC.cpp \ - TestAppExceptionS.cpp - -noinst_HEADERS = \ - AppHelper.h \ - AppShutdown.h \ - CancelledException.idl \ - CancelledExceptionC.h \ - CancelledExceptionC.inl \ - CancelledExceptionS.h \ - CancelledExceptionS.inl \ - ClientEngine.h \ - ClientTask.h \ - CustomException.idl \ - CustomExceptionC.h \ - CustomExceptionC.inl \ - CustomExceptionS.h \ - CustomExceptionS.inl \ - FooException.idl \ - FooExceptionC.h \ - FooExceptionC.inl \ - FooExceptionS.h \ - FooExceptionS.inl \ - OrbRunner.h \ - OrbShutdownTask.h \ - OrbTask.h \ - ServantList_T.cpp \ - ServantList_T.h \ - StatisticsHelper.h \ - TestAppBase.h \ - TestAppException.idl \ - TestAppExceptionC.h \ - TestAppExceptionC.inl \ - TestAppExceptionS.h \ - TestAppExceptionS.inl - -endif BUILD_THREADS -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/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp b/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp index 456d7025478..8e39e223b45 100644 --- a/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp +++ b/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp @@ -8,7 +8,7 @@ void swap ( CORBA::Long& x, CORBA::Long& y ) temp = x; x = y; y = temp; -} +} void sort ( LongVector & vector ) diff --git a/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h b/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h index 7f26a4ae165..16ed9c88eef 100644 --- a/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h +++ b/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h @@ -4,7 +4,7 @@ #include "CSD_TP_Test_Export.h" #include "tao/Basic_Types.h" -#include "ace/Array.h" +#include "ace/Containers_T.h" #include "ace/Vector_T.h" #include "ace/SString.h" @@ -17,7 +17,7 @@ typedef ACE_Array< CORBA::Long > LongArray; extern CSD_TP_Test_Export void swap ( CORBA::Long& x, CORBA::Long& y ); -extern CSD_TP_Test_Export +extern CSD_TP_Test_Export void sort ( LongVector & vector ); diff --git a/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp b/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp index 1ef8ce83cd7..82cb6b65221 100644 --- a/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp +++ b/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp @@ -63,9 +63,9 @@ Foo_A_Statistics::actual_vs_expected() continue; } - unsigned actual_size + unsigned actual_size = this->actual_in_values_[i].size (); - unsigned expected_size + unsigned expected_size = this->num_clients_ * stats.expected_[i]; if (actual_size != expected_size) { @@ -80,7 +80,7 @@ Foo_A_Statistics::actual_vs_expected() return false; } } - } + } return true; } diff --git a/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h b/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h index d5bf9ea2c71..b9301b915bf 100644 --- a/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h +++ b/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h @@ -6,7 +6,7 @@ #include "StatisticsHelper.h" -class CSD_TP_Foo_A_Export Foo_A_Statistics +class CSD_TP_Foo_A_Export Foo_A_Statistics { public: diff --git a/tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am b/tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am deleted file mode 100644 index 8787a60a8d8..00000000000 --- a/tests/CSD_Strategy_Tests/TP_Foo_A/Makefile.am +++ /dev/null @@ -1,89 +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) - - -## Makefile.csd_tp_foo_a_lib.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -BUILT_SOURCES = \ - Foo_AC.cpp \ - Foo_AC.h \ - Foo_AC.inl \ - Foo_AS.cpp \ - Foo_AS.h \ - Foo_AS.inl - -CLEANFILES = \ - Foo_A-stamp \ - Foo_AC.cpp \ - Foo_AC.h \ - Foo_AC.inl \ - Foo_AS.cpp \ - Foo_AS.h \ - Foo_AS.inl - -Foo_AC.cpp Foo_AC.h Foo_AC.inl Foo_AS.cpp Foo_AS.h Foo_AS.inl: Foo_A-stamp - -Foo_A-stamp: $(srcdir)/Foo_A.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -Wb,export_macro=CSD_TP_Foo_A_Export -Wb,export_include=CSD_TP_Foo_A_Export.h $(srcdir)/Foo_A.idl - @touch $@ - -noinst_LTLIBRARIES = libCSD_TP_Foo_A.la - -libCSD_TP_Foo_A_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tao \ - -DCSD_TP_FOO_A_BUILD_DLL - -libCSD_TP_Foo_A_la_SOURCES = \ - Foo_AC.cpp \ - Foo_AS.cpp \ - Foo_A_ClientEngine.cpp \ - Foo_A_Statistics.cpp \ - Foo_A_i.cpp - -libCSD_TP_Foo_A_la_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common - -noinst_HEADERS = \ - Foo_A.idl \ - Foo_AC.h \ - Foo_AC.inl \ - Foo_AS.h \ - Foo_AS.inl \ - Foo_A_ClientEngine.h \ - Foo_A_Statistics.h \ - Foo_A_i.h - -endif BUILD_THREADS -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/CSD_Strategy_Tests/TP_Foo_B/Callback.idl b/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl index 49be42260cb..717d74adea5 100644 --- a/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl +++ b/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl @@ -2,7 +2,7 @@ #ifndef CALLBACK_IDL #define CALLBACK_IDL -interface Callback +interface Callback { void test_method(); }; diff --git a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl index 01e5ddb5179..949f08397ad 100644 --- a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl +++ b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl @@ -4,7 +4,7 @@ #include "FooException.idl" #include "Callback.idl" - + typedef sequence<char, 32> Bounded_Var_Size; typedef sequence<char> Unbounded_Var_Size; @@ -17,7 +17,7 @@ struct TimeOfDay { short minute; // 0 - 59 short second; // 0 - 59 }; -interface Foo_B +interface Foo_B { /// void return-type, no arguments void op1(); @@ -39,7 +39,7 @@ interface Foo_B inout string message); /// Callback test. - + /// Pass the callback object and the server invoke operation on /// the callback object reference. void op7 (in Callback cb) raises (FooException); @@ -51,7 +51,7 @@ interface Foo_B oneway void test_fixed_array_arg(in Fixed_Array message); oneway void test_var_array_arg(in Var_Array messages); - + oneway void test_bounded_var_size_arg(in Bounded_Var_Size message); oneway void test_unbounded_var_size_arg(in Unbounded_Var_Size message); diff --git a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp index f857655fb0c..9d497df00c9 100644 --- a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp +++ b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp @@ -5,7 +5,6 @@ #include "TestAppExceptionC.h" #include "AppHelper.h" #include "ace/Log_Msg.h" -#include "ace/OS.h" const char* ONEWAY_ARG_TEST_STR = "TEST"; diff --git a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp index e6075f9cec6..0c41b14b0bc 100644 --- a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp +++ b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp @@ -5,7 +5,6 @@ #include "TestAppExceptionC.h" #include "AppHelper.h" #include "ace/Log_Msg.h" -#include "ace/OS.h" extern const char* ONEWAY_ARG_TEST_STR; diff --git a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h index cf21382c549..e8d9569a2d5 100644 --- a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h +++ b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h @@ -6,14 +6,14 @@ #include "StatisticsHelper.h" -class CSD_TP_Foo_B_Export Foo_B_Statistics +class CSD_TP_Foo_B_Export Foo_B_Statistics { public: - enum In_Value_Type + enum In_Value_Type { - FOO_B_STAT_NONE, - FOO_B_STAT_STRING, + FOO_B_STAT_NONE, + FOO_B_STAT_STRING, FOO_B_STAT_LONG }; diff --git a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp index 6cd944f8473..5e90582eff3 100644 --- a/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp +++ b/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp @@ -1,11 +1,10 @@ // $Id$ + #include "Foo_B_i.h" #include "AppShutdown.h" #include "TestAppExceptionC.h" -#include "ace/OS.h" #include "ace/SString.h" - Foo_B_i::Foo_B_i() : error_count_ (0) { diff --git a/tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am b/tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am deleted file mode 100644 index 4e7d80fb3b7..00000000000 --- a/tests/CSD_Strategy_Tests/TP_Foo_B/Makefile.am +++ /dev/null @@ -1,125 +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) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.csd_tp_foo_b_lib.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -BUILT_SOURCES += \ - Foo_BC.cpp \ - Foo_BC.h \ - Foo_BC.inl \ - Foo_BS.cpp \ - Foo_BS.h \ - Foo_BS.inl - -CLEANFILES += \ - Foo_B-stamp \ - Foo_BC.cpp \ - Foo_BC.h \ - Foo_BC.inl \ - Foo_BS.cpp \ - Foo_BS.h \ - Foo_BS.inl - -Foo_BC.cpp Foo_BC.h Foo_BC.inl Foo_BS.cpp Foo_BS.h Foo_BS.inl: Foo_B-stamp - -Foo_B-stamp: $(srcdir)/Foo_B.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -b -Wb,export_macro=CSD_TP_Foo_B_Export -Wb,export_include=CSD_TP_Foo_B_Export.h $(srcdir)/Foo_B.idl - @touch $@ - -BUILT_SOURCES += \ - CallbackC.cpp \ - CallbackC.h \ - CallbackC.inl \ - CallbackS.cpp \ - CallbackS.h \ - CallbackS.inl - -CLEANFILES += \ - Callback-stamp \ - CallbackC.cpp \ - CallbackC.h \ - CallbackC.inl \ - CallbackS.cpp \ - CallbackS.h \ - CallbackS.inl - -CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl: Callback-stamp - -Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -b -Wb,export_macro=CSD_TP_Foo_B_Export -Wb,export_include=CSD_TP_Foo_B_Export.h $(srcdir)/Callback.idl - @touch $@ - -noinst_LTLIBRARIES = libCSD_TP_Foo_B.la - -libCSD_TP_Foo_B_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tao \ - -DCSD_TP_FOO_B_BUILD_DLL - -libCSD_TP_Foo_B_la_SOURCES = \ - CallbackC.cpp \ - CallbackS.cpp \ - Callback_i.cpp \ - Foo_BC.cpp \ - Foo_BS.cpp \ - Foo_B_ClientEngine.cpp \ - Foo_B_SimpleClientEngine.cpp \ - Foo_B_Statistics.cpp \ - Foo_B_i.cpp - -libCSD_TP_Foo_B_la_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common - -noinst_HEADERS = \ - Callback.idl \ - CallbackC.h \ - CallbackC.inl \ - CallbackS.h \ - CallbackS.inl \ - Callback_i.h \ - Foo_B.idl \ - Foo_BC.h \ - Foo_BC.inl \ - Foo_BS.h \ - Foo_BS.inl \ - Foo_B_ClientEngine.h \ - Foo_B_SimpleClientEngine.h \ - Foo_B_Statistics.h \ - Foo_B_i.h - -endif BUILD_THREADS -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/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp b/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp index b832e29d9a1..b6155743e3b 100644 --- a/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp +++ b/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp @@ -3,7 +3,7 @@ #include "Foo_C_ClientEngine.h" #include "Foo_C_Custom_ClientEngine.h" -Foo_C_Statistics::Foo_C_Statistics(unsigned num_remote_clients, +Foo_C_Statistics::Foo_C_Statistics(unsigned num_remote_clients, unsigned num_collocated_clients) : num_remote_clients_ (num_remote_clients), num_collocated_clients_ (num_collocated_clients) @@ -71,21 +71,21 @@ Foo_C_Statistics::actual_vs_expected() } // Verify the "in" values. - // Skip op1/op5 and cust_op1/cust_op5 since they do not have + // Skip op1/op5 and cust_op1/cust_op5 since they do not have // any "in" values. if (i % 5 == 0 || i % 5 == 4) { continue; } - unsigned actual_size + unsigned actual_size = this->actual_in_values_[i].size (); - unsigned expected_size + unsigned expected_size = this->num_remote_clients_ * remote_client_stats.expected_[i] + this->num_collocated_clients_ * collocated_client_stats.expected_[i]; - + if (actual_size == 0 && expected_size == 0) - { + { continue; } @@ -103,7 +103,7 @@ Foo_C_Statistics::actual_vs_expected() return false; } } - } + } return true; } diff --git a/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h b/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h index 4d7dcff1df9..f115ddc2b1f 100644 --- a/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h +++ b/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h @@ -6,11 +6,11 @@ #include "StatisticsHelper.h" -class CSD_TP_Foo_C_Export Foo_C_Statistics +class CSD_TP_Foo_C_Export Foo_C_Statistics { public: - Foo_C_Statistics(unsigned num_remote_clients, + Foo_C_Statistics(unsigned num_remote_clients, unsigned num_collocated_clients); virtual ~Foo_C_Statistics(); @@ -24,7 +24,7 @@ class CSD_TP_Foo_C_Export Foo_C_Statistics private: - unsigned num_remote_clients_; + unsigned num_remote_clients_; unsigned num_collocated_clients_; unsigned expected_[10]; unsigned actual_[10]; diff --git a/tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am b/tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am deleted file mode 100644 index ea662ab6b42..00000000000 --- a/tests/CSD_Strategy_Tests/TP_Foo_C/Makefile.am +++ /dev/null @@ -1,103 +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) - - -## Makefile.csd_tp_foo_c_lib.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -BUILT_SOURCES = \ - Foo_CC.cpp \ - Foo_CC.h \ - Foo_CC.inl \ - Foo_CS.cpp \ - Foo_CS.h \ - Foo_CS.inl - -CLEANFILES = \ - Foo_C-stamp \ - Foo_CC.cpp \ - Foo_CC.h \ - Foo_CC.inl \ - Foo_CS.cpp \ - Foo_CS.h \ - Foo_CS.inl - -Foo_CC.cpp Foo_CC.h Foo_CC.inl Foo_CS.cpp Foo_CS.h Foo_CS.inl: Foo_C-stamp - -Foo_C-stamp: $(srcdir)/Foo_C.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -b -Wb,export_macro=CSD_TP_Foo_C_Export -Wb,export_include=CSD_TP_Foo_C_Export.h $(srcdir)/Foo_C.idl - @touch $@ - -noinst_LTLIBRARIES = libCSD_TP_Foo_C.la - -libCSD_TP_Foo_C_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tao \ - -DCSD_TP_FOO_C_BUILD_DLL - -libCSD_TP_Foo_C_la_SOURCES = \ - Foo_CC.cpp \ - Foo_CS.cpp \ - Foo_C_ClientEngine.cpp \ - Foo_C_Custom_ClientEngine.cpp \ - Foo_C_Custom_Proxy.cpp \ - Foo_C_Statistics.cpp \ - Foo_C_cust_op1.cpp \ - Foo_C_cust_op2.cpp \ - Foo_C_cust_op3.cpp \ - Foo_C_cust_op4.cpp \ - Foo_C_cust_op5.cpp \ - Foo_C_i.cpp - -libCSD_TP_Foo_C_la_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common - -noinst_HEADERS = \ - Foo_C.idl \ - Foo_CC.h \ - Foo_CC.inl \ - Foo_CS.h \ - Foo_CS.inl \ - Foo_C_ClientEngine.h \ - Foo_C_Custom_ClientEngine.h \ - Foo_C_Custom_Proxy.h \ - Foo_C_Statistics.h \ - Foo_C_cust_op1.h \ - Foo_C_cust_op2.h \ - Foo_C_cust_op3.h \ - Foo_C_cust_op4.h \ - Foo_C_cust_op5.h \ - Foo_C_i.h - -endif BUILD_THREADS -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/CSD_Strategy_Tests/TP_Test_1/Makefile.am b/tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am deleted file mode 100644 index 1d6832a1557..00000000000 --- a/tests/CSD_Strategy_Tests/TP_Test_1/Makefile.am +++ /dev/null @@ -1,104 +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) - -noinst_PROGRAMS = - -## Makefile.CSD_TP_Test_1_Client.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += client_main - -client_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A - -client_main_SOURCES = \ - ClientApp.cpp \ - client_main.cpp \ - ClientApp.h - -client_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A - -client_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_THREADS -endif BUILD_EXCEPTIONS - -## Makefile.CSD_TP_Test_1_Server.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += server_main - -server_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A - -server_main_SOURCES = \ - ServerApp.cpp \ - server_main.cpp \ - ServerApp.h - -server_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A - -server_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_THREADS -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/CSD_Strategy_Tests/TP_Test_2/Makefile.am b/tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am deleted file mode 100644 index 7a6269ed5ab..00000000000 --- a/tests/CSD_Strategy_Tests/TP_Test_2/Makefile.am +++ /dev/null @@ -1,104 +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) - -noinst_PROGRAMS = - -## Makefile.CSD_TP_Test_2_Client.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += client_main - -client_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A - -client_main_SOURCES = \ - ClientApp.cpp \ - client_main.cpp \ - ClientApp.h - -client_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A - -client_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_THREADS -endif BUILD_EXCEPTIONS - -## Makefile.CSD_TP_Test_2_Server.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += server_main - -server_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A - -server_main_SOURCES = \ - ServerApp.cpp \ - server_main.cpp \ - ServerApp.h - -server_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A - -server_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_THREADS -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/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp b/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp index 285c20bb698..1cd428ddf23 100644 --- a/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp +++ b/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp @@ -5,7 +5,6 @@ #include "AppShutdown.h" #include "TestAppExceptionC.h" #include "Foo_A_ClientEngine.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" // To force static load the service. #include "tao/PI/PI.h" diff --git a/tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am b/tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am deleted file mode 100644 index fc48b77f81c..00000000000 --- a/tests/CSD_Strategy_Tests/TP_Test_3/Makefile.am +++ /dev/null @@ -1,104 +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) - -noinst_PROGRAMS = - -## Makefile.CSD_TP_Test_3_Client.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += client_main - -client_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_B - -client_main_SOURCES = \ - ClientApp.cpp \ - client_main.cpp \ - ClientApp.h - -client_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B - -client_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_B/libCSD_TP_Foo_B.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_THREADS -endif BUILD_EXCEPTIONS - -## Makefile.CSD_TP_Test_3_Server.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += server_main - -server_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_B - -server_main_SOURCES = \ - ServerApp.cpp \ - server_main.cpp \ - ServerApp.h - -server_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_B - -server_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_B/libCSD_TP_Foo_B.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_THREADS -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/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp b/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp index 83795c6e49c..87d51f92e3b 100644 --- a/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp +++ b/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp @@ -7,7 +7,6 @@ #include "Foo_B_ClientEngine.h" #include "Foo_B_ClientEngine.h" #include "Callback_i.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" // To force static load the service. #include "tao/PI/PI.h" diff --git a/tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am b/tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am deleted file mode 100644 index 825bcfdd37c..00000000000 --- a/tests/CSD_Strategy_Tests/TP_Test_4/Makefile.am +++ /dev/null @@ -1,104 +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) - -noinst_PROGRAMS = - -## Makefile.CSD_TP_Test_4_Client.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += client_main - -client_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_C - -client_main_SOURCES = \ - ClientApp.cpp \ - client_main.cpp \ - ClientApp.h - -client_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C - -client_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_C/libCSD_TP_Foo_C.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_THREADS -endif BUILD_EXCEPTIONS - -## Makefile.CSD_TP_Test_4_Server.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += server_main - -server_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_C - -server_main_SOURCES = \ - ServerApp.cpp \ - server_main.cpp \ - ServerApp.h - -server_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_C - -server_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_C/libCSD_TP_Foo_C.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_THREADS -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/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp b/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp index 3614fd0350c..93b84ad02dd 100644 --- a/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp +++ b/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp @@ -7,7 +7,6 @@ #include "Foo_C_Custom_ClientEngine.h" #include "Foo_C_ClientEngine.h" #include "Foo_C_Statistics.h" -#include "ace/OS.h" #include "ace/Get_Opt.h" // To force static load the service. #include "tao/PI/PI.h" diff --git a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc index 2d3a8d5221c..116a9142daa 100644 --- a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc +++ b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc @@ -2,7 +2,6 @@ // $Id$ project(*idl): taoidldefaults { - idlflags += -Sa -St IDL_Files { Test.idl } diff --git a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp index df5dc90d3d9..0f62f20b906 100644 --- a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp +++ b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am deleted file mode 100644 index f281fa2a773..00000000000 --- a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Makefile.am +++ /dev/null @@ -1,105 +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.CSD_TP_Test_Dynamic_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 -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.CSD_TP_Test_Dynamic_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_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.CSD_TP_Test_Dynamic_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 \ - Hello.h - -client_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/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp index cbd78a6f0d6..abaed430dc8 100644 --- a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp +++ b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -29,7 +27,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/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp index 394c63527f5..5d2ca8262dc 100644 --- a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp +++ b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp @@ -5,10 +5,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/Thread_Manager.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int @@ -33,7 +29,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/tests/CSD_Strategy_Tests/TP_Test_Dynamic/svc.conf b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/svc.conf index e59fb4ac94c..4eccadbc649 100644 --- a/tests/CSD_Strategy_Tests/TP_Test_Dynamic/svc.conf +++ b/tests/CSD_Strategy_Tests/TP_Test_Dynamic/svc.conf @@ -1 +1,3 @@ +# $Id$ + dynamic TAO_CSD_TP_Strategy_Factory Service_Object * TAO_CSD_ThreadPool:_make_TAO_CSD_TP_Strategy_Factory() "-CSDtp RootPOA:2" diff --git a/tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am b/tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am deleted file mode 100644 index a038670f34d..00000000000 --- a/tests/CSD_Strategy_Tests/TP_Test_Static/Makefile.am +++ /dev/null @@ -1,104 +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) - -noinst_PROGRAMS = - -## Makefile.CSD_TP_Test_Static_Server.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += server_main - -server_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A - -server_main_SOURCES = \ - ServerApp.cpp \ - server_main.cpp \ - ServerApp.h - -server_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A - -server_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_THREADS -endif BUILD_EXCEPTIONS - -## Makefile.CSD_TP_Test_Static_Client.am - -if BUILD_EXCEPTIONS -if BUILD_THREADS - -noinst_PROGRAMS += client_main - -client_main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Common \ - -I$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A \ - -I$(TAO_BUILDDIR)/tests/CSD_Strategy_Tests/TP_Foo_A - -client_main_SOURCES = \ - ClientApp.cpp \ - client_main.cpp \ - ClientApp.h - -client_main_LDFLAGS = \ - -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Common -L$(TAO_ROOT)/tests/CSD_Strategy_Tests/TP_Foo_A - -client_main_LDADD = \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Foo_A/libCSD_TP_Foo_A.la \ - $(top_builddir)/tests/CSD_Strategy_Tests/TP_Common/libCSD_TP_Test.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \ - $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_THREADS -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/CSD_Strategy_Tests/TP_Test_Static/svc.conf b/tests/CSD_Strategy_Tests/TP_Test_Static/svc.conf index a274350e4ac..85fb363977d 100644 --- a/tests/CSD_Strategy_Tests/TP_Test_Static/svc.conf +++ b/tests/CSD_Strategy_Tests/TP_Test_Static/svc.conf @@ -1 +1,3 @@ +# $Id$ + static TAO_CSD_TP_Strategy_Factory "-CSDtp ChildPoa:2" diff --git a/tests/Cache_Growth_Test/Hello.cpp b/tests/Cache_Growth_Test/Hello.cpp index 535e7632c0d..b566ba935ed 100644 --- a/tests/Cache_Growth_Test/Hello.cpp +++ b/tests/Cache_Growth_Test/Hello.cpp @@ -6,8 +6,6 @@ #include "tao/Transport_Cache_Manager.h" #include "tao/Thread_Lane_Resources.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Cache_Growth_Test/Makefile.am b/tests/Cache_Growth_Test/Makefile.am deleted file mode 100644 index fc3c8ea9ebd..00000000000 --- a/tests/Cache_Growth_Test/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.Cache_Growth_Test_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.Cache_Growth_Test_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 \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Cache_Growth_Test_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_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/Cache_Growth_Test/client.cpp b/tests/Cache_Growth_Test/client.cpp index 022cf6c0f47..f441e3de509 100644 --- a/tests/Cache_Growth_Test/client.cpp +++ b/tests/Cache_Growth_Test/client.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int do_shutdown = 0; @@ -35,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/tests/Cache_Growth_Test/server.cpp b/tests/Cache_Growth_Test/server.cpp index ae19465711c..428a7c13ff9 100644 --- a/tests/Cache_Growth_Test/server.cpp +++ b/tests/Cache_Growth_Test/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Hello, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -30,7 +28,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/tests/CallbackTest/Callback.cpp b/tests/CallbackTest/Callback.cpp index f233dd2b229..73b3593b606 100644 --- a/tests/CallbackTest/Callback.cpp +++ b/tests/CallbackTest/Callback.cpp @@ -3,8 +3,6 @@ // #include "Callback.h" -ACE_RCSID(Callback, Callback, "$Id$") - Callback::Callback (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/CallbackTest/Makefile.am b/tests/CallbackTest/Makefile.am deleted file mode 100644 index e5d029355c5..00000000000 --- a/tests/CallbackTest/Makefile.am +++ /dev/null @@ -1,121 +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.CallbackTest_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.CallbackTest_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 = \ - Callback.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Callback.h - -client_LDADD = \ - $(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_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.CallbackTest_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Service.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Service.h - -server_LDADD = \ - $(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_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 - -## 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/CallbackTest/Service.cpp b/tests/CallbackTest/Service.cpp index 8d9143dc487..307a4a83a80 100644 --- a/tests/CallbackTest/Service.cpp +++ b/tests/CallbackTest/Service.cpp @@ -3,8 +3,6 @@ // #include "Service.h" -ACE_RCSID(Callback, Service, "$Id$") - Service::Service (CORBA::ORB_ptr orb) : test_count_ (0), orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/tests/CallbackTest/client.cpp b/tests/CallbackTest/client.cpp index c04ed420cfc..8a291889707 100644 --- a/tests/CallbackTest/client.cpp +++ b/tests/CallbackTest/client.cpp @@ -6,8 +6,6 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" -ACE_RCSID(Crashed_Callback, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -31,7 +29,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/tests/CallbackTest/server.cpp b/tests/CallbackTest/server.cpp index c96cf1c553c..001a9741513 100644 --- a/tests/CallbackTest/server.cpp +++ b/tests/CallbackTest/server.cpp @@ -7,8 +7,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Crashed_Callback, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +30,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/tests/Client_Leaks/Client_Task.cpp b/tests/Client_Leaks/Client_Task.cpp index 1628e3d48d5..8bd8670713c 100644 --- a/tests/Client_Leaks/Client_Task.cpp +++ b/tests/Client_Leaks/Client_Task.cpp @@ -4,8 +4,6 @@ #include "Client_Task.h" -ACE_RCSID(Client_Leaks, Client_Task, "$Id$") - Client_Task::Client_Task (Test::Process_Factory_ptr process_factory, int iterations) : process_factory_ (Test::Process_Factory::_duplicate (process_factory)) diff --git a/tests/Client_Leaks/Client_Task.h b/tests/Client_Leaks/Client_Task.h index b6df65e973e..12a45e7aac2 100644 --- a/tests/Client_Leaks/Client_Task.h +++ b/tests/Client_Leaks/Client_Task.h @@ -21,7 +21,7 @@ public: Client_Task (Test::Process_Factory_ptr process_Factory, int iterations); - /// Return the total number of sucessful calls + /// Return the total number of successful calls int successful_calls (void) const; /// Thread entry point diff --git a/tests/Client_Leaks/Makefile.am b/tests/Client_Leaks/Makefile.am deleted file mode 100644 index ff78a867d78..00000000000 --- a/tests/Client_Leaks/Makefile.am +++ /dev/null @@ -1,138 +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.Client_Leaks_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.Client_Leaks_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_Task.cpp \ - TestC.cpp \ - client.cpp \ - Client_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Client_Leaks_Child.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += child - -child_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -child_SOURCES = \ - Process.cpp \ - TestC.cpp \ - TestS.cpp \ - child.cpp \ - Process.h - -child_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.Client_Leaks_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Process_Factory.cpp \ - Server_Task.cpp \ - Startup_Callback.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Process_Factory.h \ - Server_Task.h \ - Startup_Callback.h - -server_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/Client_Leaks/Process.cpp b/tests/Client_Leaks/Process.cpp index 8b6d7257784..6bf3cb78eac 100644 --- a/tests/Client_Leaks/Process.cpp +++ b/tests/Client_Leaks/Process.cpp @@ -4,8 +4,6 @@ #include "Process.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Client_Leaks, Process, "$Id$") - Process::Process (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Client_Leaks/Process_Factory.cpp b/tests/Client_Leaks/Process_Factory.cpp index c58a665dec6..708265f5215 100644 --- a/tests/Client_Leaks/Process_Factory.cpp +++ b/tests/Client_Leaks/Process_Factory.cpp @@ -5,8 +5,6 @@ #include "Startup_Callback.h" #include "ace/Process.h" -ACE_RCSID(Client_Leaks, Process_Factory, "$Id$") - Process_Factory::Process_Factory (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) , shutdown_received_ (0) diff --git a/tests/Client_Leaks/README b/tests/Client_Leaks/README index 5e17aa080f6..1dbcc88e52b 100644 --- a/tests/Client_Leaks/README +++ b/tests/Client_Leaks/README @@ -2,14 +2,14 @@ @page Client Leaks Test README File - On TAO-1.1.12 the ORB was leaking handles on the client-side. +On TAO-1.1.12 the ORB was leaking handles on the client-side. This test creates multiple servers trying to force a fault or exception if the resources are still leaked. - To run the test use the run_test.pl script: +To run the test use the run_test.pl script: $ ./run_test.pl - the script returns 0 if the test was successful. +the script returns 0 if the test was successful. */ diff --git a/tests/Client_Leaks/Server_Task.cpp b/tests/Client_Leaks/Server_Task.cpp index 0dd3295e11f..d37db8a5690 100644 --- a/tests/Client_Leaks/Server_Task.cpp +++ b/tests/Client_Leaks/Server_Task.cpp @@ -4,8 +4,6 @@ #include "Server_Task.h" -ACE_RCSID(Client_Leaks, Server_Task, "$Id$") - Server_Task::Server_Task (CORBA::ORB_ptr orb, ACE_Thread_Manager *thr_mgr) : ACE_Task_Base (thr_mgr) diff --git a/tests/Client_Leaks/Startup_Callback.cpp b/tests/Client_Leaks/Startup_Callback.cpp index 341c89ead6e..15eefd990eb 100644 --- a/tests/Client_Leaks/Startup_Callback.cpp +++ b/tests/Client_Leaks/Startup_Callback.cpp @@ -3,8 +3,6 @@ // #include "Startup_Callback.h" -ACE_RCSID(Client_Leaks, Startup_Callback, "$Id$") - Startup_Callback::Startup_Callback (void) { } diff --git a/tests/Client_Leaks/child.cpp b/tests/Client_Leaks/child.cpp index 01379f1c35d..e2585d5704e 100644 --- a/tests/Client_Leaks/child.cpp +++ b/tests/Client_Leaks/child.cpp @@ -3,8 +3,6 @@ #include "Process.h" #include "ace/Get_Opt.h" -ACE_RCSID(Client_Leaks, server, "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { @@ -49,7 +47,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); - Process *process_impl; + Process *process_impl = 0; ACE_NEW_RETURN (process_impl, Process (orb.in ()), 1); diff --git a/tests/Client_Leaks/client.cpp b/tests/Client_Leaks/client.cpp index 01e917895f6..c968b21002a 100644 --- a/tests/Client_Leaks/client.cpp +++ b/tests/Client_Leaks/client.cpp @@ -3,8 +3,6 @@ #include "Client_Task.h" #include "ace/Get_Opt.h" -ACE_RCSID(Client_Leaks, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int iterations = 100; int threads = 12; @@ -41,7 +39,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/tests/Client_Leaks/server.cpp b/tests/Client_Leaks/server.cpp index d2bd06b7e79..b748d79f4bb 100644 --- a/tests/Client_Leaks/server.cpp +++ b/tests/Client_Leaks/server.cpp @@ -4,8 +4,6 @@ #include "Server_Task.h" #include "ace/Get_Opt.h" -ACE_RCSID(Client_Leaks, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -29,7 +27,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; } @@ -58,7 +56,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (parse_args (argc, argv) != 0) return 1; - Process_Factory *process_factory_impl; + Process_Factory *process_factory_impl = 0; ACE_NEW_RETURN (process_factory_impl, Process_Factory (orb.in ()), 1); diff --git a/tests/CodeSets/Makefile.am b/tests/CodeSets/Makefile.am deleted file mode 100644 index 2ba3df85b6f..00000000000 --- a/tests/CodeSets/Makefile.am +++ /dev/null @@ -1,14 +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 = \ - libs \ - simple - diff --git a/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp b/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp index d5dfd92b64d..88e1e62aa20 100644 --- a/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp +++ b/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.cpp @@ -1,23 +1,20 @@ // -*- C++ -*- -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/CodeSets/libs/IBM1047_ISO8859 -// -// = FILENAME -// Char_IBM1047_ISO8859_Factory.cpp -// -// = DESCRIPTION -// A tempate instantiation of the codeset translator factory from TAO. This -// one loads a modified version of ACE's IBM1047 (EBCDIC) to ISO8859 (ASCII) -// translator. -// -// = AUTHORS -// Phil Mesnier <mesnier_p@ociweb.com> -// -// ============================================================================ +//============================================================================= +/** + * @file Char_IBM1047_ISO8859_Factory.cpp + * + * $Id$ + * + * A tempate instantiation of the codeset translator factory from TAO. This + * one loads a modified version of ACE's IBM1047 (EBCDIC) to ISO8859 (ASCII) + * translator. + * + * + * @author Phil Mesnier <mesnier_p@ociweb.com> + */ +//============================================================================= + #include "Char_IBM1047_ISO8859_Factory.h" #include "ace/Log_Msg.h" diff --git a/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.h b/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.h index 9cf65339c52..16668f9d0cb 100644 --- a/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.h +++ b/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Factory.h @@ -1,23 +1,20 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/CodeSets/libs/IBM1047_ISO8859 -// -// = FILENAME -// Char_IBM1047_ISO8859_Factory.h -// -// = DESCRIPTION -// A tempate instantiation of the codeset translator factory from TAO. This -// one loads a modified version of ACE's IBM1047 (EBCDIC) to ISO8859 (ASCII) -// translator. -// -// = AUTHORS -// Phil Mesnier <mesnier_p@ociweb.com> -// -// ============================================================================ + +//============================================================================= +/** + * @file Char_IBM1047_ISO8859_Factory.h + * + * $Id$ + * + * A tempate instantiation of the codeset translator factory from TAO. This + * one loads a modified version of ACE's IBM1047 (EBCDIC) to ISO8859 (ASCII) + * translator. + * + * + * @author Phil Mesnier <mesnier_p@ociweb.com> + */ +//============================================================================= + #ifndef CHAR_IBM1047_ISO8859_FACTORY_H #define CHAR_IBM1047_ISO8859_FACTORY_H diff --git a/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp b/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp index 4c9d5479957..4c9b150d5b9 100644 --- a/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp +++ b/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp @@ -1,31 +1,24 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// Char_IBM1047_ISO8859_Translator.cpp -// -// = DESCRIPTION -// Defines the arrays required to convert between ISO8859 (aka -// Latin/1) and IBM1047 (aka EBCDIC). -// -// = AUTHOR -// Jim Rogers (jrogers@viasoft.com) -// -// ============================================================================ + +//============================================================================= +/** + * @file Char_IBM1047_ISO8859_Translator.cpp + * + * $Id$ + * + * Defines the arrays required to convert between ISO8859 (aka + * Latin/1) and IBM1047 (aka EBCDIC). + * + * + * @author Jim Rogers (jrogers@viasoft.com) + */ +//============================================================================= + #include "Char_IBM1047_ISO8859_Translator.h" #include "ace/OS_Memory.h" #include "ace/OS_NS_string.h" -ACE_RCSID (IBM1047_ISO8859, - Char_IBM1047_ISO8859_Translator, - "$Id$") - // **************************************************************** IBM1047_ISO8859::IBM1047_ISO8859 (void) @@ -84,7 +77,7 @@ IBM1047_ISO8859::read_char_array (ACE_InputCDR& in, ACE_CDR::OCTET_ALIGN, len)) { - for (ACE_CDR::ULong i = 0; i != len; ++i) + for (ACE_CDR::ULong i = 0; i != len; ++i) { x[i] = (unsigned char)to_IBM1047[(unsigned char)x[i]]; } @@ -127,7 +120,7 @@ IBM1047_ISO8859::write_char_array (ACE_OutputCDR& out, { ACE_OS::memcpy (buf, x, len); - for (ACE_CDR::ULong i = 0; i != len; ++i) + for (ACE_CDR::ULong i = 0; i != len; ++i) { buf[i] = (unsigned char)from_IBM1047[(unsigned char)buf[i]]; } diff --git a/tests/CodeSets/libs/IBM1047_ISO8859/Makefile.am b/tests/CodeSets/libs/IBM1047_ISO8859/Makefile.am deleted file mode 100644 index 8ad94bd2def..00000000000 --- a/tests/CodeSets/libs/IBM1047_ISO8859/Makefile.am +++ /dev/null @@ -1,51 +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.CodeSets_libs_IMB1047_ISO8859.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES = libIBM1047_ISO8859.la - -libIBM1047_ISO8859_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DIBM1047_ISO8859_BUILD_DLL - -libIBM1047_ISO8859_la_SOURCES = \ - Char_IBM1047_ISO8859_Factory.cpp \ - Char_IBM1047_ISO8859_Translator.cpp \ - Wchar_IBM1047_ISO8859_Factory.cpp \ - Wchar_IBM1047_ISO8859_Translator.cpp - -noinst_HEADERS = \ - Char_IBM1047_ISO8859_Factory.h \ - Char_IBM1047_ISO8859_Translator.h \ - IBM1047_ISO8859_export.h \ - Wchar_IBM1047_ISO8859_Factory.h \ - Wchar_IBM1047_ISO8859_Translator.h - -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/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp b/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp index c395b202966..3f9a95a769d 100644 --- a/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp +++ b/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.cpp @@ -1,24 +1,21 @@ // -*- C++ -*- -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/CodeSets/libs/IBM1047_ISO8859 -// -// = FILENAME -// Wchar_IBM1047_ISO8859_Factory.cpp -// -// = DESCRIPTION -// A tempate instantiation of the codeset translator factory from TAO. This -// one loads a modified version of ACE's IBM1047 (EBCDIC) to ISO8859 (ASCII) -// translator. In this case, wchars and wstrings are translated rather than -// strings and chars. -// -// = AUTHORS -// Phil Mesnier <mesnier_p@ociweb.com> -// -// ============================================================================ +//============================================================================= +/** + * @file Wchar_IBM1047_ISO8859_Factory.cpp + * + * $Id$ + * + * A tempate instantiation of the codeset translator factory from TAO. This + * one loads a modified version of ACE's IBM1047 (EBCDIC) to ISO8859 (ASCII) + * translator. In this case, wchars and wstrings are translated rather than + * strings and chars. + * + * + * @author Phil Mesnier <mesnier_p@ociweb.com> + */ +//============================================================================= + #include "Wchar_IBM1047_ISO8859_Factory.h" #include "ace/Log_Msg.h" diff --git a/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.h b/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.h index 520933dba9d..403aa8132ff 100644 --- a/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.h +++ b/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Factory.h @@ -1,24 +1,21 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/CodeSets/libs/IBM1047_ISO8859 -// -// = FILENAME -// Wchar_IBM1047_ISO8859_Factory.cpp -// -// = DESCRIPTION -// A tempate instantiation of the codeset translator factory from TAO. This -// one loads a modified version of ACE's IBM1047 (EBCDIC) to ISO8859 (ASCII) -// translator. In this case, wchars and wstrings are translated rather than -// strings and chars. -// -// = AUTHORS -// Phil Mesnier <mesnier_p@ociweb.com> -// -// ============================================================================ + +//============================================================================= +/** + * @file Wchar_IBM1047_ISO8859_Factory.h + * + * $Id$ + * + * A tempate instantiation of the codeset translator factory from TAO. This + * one loads a modified version of ACE's IBM1047 (EBCDIC) to ISO8859 (ASCII) + * translator. In this case, wchars and wstrings are translated rather than + * strings and chars. + * + * + * @author Phil Mesnier <mesnier_p@ociweb.com> + */ +//============================================================================= + #ifndef WCHAR_IBM1047_ISO8859_FACTORY_H #define WCHAR_IBM1047_ISO8859_FACTORY_H diff --git a/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp b/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp index 7958ddbfa58..0a30896062e 100644 --- a/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp +++ b/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp @@ -1,26 +1,21 @@ // -*- C++ -*- -// $Id$ -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// Wchar_IBM1047_ISO8859_Translator.cpp -// -// = DESCRIPTION -// Defines the arrays required to convert between ISO8859 (aka -// Latin/1) and IBM1047 (aka EBCDIC). -// -// = AUTHOR -// Mahesh Vedantam (mahesh@ociweb.com) -// -// ============================================================================ +//============================================================================= +/** + * @file Wchar_IBM1047_ISO8859_Translator.cpp + * + * $Id$ + * + * Defines the arrays required to convert between ISO8859 (aka + * Latin/1) and IBM1047 (aka EBCDIC). + * + * + * @author Mahesh Vedantam (mahesh@ociweb.com) + */ +//============================================================================= -#include "Wchar_IBM1047_ISO8859_Translator.h" -ACE_RCSID(IBM1047_ISO8859, Wchar_IBM1047_ISO8859_Translator, "$Id$") +#include "Wchar_IBM1047_ISO8859_Translator.h" // **************************************************************** diff --git a/tests/CodeSets/libs/Makefile.am b/tests/CodeSets/libs/Makefile.am deleted file mode 100644 index 2afaafe47a3..00000000000 --- a/tests/CodeSets/libs/Makefile.am +++ /dev/null @@ -1,15 +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 = \ - IBM1047_ISO8859 \ - UCS4_UTF16 \ - UTF16_UCS2 - diff --git a/tests/CodeSets/libs/UCS4_UTF16/Makefile.am b/tests/CodeSets/libs/UCS4_UTF16/Makefile.am deleted file mode 100644 index 5875d3dd899..00000000000 --- a/tests/CodeSets/libs/UCS4_UTF16/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.CodeSets_Libs_UCS4_UTF16.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES = libUCS4_UTF16.la - -libUCS4_UTF16_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DUCS4_UTF16_BUILD_DLL - -libUCS4_UTF16_la_SOURCES = \ - WUCS4_UTF16.cpp \ - WUCS4_UTF16_Factory.cpp - -noinst_HEADERS = \ - WUCS4_UTF16.h \ - WUCS4_UTF16_Factory.h \ - WUCS4_UTF16_export.h - -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/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp b/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp index f63c6e541d3..c9eb43d47c2 100644 --- a/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp +++ b/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp @@ -1,27 +1,22 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// ace -// -// = FILENAME -// WUCS4_UTF16.cpp -// -// = DESCRIPTION -// Defines the arrays required to convert between UCS-4 a 4 byte wide char -// codeset, and UCS-16, aka unicode, a 2-byte codeset. -// -// = AUTHOR -// Phil Mesnier <mesnier_p@ociweb.com> -// -// ============================================================================ -#include "WUCS4_UTF16.h" -#include "ace/OS.h" +//============================================================================= +/** + * @file WUCS4_UTF16.cpp + * + * $Id$ + * + * Defines the arrays required to convert between UCS-4 a 4 byte wide char + * codeset, and UCS-16, aka unicode, a 2-byte codeset. + * + * + * @author Phil Mesnier <mesnier_p@ociweb.com> + */ +//============================================================================= + -ACE_RCSID(UCS4_UTF16, WUCS4_UTF16, "$Id$") +#include "WUCS4_UTF16.h" +#include "ace/OS_Memory.h" // **************************************************************** @@ -500,7 +495,7 @@ WUCS4_UTF16::write_wstring (ACE_OutputCDR & cdr, ACE_UTF16_T bom = ACE_UNICODE_BOM_CORRECT; ACE_CDR::ULong length = len + count_potential_surrogates (x, len); ACE_CDR::ULong l = length * ACE_UTF16_CODEPOINT_SIZE; - + if (this->write_4 (cdr, &l) && x != 0) { this->write_2 (cdr, &bom); @@ -510,21 +505,21 @@ WUCS4_UTF16::write_wstring (ACE_OutputCDR & cdr, else { ACE_CDR::ULong l = len + 1; - + if (this->write_4 (cdr, &l)) { if (x != 0) { return this->write_wchar_array (cdr, x, len + 1); } - else + else { ACE_UTF16_T s = 0; return this->write_2 (cdr, &s); } } } - + return 0; } @@ -582,7 +577,7 @@ WUCS4_UTF16::write_measured_wchar_array (ACE_OutputCDR & cdr, sbpos += encode_utf16 (& sb[sbpos], x[i]); } #if defined (ACE_ENABLE_SWAP_ON_WRITE) - // NOTE this will rarely be enabled. See the comments in ace/OS.h + // @note this will rarely be enabled. if (cdr.do_byte_swap()) { // note can't use swap_2_array because in-place swaps are not safe :-< diff --git a/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp b/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp index 17c3de41513..fa625d9c229 100644 --- a/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp +++ b/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16_Factory.cpp @@ -1,9 +1,8 @@ // -*- C++ -*- +// $Id$ #include "WUCS4_UTF16_Factory.h" -ACE_RCSID(UCS4_UTF16, WUCS4_UTF16_Factory, "$Id$") - ACE_STATIC_SVC_DEFINE (WUCS4_UTF16_Factory, ACE_TEXT ("WUCS4_UTF16_Factory"), ACE_SVC_OBJ_T, diff --git a/tests/CodeSets/libs/UTF16_UCS2/Makefile.am b/tests/CodeSets/libs/UTF16_UCS2/Makefile.am deleted file mode 100644 index 5f5c18e5ca4..00000000000 --- a/tests/CodeSets/libs/UTF16_UCS2/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.UTF16_UCS2_Translator.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES = libUTF16_UCS2.la - -libUTF16_UCS2_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DUTF16_UCS2_BUILD_DLL - -libUTF16_UCS2_la_SOURCES = \ - UTF16_UCS2_Factory.cpp \ - UTF16_UCS2_Translator.cpp - -noinst_HEADERS = \ - UTF16_UCS2_Factory.h \ - UTF16_UCS2_Translator.h \ - UTF16_UCS2_export.h - -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/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.cpp b/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.cpp index b532491333f..498630aa68c 100644 --- a/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.cpp +++ b/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.cpp @@ -1,21 +1,18 @@ // -*- C++ -*- -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tao/Codesets/translators/UTF16_UCS2/ -// -// = FILENAME -// UTF16_UCS2_Factory.cpp -// -// = DESCRIPTION -// A tempate instantiation of the codeset translator factory from TAO. -// -// = AUTHORS -// Byron Harris <harrisb@ociweb.com> -// -// ============================================================================ +//============================================================================= +/** + * @file UTF16_UCS2_Factory.cpp + * + * $Id$ + * + * A tempate instantiation of the codeset translator factory from TAO. + * + * + * @author Byron Harris <harrisb@ociweb.com> + */ +//============================================================================= + #include "UTF16_UCS2_Factory.h" diff --git a/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.h b/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.h index 3cc382fd3f7..84751e78266 100644 --- a/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.h +++ b/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Factory.h @@ -1,22 +1,18 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/CodeSets/translators/UTF16_UCS2 -// -// = FILENAME -// UTF16_UCS2_Factory.cpp -// -// = DESCRIPTION -// A tempate instantiation of a codeset translator factory from TAO. This -// loads the UTF16_UCS2_Translator. -// -// = AUTHORS -// Byron Harris <harrisb@ociweb.com> -// -// ============================================================================ + +//============================================================================= +/** + * @file UTF16_UCS2_Factory.h + * + * $Id$ + * + * A tempate instantiation of a codeset translator factory from TAO. This + * loads the UTF16_UCS2_Translator. + * + * + * @author Byron Harris <harrisb@ociweb.com> + */ +//============================================================================= #ifndef UTF16_UCS2_FACTORY_H #define UTF16_UCS2_FACTORY_H diff --git a/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp b/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp index 63fd91f1acb..0c01c8d314d 100644 --- a/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp +++ b/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp @@ -1,35 +1,31 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// UTF16_UCS2 -// -// = FILENAME -// UTF16_UCS2_Translator.cpp -// -// = DESCRIPTION -// Defines the arrays required to convert between UCS-2, a 2 byte wide char -// codeset, and UCS-16, aka unicode, a 2-byte codeset. As a bit-pattern -// these two should be identical, with the exception that UCS-2 cannot -// certain characters that UTF16 can, using escape codepoints. -// -// This translator can be dynamically loaded into TAO at run-time using -// a service configurator file with the following contents: -// -// dynamic UTF16_UCS2_Factory Service_Object * UTF16_UCS2:_make_UTF16_UCS2_Factory () -// -// static Resource_Factory -// "-ORBWCharCodesetTranslator UTF16_UCS2_Factory" -// -// This code used UTF16_BOM_Translator as a starting point. -// -// = AUTHOR -// Iliyan Jeliazkov <jeliazkov_i@ociweb.com> -// Byron Harris <harrisb@ociweb.com> -// -// ============================================================================ + +//============================================================================= +/** + * @file UTF16_UCS2_Translator.cpp + * + * $Id$ + * + * Defines the arrays required to convert between UCS-2, a 2 byte wide char + * codeset, and UCS-16, aka unicode, a 2-byte codeset. As a bit-pattern + * these two should be identical, with the exception that UCS-2 cannot + * certain characters that UTF16 can, using escape codepoints. + * + * This translator can be dynamically loaded into TAO at run-time using + * a service configurator file with the following contents: + * + * dynamic UTF16_UCS2_Factory Service_Object * UTF16_UCS2:_make_UTF16_UCS2_Factory () + * + * static Resource_Factory + * "-ORBWCharCodesetTranslator UTF16_UCS2_Factory" + * + * This code used UTF16_BOM_Translator as a starting point. + * + * + * @author Iliyan Jeliazkov <jeliazkov_i@ociweb.com> Byron Harris <harrisb@ociweb.com> + */ +//============================================================================= + #include "UTF16_UCS2_Translator.h" #include "tao/debug.h" #include "ace/Log_Msg.h" @@ -276,7 +272,7 @@ UTF16_UCS2_Translator::write_wstring (ACE_OutputCDR & cdr, { // pre GIOP 1.2: include null terminator in length ACE_CDR::ULong l = len + 1; - + if (this->write_4 (cdr, &l)) { if (x != 0) diff --git a/tests/CodeSets/simple/Makefile.am b/tests/CodeSets/simple/Makefile.am deleted file mode 100644 index 90ea5ee967f..00000000000 --- a/tests/CodeSets/simple/Makefile.am +++ /dev/null @@ -1,103 +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.CodeSets_Simple_Idl.am - -BUILT_SOURCES = \ - simpleC.cpp \ - simpleC.h \ - simpleC.inl \ - simpleS.cpp \ - simpleS.h \ - simpleS.inl - -CLEANFILES = \ - simple-stamp \ - simpleC.cpp \ - simpleC.h \ - simpleC.inl \ - simpleS.cpp \ - simpleS.h \ - simpleS.inl - -simpleC.cpp simpleC.h simpleC.inl simpleS.cpp simpleS.h simpleS.inl: simple-stamp - -simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/simple.idl - @touch $@ - -noinst_HEADERS = \ - simple.idl - -## Makefile.CodeSets_Simple_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 \ - simpleC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.CodeSets_Simple_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - simpleC.cpp \ - simpleS.cpp - -server_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/CodeSets/simple/client.cpp b/tests/CodeSets/simple/client.cpp index 217c0237b86..e3c2e1479cc 100644 --- a/tests/CodeSets/simple/client.cpp +++ b/tests/CodeSets/simple/client.cpp @@ -1,21 +1,18 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/CodeSets/simple -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// A simple client to demonstrate the use of codeset translation -// -// = AUTHORS -// Phil Mesnier <mesnier_p@ociweb.com> -// -// ============================================================================ + +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * A simple client to demonstrate the use of codeset translation + * + * + * @author Phil Mesnier <mesnier_p@ociweb.com> + */ +//============================================================================= + // IDL generated headers #include "simpleC.h" #include "ace/ace_wchar.h" diff --git a/tests/CodeSets/simple/cs_test.conf b/tests/CodeSets/simple/cs_test.conf index 23ef7b518ca..5fa6f6677f5 100644 --- a/tests/CodeSets/simple/cs_test.conf +++ b/tests/CodeSets/simple/cs_test.conf @@ -1,3 +1,5 @@ +# $Id$ + #First, load the appropriate codeset translator factories dynamic Char_IBM1047_ISO8859_Factory Service_Object * IBM1047_ISO8859:_make_Char_IBM1047_ISO8859_Factory () diff --git a/tests/CodeSets/simple/server.cpp b/tests/CodeSets/simple/server.cpp index 538f5ac20bd..47e9ed03870 100644 --- a/tests/CodeSets/simple/server.cpp +++ b/tests/CodeSets/simple/server.cpp @@ -1,21 +1,17 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/CodeSets/simple -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// A simple client to demonstrate the use of codeset translation -// -// = AUTHORS -// Phil Mesnier <mesnier_p@ociweb.com> -// -// ============================================================================ + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * A simple server to demonstrate the use of codeset translation + * + * + * @author Phil Mesnier <mesnier_p@ociweb.com> + */ +//============================================================================= // IDL generated header #include "simpleS.h" @@ -50,7 +46,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/tests/CodeSets/simple/svc.conf b/tests/CodeSets/simple/svc.conf index 6c80b23f6c6..431138a0b25 100644 --- a/tests/CodeSets/simple/svc.conf +++ b/tests/CodeSets/simple/svc.conf @@ -1 +1,3 @@ +# $Id$ + static Resource_Factory "-ORBNativeWcharCodeSet 0x00010001" diff --git a/tests/CodeSets/simple/wcs_test.conf b/tests/CodeSets/simple/wcs_test.conf index e2b83033d3e..68de1f76e8f 100644 --- a/tests/CodeSets/simple/wcs_test.conf +++ b/tests/CodeSets/simple/wcs_test.conf @@ -1,3 +1,5 @@ +# $Id$ + #First, load the appropriate codeset translator factories dynamic Char_IBM1047_ISO8859_Factory Service_Object * IBM1047_ISO8859:_make_Char_IBM1047_ISO8859_Factory () "" diff --git a/tests/Codec/Makefile.am b/tests/Codec/Makefile.am deleted file mode 100644 index 07994d5bc42..00000000000 --- a/tests/Codec/Makefile.am +++ /dev/null @@ -1,76 +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) - - -## Makefile.Codec_Client.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/Codec/client.cpp b/tests/Codec/client.cpp index f4f33f4fd41..a884ba63952 100644 --- a/tests/Codec/client.cpp +++ b/tests/Codec/client.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "tao/CodecFactory/CodecFactory.h" #include "tao/Codeset/Codeset.h" @@ -7,10 +8,6 @@ #include "ace/Log_Msg.h" -ACE_RCSID (Codec, - client, - "$Id$") - CORBA::WChar * gen_wstring (CORBA::ULong max_length) { @@ -81,7 +78,7 @@ test_codec (IOP::Codec_ptr codec) const CORBA::Long B = -3427; const CORBA::ULongLong C = ACE_UINT64_LITERAL (2001); const CORBA::Char D[] = "I'm Batman."; - const CORBA::WChar* E = gen_wstring (25); + CORBA::WChar* E = gen_wstring (25); // Create the structure to be encoded. Foo::Bar value; @@ -91,6 +88,8 @@ test_codec (IOP::Codec_ptr codec) value.D = CORBA::string_dup (D); value.E = CORBA::wstring_dup (E); + CORBA::wstring_free (E); + CORBA::Any data; data <<= value; diff --git a/tests/Collocated_Forwarding/Makefile.am b/tests/Collocated_Forwarding/Makefile.am deleted file mode 100644 index 5e140475483..00000000000 --- a/tests/Collocated_Forwarding/Makefile.am +++ /dev/null @@ -1,93 +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) - - -## Makefile.Collocated_Forwarding_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 -Gd -Sorb $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.Collocated_Forwarding_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Server_ORBInitializer.cpp \ - Server_Request_Interceptor.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.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 - -## 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/Collocated_Forwarding/Server_ORBInitializer.cpp b/tests/Collocated_Forwarding/Server_ORBInitializer.cpp index 76548d1dc1f..ea9486a45f6 100644 --- a/tests/Collocated_Forwarding/Server_ORBInitializer.cpp +++ b/tests/Collocated_Forwarding/Server_ORBInitializer.cpp @@ -1,12 +1,9 @@ // -*- C++ -*- +// $Id$ #include "Server_ORBInitializer.h" #include "tao/ORB_Constants.h" -ACE_RCSID (Collocated_Forwarding, - Server_ORBInitializer, - "$Id$") - #if TAO_HAS_INTERCEPTORS == 1 #include "Server_Request_Interceptor.h" diff --git a/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp b/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp index 409984578b0..784f8b14f8b 100644 --- a/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp +++ b/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "Server_Request_Interceptor.h" #include "tao/PI_Server/PI_Server.h" @@ -6,12 +7,6 @@ #include "tao/CDR.h" #include "testS.h" -ACE_RCSID (Collocated_Forwarding, - Server_Request_Interceptor, - "$Id$") - -//static const CORBA::ULong expected_version = 5; - Server_Request_Interceptor::Server_Request_Interceptor (CORBA::ULong request_pass_count) : request_pass_count_ (request_pass_count) , request_count_ (0) diff --git a/tests/Collocated_Forwarding/server.cpp b/tests/Collocated_Forwarding/server.cpp index 00b58854c2d..0fbf6222830 100644 --- a/tests/Collocated_Forwarding/server.cpp +++ b/tests/Collocated_Forwarding/server.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "test_i.h" @@ -11,10 +12,6 @@ #include "tao/IORManipulation/IORManipulation.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (Collocated_Forwarding, - server, - "$Id$") - const CORBA::ULong passes_before_forward = 6; bool direct_collocation = false; diff --git a/tests/Collocated_Forwarding/test_i.cpp b/tests/Collocated_Forwarding/test_i.cpp index a76b0fb8cff..fb70256f103 100644 --- a/tests/Collocated_Forwarding/test_i.cpp +++ b/tests/Collocated_Forwarding/test_i.cpp @@ -1,12 +1,9 @@ +// $Id$ // -*- C++ -*- #include "test_i.h" #include "tao/PortableServer/ForwardRequestC.h" -ACE_RCSID (Collocated_Forwarding, - test_i, - "$Id$") - test_i::test_i (CORBA::Short id, bool direct, CORBA::ORB_ptr orb) diff --git a/tests/Collocation/Collocation.cpp b/tests/Collocation/Collocation.cpp index 2f59a551dfb..8c5a05ae53f 100644 --- a/tests/Collocation/Collocation.cpp +++ b/tests/Collocation/Collocation.cpp @@ -3,8 +3,6 @@ #include "Collocation_Tester.h" #include "tao/Strategies/advanced_resource.h" -ACE_RCSID(Collocation, main, "$Id$") - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try diff --git a/tests/Collocation/Collocation_Tester.h b/tests/Collocation/Collocation_Tester.h index 180dbf6958d..025f0398008 100644 --- a/tests/Collocation/Collocation_Tester.h +++ b/tests/Collocation/Collocation_Tester.h @@ -1,18 +1,17 @@ -// $Id$ - -//============================================================================ -// -// = FILENAME -// Collocation_Test.h -// -// = DESCRIPTION -// Server class to perform testing of TAO's collocation mechanism. -// -// = AUTHOR -// Nanbor Wang -// + +//============================================================================= +/** + * @file Collocation_Tester.h + * + * $Id$ + * + * Server class to perform testing of TAO's collocation mechanism. + * + * @author Nanbor Wang + */ //============================================================================= + #if !defined (TAO_COLLOCATION_TEST_H) #define TAO_COLLOCATION_TEST_H @@ -22,8 +21,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - - class Collocation_Test { public: @@ -31,18 +28,18 @@ public: void shutdown (void); + /// Initializing the Collocation_Test object. int init (int argc, ACE_TCHAR *argv[]); - // Initializing the Collocation_Test object. + /// Parse the test specific arguments. int parse_args (int argc, ACE_TCHAR *argv[]); - // Parse the test specific arguments. + /// This test narrow an object reference to its base class and see + /// if it works correctly. int test_narrow (void); - // This test narrow an object reference to its base class and see - // if it works correctly. + /// Run the test. int run (void); - // Run the test. private: CORBA::ORB_var orb_; @@ -51,14 +48,14 @@ private: PortableServer::POAManager_var poa_manager_; + /// Our basic test object. CORBA::Object_var diamond_obj_; - // Our basic test object. + /// A collection of servant for basic narrowing test. Top_i top_servant_; Left_i left_servant_; Right_i right_servant_; Buttom_i diamond_servant_; - // A collection of servant for basic narrowing test. }; #endif /* TAO_COLLOCATION_TEST_H */ diff --git a/tests/Collocation/Makefile.am b/tests/Collocation/Makefile.am deleted file mode 100644 index ca58242f820..00000000000 --- a/tests/Collocation/Makefile.am +++ /dev/null @@ -1,131 +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.Collocation_Idl.am - -BUILT_SOURCES = \ - DiamondC.cpp \ - DiamondC.h \ - DiamondC.inl \ - DiamondS.cpp \ - DiamondS.h \ - DiamondS.inl - -CLEANFILES = \ - Diamond-stamp \ - DiamondC.cpp \ - DiamondC.h \ - DiamondC.inl \ - DiamondS.cpp \ - DiamondS.h \ - DiamondS.inl - -DiamondC.cpp DiamondC.h DiamondC.inl DiamondS.cpp DiamondS.h DiamondS.inl: Diamond-stamp - -Diamond-stamp: $(srcdir)/Diamond.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd -St -Sa $(srcdir)/Diamond.idl - @touch $@ - -noinst_HEADERS = \ - Diamond.idl - -## Makefile.Collocation_Test_Stub.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES += libCollocation_Test_Stub.la - -libCollocation_Test_Stub_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DMY_STUB_BUILD_DLL - -libCollocation_Test_Stub_la_SOURCES = \ - DiamondC.cpp - -noinst_HEADERS += \ - Collocation_Tester.h \ - Diamond_i.h \ - diamond_export.h \ - stub_export.h - -endif BUILD_EXCEPTIONS - -## Makefile.Collocation_Diamond.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES += libCollocation_Diamond.la - -libCollocation_Diamond_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DDIAMOND_BUILD_DLL - -libCollocation_Diamond_la_SOURCES = \ - DiamondS.cpp \ - Diamond_i.cpp - -noinst_HEADERS += \ - Diamond_i.h - -endif BUILD_EXCEPTIONS - -## Makefile.Collocation_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Collocation - -Collocation_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocation_SOURCES = \ - Collocation.cpp \ - Collocation_Tester.cpp \ - Collocation_Tester.h - -Collocation_LDADD = \ - libCollocation_Test_Stub.la \ - libCollocation_Diamond.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/Collocation/svc.conf b/tests/Collocation/svc.conf index 285b1297bd4..826ce10d8f7 100644 --- a/tests/Collocation/svc.conf +++ b/tests/Collocation/svc.conf @@ -8,7 +8,7 @@ static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocato # Make sure we use RW client handler so if something goes wrong, the program will bloc, # i.e., won't work. -static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW" +static Client_Strategy_Factory "-ORBClientConnectionHandler RW" # Not absolutely necessary for this test, but we add it for fun. -static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null" +static Server_Strategy_Factory "-ORBConcurrency reactive" diff --git a/tests/Collocation/svc.conf.xml b/tests/Collocation/svc.conf.xml index 36246c69725..f5c0a307879 100644 --- a/tests/Collocation/svc.conf.xml +++ b/tests/Collocation/svc.conf.xml @@ -9,7 +9,7 @@ <static id="Advanced_Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null"/> <!-- Make sure we use RW client handler so if something goes wrong, the program will bloc, --> <!-- i.e., won't work. --> - <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/> + <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/> <!-- Not absolutely necessary for this test, but we add it for fun. --> - <static id="Server_Strategy_Factory" params="-ORBConcurrency reactive -ORBPOALock null"/> + <static id="Server_Strategy_Factory" params="-ORBConcurrency reactive"/> </ACE_Svc_Conf> diff --git a/tests/CollocationLockup/Makefile.am b/tests/CollocationLockup/Makefile.am deleted file mode 100644 index 2c825426ada..00000000000 --- a/tests/CollocationLockup/Makefile.am +++ /dev/null @@ -1,130 +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.CollocationLockup_Idl.am - -BUILT_SOURCES = \ - ABC.cpp \ - ABC.h \ - ABC.inl \ - ABS.cpp \ - ABS.h \ - ABS.inl - -CLEANFILES = \ - AB-stamp \ - ABC.cpp \ - ABC.h \ - ABC.inl \ - ABS.cpp \ - ABS.h \ - ABS.inl - -ABC.cpp ABC.h ABC.inl ABS.cpp ABS.h ABS.inl: AB-stamp - -AB-stamp: $(srcdir)/AB.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/AB.idl - @touch $@ - -BUILT_SOURCES += \ - SimpleNamingServiceC.cpp \ - SimpleNamingServiceC.h \ - SimpleNamingServiceC.inl \ - SimpleNamingServiceS.cpp \ - SimpleNamingServiceS.h \ - SimpleNamingServiceS.inl - -CLEANFILES += \ - SimpleNamingService-stamp \ - SimpleNamingServiceC.cpp \ - SimpleNamingServiceC.h \ - SimpleNamingServiceC.inl \ - SimpleNamingServiceS.cpp \ - SimpleNamingServiceS.h \ - SimpleNamingServiceS.inl - -SimpleNamingServiceC.cpp SimpleNamingServiceC.h SimpleNamingServiceC.inl SimpleNamingServiceS.cpp SimpleNamingServiceS.h SimpleNamingServiceS.inl: SimpleNamingService-stamp - -SimpleNamingService-stamp: $(srcdir)/SimpleNamingService.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/SimpleNamingService.idl - @touch $@ - -noinst_HEADERS = \ - AB.idl \ - SimpleNamingService.idl - -## Makefile.CollocationLockup.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += CollocationLockup - -CollocationLockup_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -CollocationLockup_SOURCES = \ - ABC.cpp \ - ABS.cpp \ - CollocationLockup.cpp \ - SimpleNamingServiceC.cpp - -CollocationLockup_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.CollocationLockup_SimpleNamingService.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += SimpleNamingService - -SimpleNamingService_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -SimpleNamingService_SOURCES = \ - SimpleNamingService.cpp \ - SimpleNamingServiceC.cpp \ - SimpleNamingServiceS.cpp - -SimpleNamingService_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/CollocationLockup/SimpleNamingService.cpp b/tests/CollocationLockup/SimpleNamingService.cpp index 8cf3656ab17..828b3f6082b 100644 --- a/tests/CollocationLockup/SimpleNamingService.cpp +++ b/tests/CollocationLockup/SimpleNamingService.cpp @@ -101,7 +101,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/tests/Collocation_Exception_Test/Client_Task.cpp b/tests/Collocation_Exception_Test/Client_Task.cpp index 5ce1ca97e70..49606c9134d 100644 --- a/tests/Collocation_Exception_Test/Client_Task.cpp +++ b/tests/Collocation_Exception_Test/Client_Task.cpp @@ -4,8 +4,6 @@ #include "Client_Task.h" -ACE_RCSID(Collocation_Oneway_Tests, Client_Task, "$Id$") - Client_Task::Client_Task (const ACE_TCHAR *ior, CORBA::ORB_ptr corb, ACE_Thread_Manager *thr_mgr) diff --git a/tests/Collocation_Exception_Test/Collocated_Test.cpp b/tests/Collocation_Exception_Test/Collocated_Test.cpp index 5cb8e4450f3..b04daa281e7 100644 --- a/tests/Collocation_Exception_Test/Collocated_Test.cpp +++ b/tests/Collocation_Exception_Test/Collocated_Test.cpp @@ -38,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) // This is a hack but that is okay! return 0; } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Collocation_Exception_Test/Hello.cpp b/tests/Collocation_Exception_Test/Hello.cpp index 53b174e7c1e..36b16d486c8 100644 --- a/tests/Collocation_Exception_Test/Hello.cpp +++ b/tests/Collocation_Exception_Test/Hello.cpp @@ -6,8 +6,6 @@ #include "tao/ORB_Table.h" #include "tao/ORB_Core_Auto_Ptr.h" -ACE_RCSID(Collocation_Oneway_Tests, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb, ACE_thread_t thrid) : orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/tests/Collocation_Exception_Test/Hello.h b/tests/Collocation_Exception_Test/Hello.h index 3fef01855b0..4f4b64b9646 100644 --- a/tests/Collocation_Exception_Test/Hello.h +++ b/tests/Collocation_Exception_Test/Hello.h @@ -13,8 +13,6 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ -#include "ace/OS.h" - /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello diff --git a/tests/Collocation_Exception_Test/Makefile.am b/tests/Collocation_Exception_Test/Makefile.am deleted file mode 100644 index 7273e7f0ff4..00000000000 --- a/tests/Collocation_Exception_Test/Makefile.am +++ /dev/null @@ -1,84 +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) - - -## Makefile.Collocation_Excep_Test.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) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = Collocated_Test - -Collocated_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocated_Test_SOURCES = \ - Client_Task.cpp \ - Collocated_Test.cpp \ - Hello.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - Client_Task.h \ - Hello.h \ - Server_Task.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -Collocated_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/Collocation_Exception_Test/Server_Task.cpp b/tests/Collocation_Exception_Test/Server_Task.cpp index ea5496296a4..d1192e1964c 100644 --- a/tests/Collocation_Exception_Test/Server_Task.cpp +++ b/tests/Collocation_Exception_Test/Server_Task.cpp @@ -1,17 +1,10 @@ -// // $Id$ -// #include "Server_Task.h" #include "TestS.h" #include "Hello.h" #include "ace/Manual_Event.h" -ACE_RCSID(Collocation_Oneway_Tests, - Server_Task, - "$Id$") - - Server_Task::Server_Task (const ACE_TCHAR *output, CORBA::ORB_ptr sorb, ACE_Manual_Event &me, diff --git a/tests/Collocation_Oneway_Tests/Client_Task.cpp b/tests/Collocation_Oneway_Tests/Client_Task.cpp index 8d4f66f76ca..60def11ca92 100644 --- a/tests/Collocation_Oneway_Tests/Client_Task.cpp +++ b/tests/Collocation_Oneway_Tests/Client_Task.cpp @@ -7,8 +7,6 @@ #include "Client_Task.h" #include "TestC.h" -ACE_RCSID(Collocation_Oneway_Tests, Client_Task, "$Id$") - Client_Task::Client_Task (const ACE_TCHAR *ior, CORBA::ORB_ptr corb, Client_Task::ClientSyncModeEnum syncMode, diff --git a/tests/Collocation_Oneway_Tests/Collocated_Test.cpp b/tests/Collocation_Oneway_Tests/Collocated_Test.cpp index 4de9593aa3c..ee2e5374ba8 100644 --- a/tests/Collocation_Oneway_Tests/Collocated_Test.cpp +++ b/tests/Collocation_Oneway_Tests/Collocated_Test.cpp @@ -63,7 +63,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) // This is a hack but that is okay! return 0; } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Collocation_Oneway_Tests/Hello.cpp b/tests/Collocation_Oneway_Tests/Hello.cpp index 41679d5a852..921f90448bc 100644 --- a/tests/Collocation_Oneway_Tests/Hello.cpp +++ b/tests/Collocation_Oneway_Tests/Hello.cpp @@ -6,9 +6,7 @@ #include "tao/ORB_Table.h" #include "tao/ORB_Core_Auto_Ptr.h" -ACE_RCSID(Collocation_Oneway_Tests, Hello, "$Id$") - - Hello::Hello (CORBA::ORB_ptr orb, +Hello::Hello (CORBA::ORB_ptr orb, ACE_thread_t thrid) : orb_ (CORBA::ORB::_duplicate (orb)) , thr_id_ (thrid) diff --git a/tests/Collocation_Oneway_Tests/Hello.h b/tests/Collocation_Oneway_Tests/Hello.h index 8bc4edf7d76..afd234e120e 100644 --- a/tests/Collocation_Oneway_Tests/Hello.h +++ b/tests/Collocation_Oneway_Tests/Hello.h @@ -13,8 +13,6 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ -#include "ace/OS.h" - /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello diff --git a/tests/Collocation_Oneway_Tests/Makefile.am b/tests/Collocation_Oneway_Tests/Makefile.am deleted file mode 100644 index bce8b83c0a1..00000000000 --- a/tests/Collocation_Oneway_Tests/Makefile.am +++ /dev/null @@ -1,90 +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) - - -## Makefile.Collocation_Oneway_Tests.am - -if BUILD_CORBA_MESSAGING -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 = Collocated_Test - -Collocated_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocated_Test_SOURCES = \ - Client_Task.cpp \ - Collocated_Test.cpp \ - Hello.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - Client_Task.h \ - Hello.h \ - Server_Task.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -Collocated_Test_LDADD = \ - $(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_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 - -## 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/Collocation_Oneway_Tests/Server_Task.cpp b/tests/Collocation_Oneway_Tests/Server_Task.cpp index 94c63039df9..d2a0bdaecb4 100644 --- a/tests/Collocation_Oneway_Tests/Server_Task.cpp +++ b/tests/Collocation_Oneway_Tests/Server_Task.cpp @@ -7,11 +7,6 @@ #include "ace/Manual_Event.h" -ACE_RCSID(Collocation_Oneway_Tests, - Server_Task, - "$Id$") - - Server_Task::Server_Task (const ACE_TCHAR *output, CORBA::ORB_ptr sorb, ACE_Manual_Event &me, diff --git a/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/tests/Collocation_Opportunities/Collocation_Opportunities.cpp index df34a81f5cb..eec18639103 100644 --- a/tests/Collocation_Opportunities/Collocation_Opportunities.cpp +++ b/tests/Collocation_Opportunities/Collocation_Opportunities.cpp @@ -6,8 +6,6 @@ #include "tao/PortableServer/POA_Current.h" #include "tao/PortableServer/POA_Current_Impl.h" -ACE_RCSID(Collocation_Opportunities, Collocation_Opportunities, "$Id$") - class test_i : public POA_test { diff --git a/tests/Collocation_Opportunities/Makefile.am b/tests/Collocation_Opportunities/Makefile.am deleted file mode 100644 index ce280245b4a..00000000000 --- a/tests/Collocation_Opportunities/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.Collocation_Opportunities.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) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Collocation_Opportunities - -Collocation_Opportunities_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocation_Opportunities_SOURCES = \ - Collocation_Opportunities.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Collocation_Opportunities_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/Collocation_Opportunities/svc.conf b/tests/Collocation_Opportunities/svc.conf index 6e589381660..73d9e3ccee4 100644 --- a/tests/Collocation_Opportunities/svc.conf +++ b/tests/Collocation_Opportunities/svc.conf @@ -1 +1,3 @@ +# $Id$ + static Client_Strategy_Factory "-ORBClientConnectionHandler RW" diff --git a/tests/Collocation_Tests/Client_Task.cpp b/tests/Collocation_Tests/Client_Task.cpp index ea7315e7d77..e39e0d96191 100644 --- a/tests/Collocation_Tests/Client_Task.cpp +++ b/tests/Collocation_Tests/Client_Task.cpp @@ -5,8 +5,6 @@ #include "Client_Task.h" #include "TestC.h" -ACE_RCSID(Muxing, Client_Task, "$Id$") - Client_Task::Client_Task (const ACE_TCHAR *ior, CORBA::ORB_ptr corb, ACE_Thread_Manager *thr_mgr) diff --git a/tests/Collocation_Tests/Collocated_Test.cpp b/tests/Collocation_Tests/Collocated_Test.cpp index 3e3b278ebed..282295ad5e3 100644 --- a/tests/Collocation_Tests/Collocated_Test.cpp +++ b/tests/Collocation_Tests/Collocated_Test.cpp @@ -36,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) // This is a hack but that is okay! return 0; } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Collocation_Tests/Hello.cpp b/tests/Collocation_Tests/Hello.cpp index a0740830551..cabcd9145d9 100644 --- a/tests/Collocation_Tests/Hello.cpp +++ b/tests/Collocation_Tests/Hello.cpp @@ -6,8 +6,6 @@ #include "tao/ORB_Table.h" #include "tao/ORB_Core_Auto_Ptr.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb, ACE_thread_t thrid) : orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/tests/Collocation_Tests/Hello.h b/tests/Collocation_Tests/Hello.h index 556409e5d00..1d5e27d075f 100644 --- a/tests/Collocation_Tests/Hello.h +++ b/tests/Collocation_Tests/Hello.h @@ -8,8 +8,6 @@ #include "TestS.h" -#include "ace/OS.h" - /// Implement the Test::Hello interface class Hello : public virtual POA_Test::Hello diff --git a/tests/Collocation_Tests/Makefile.am b/tests/Collocation_Tests/Makefile.am deleted file mode 100644 index c79c256f1fe..00000000000 --- a/tests/Collocation_Tests/Makefile.am +++ /dev/null @@ -1,84 +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) - - -## Makefile.Collocation_Tests.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) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = Collocated_Test - -Collocated_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocated_Test_SOURCES = \ - Client_Task.cpp \ - Collocated_Test.cpp \ - Hello.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - Client_Task.h \ - Hello.h \ - Server_Task.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -Collocated_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/Collocation_Tests/Server_Task.cpp b/tests/Collocation_Tests/Server_Task.cpp index 03f568c7472..98f37e052e3 100644 --- a/tests/Collocation_Tests/Server_Task.cpp +++ b/tests/Collocation_Tests/Server_Task.cpp @@ -7,11 +7,6 @@ #include "ace/Manual_Event.h" -ACE_RCSID(Collocated_Test, - Server_Task, - "$Id$") - - Server_Task::Server_Task (const ACE_TCHAR *output, CORBA::ORB_ptr sorb, ACE_Manual_Event &me, diff --git a/tests/Compression/Makefile.am b/tests/Compression/Makefile.am deleted file mode 100644 index 91112abd666..00000000000 --- a/tests/Compression/Makefile.am +++ /dev/null @@ -1,55 +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.Compression_Test_Server.am - -if BUILD_EXCEPTIONS -if BUILD_ZLIB - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - $(ACE_ZLIB_CPPFLAGS) - -server_SOURCES = \ - server.cpp - -server_LDFLAGS = \ - $(ACE_ZLIB_LDFLAGS) - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_ZlibCompressor.la \ - $(TAO_BUILDDIR)/tao/libTAO_Compression.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_ZLIB_LIBS) - -endif BUILD_ZLIB -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/Compression/bzip2server.cpp b/tests/Compression/bzip2server.cpp index 79cf5feb27c..2fefc02091e 100644 --- a/tests/Compression/bzip2server.cpp +++ b/tests/Compression/bzip2server.cpp @@ -6,10 +6,6 @@ #include "tao/Compression/Compression.h" #include "tao/Compression/bzip2/Bzip2Compressor_Factory.h" -ACE_RCSID (Hello, - server, - "$Id$") - bool test_invalid_compression_factory (Compression::CompressionManager_ptr cm) { diff --git a/tests/Compression/lzoserver.cpp b/tests/Compression/lzoserver.cpp index 735e14d7c30..767aa44933d 100644 --- a/tests/Compression/lzoserver.cpp +++ b/tests/Compression/lzoserver.cpp @@ -6,10 +6,6 @@ #include "tao/Compression/Compression.h" #include "tao/Compression/lzo/LzoCompressor_Factory.h" -ACE_RCSID (Hello, - server, - "$Id$") - bool test_invalid_compression_factory (Compression::CompressionManager_ptr cm) { diff --git a/tests/Compression/zlibserver.cpp b/tests/Compression/zlibserver.cpp index bdd9c164380..e6f69de9958 100644 --- a/tests/Compression/zlibserver.cpp +++ b/tests/Compression/zlibserver.cpp @@ -6,10 +6,6 @@ #include "tao/Compression/Compression.h" #include "tao/Compression/zlib/ZlibCompressor_Factory.h" -ACE_RCSID (Hello, - server, - "$Id$") - bool test_invalid_compression_factory (Compression::CompressionManager_ptr cm) { @@ -175,7 +171,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (!test_compression (5, manager.in ())) retval = 1; - + if (!test_invalid_compression_factory (manager.in ())) retval = 1; diff --git a/tests/Connect_Strategy_Test/Hello.cpp b/tests/Connect_Strategy_Test/Hello.cpp index eabcfbe8db7..0f62f20b906 100644 --- a/tests/Connect_Strategy_Test/Hello.cpp +++ b/tests/Connect_Strategy_Test/Hello.cpp @@ -3,9 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Connect_Strategy_Test, - Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Connect_Strategy_Test/Makefile.am b/tests/Connect_Strategy_Test/Makefile.am deleted file mode 100644 index 9ed011a782d..00000000000 --- a/tests/Connect_Strategy_Test/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.Connect_Strategy_Test_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.Connect_Strategy_Test_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 \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Connect_Strategy_Test_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_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/Connect_Strategy_Test/client.cpp b/tests/Connect_Strategy_Test/client.cpp index cf593a590bc..ca86ad002ba 100644 --- a/tests/Connect_Strategy_Test/client.cpp +++ b/tests/Connect_Strategy_Test/client.cpp @@ -3,10 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Connect_Strategy_Test, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int do_shutdown = 0; int @@ -34,7 +30,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/tests/Connect_Strategy_Test/server.cpp b/tests/Connect_Strategy_Test/server.cpp index 701f036d466..ab19d0fb0a7 100644 --- a/tests/Connect_Strategy_Test/server.cpp +++ b/tests/Connect_Strategy_Test/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Connect_Strategy_Test, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +28,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/tests/Connection_Failure/Makefile.am b/tests/Connection_Failure/Makefile.am deleted file mode 100644 index a2a6971f68f..00000000000 --- a/tests/Connection_Failure/Makefile.am +++ /dev/null @@ -1,73 +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) - - -## Makefile.Connection_Failure_Client.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl 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_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -client_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/Connection_Failure/client.cpp b/tests/Connection_Failure/client.cpp index 41012833ee6..0f33ce2fa4e 100644 --- a/tests/Connection_Failure/client.cpp +++ b/tests/Connection_Failure/client.cpp @@ -5,10 +5,6 @@ #include "ace/Log_Msg.h" -ACE_RCSID (Connection_Failure, - client, - "$Id$") - const char *ior = "corbaloc:iiop:192.3.47/10007/RandomObject"; diff --git a/tests/Connection_Purging/Makefile.am b/tests/Connection_Purging/Makefile.am deleted file mode 100644 index a2b1c6208b2..00000000000 --- a/tests/Connection_Purging/Makefile.am +++ /dev/null @@ -1,112 +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.Connection_Purging_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.Connection_Purging_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 \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Connection_Purging_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/Connection_Purging/client.cpp b/tests/Connection_Purging/client.cpp index a4657c52a7a..a9e2ea6951b 100644 --- a/tests/Connection_Purging/client.cpp +++ b/tests/Connection_Purging/client.cpp @@ -29,7 +29,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/tests/Connection_Purging/server.cpp b/tests/Connection_Purging/server.cpp index 37e1db87cb3..dbc357a6378 100644 --- a/tests/Connection_Purging/server.cpp +++ b/tests/Connection_Purging/server.cpp @@ -28,7 +28,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/tests/Connection_Timeout/Makefile.am b/tests/Connection_Timeout/Makefile.am deleted file mode 100644 index b053424045e..00000000000 --- a/tests/Connection_Timeout/Makefile.am +++ /dev/null @@ -1,83 +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) - - -## Makefile.Connection_Timeout_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if !BUILD_ACE_FOR_TAO - -BUILT_SOURCES = \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -CLEANFILES = \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TestC.cpp \ - client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -client_LDADD = \ - $(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_PortableServer.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 -endif BUILD_CORBA_MESSAGING - -## 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/Connection_Timeout/client.cpp b/tests/Connection_Timeout/client.cpp index 81e0bae0828..23465cdc223 100644 --- a/tests/Connection_Timeout/client.cpp +++ b/tests/Connection_Timeout/client.cpp @@ -6,8 +6,6 @@ #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" -ACE_RCSID(Connection_Timeout, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("corbaloc:iiop:192.3.47/10007/RandomObject"); @@ -36,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/tests/Crash_On_Write/Crash_Task.cpp b/tests/Crash_On_Write/Crash_Task.cpp index 1c3528b7a99..98bfa8fc189 100644 --- a/tests/Crash_On_Write/Crash_Task.cpp +++ b/tests/Crash_On_Write/Crash_Task.cpp @@ -5,8 +5,6 @@ #include "Crash_Task.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Crash_On_Write, Crash_Task, "$Id$") - Crash_Task::Crash_Task (ACE_Thread_Manager *thr_mgr, const ACE_Time_Value &running_time) : ACE_Task_Base (thr_mgr) diff --git a/tests/Crash_On_Write/Makefile.am b/tests/Crash_On_Write/Makefile.am deleted file mode 100644 index e8964571017..00000000000 --- a/tests/Crash_On_Write/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.Crash_On_Write_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.Crash_On_Write_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 \ - Crash_Task.h \ - Oneway_Receiver.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Crash_On_Write_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Crash_Task.cpp \ - Oneway_Receiver.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Crash_Task.h \ - Oneway_Receiver.h - -server_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/Crash_On_Write/Oneway_Receiver.cpp b/tests/Crash_On_Write/Oneway_Receiver.cpp index 8b7f4f4119a..fba9d40f60d 100644 --- a/tests/Crash_On_Write/Oneway_Receiver.cpp +++ b/tests/Crash_On_Write/Oneway_Receiver.cpp @@ -3,8 +3,6 @@ // #include "Oneway_Receiver.h" -ACE_RCSID(Crash_On_Write, Oneway_Receiver, "$Id$") - Oneway_Receiver::Oneway_Receiver (void) { } diff --git a/tests/Crash_On_Write/client.cpp b/tests/Crash_On_Write/client.cpp index 3e8c2690e68..6ffabbd27a2 100644 --- a/tests/Crash_On_Write/client.cpp +++ b/tests/Crash_On_Write/client.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Crash_On_Write, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int iterations = 2000; @@ -36,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/tests/Crash_On_Write/server.cpp b/tests/Crash_On_Write/server.cpp index 5aa34a88ae3..8863e07603f 100644 --- a/tests/Crash_On_Write/server.cpp +++ b/tests/Crash_On_Write/server.cpp @@ -4,8 +4,6 @@ #include "Crash_Task.h" #include "ace/Get_Opt.h" -ACE_RCSID(Crash_On_Write, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -30,7 +28,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/tests/Crashed_Callback/Crashed_Callback.cpp b/tests/Crashed_Callback/Crashed_Callback.cpp index 511d85e87d2..c23bfc16932 100644 --- a/tests/Crashed_Callback/Crashed_Callback.cpp +++ b/tests/Crashed_Callback/Crashed_Callback.cpp @@ -3,8 +3,6 @@ // #include "Crashed_Callback.h" -ACE_RCSID(Crashed_Callback, Crashed_Callback, "$Id$") - Crashed_Callback::Crashed_Callback (void) { } @@ -20,10 +18,9 @@ Crashed_Callback::crash_now_please (void) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Crashed_Callback - crashing application\n")); -// Tru64 seems to hang and not abort and dump core when abort() is called -// here. This needs further investigation. This fix is a temporary one. -// Likewise for OpenVMS. -#if defined (DIGITAL_UNIX) || defined (DEC_CXX) || defined (ACE_OPENVMS) +// OpenVMS seems to hang and not abort and dump core when abort() is called +// here. This needs further +#if defined (DEC_CXX) || defined (ACE_OPENVMS) ACE_OS::_exit(); #else ACE_OS::abort(); diff --git a/tests/Crashed_Callback/Makefile.am b/tests/Crashed_Callback/Makefile.am deleted file mode 100644 index cdfbd0587d9..00000000000 --- a/tests/Crashed_Callback/Makefile.am +++ /dev/null @@ -1,121 +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.Crashed_Callback_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.Crashed_Callback_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 = \ - Crashed_Callback.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Crashed_Callback.h - -client_LDADD = \ - $(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_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.Crashed_Callback_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Service.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Service.h - -server_LDADD = \ - $(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_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 - -## 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/Crashed_Callback/Service.cpp b/tests/Crashed_Callback/Service.cpp index 60de5a6d5d6..0f0a6f17474 100644 --- a/tests/Crashed_Callback/Service.cpp +++ b/tests/Crashed_Callback/Service.cpp @@ -3,8 +3,6 @@ // #include "Service.h" -ACE_RCSID(Crashed_Callback, Service, "$Id$") - Service::Service (void) : orb_ (CORBA::ORB::_nil ()), test_count_ (0) diff --git a/tests/Crashed_Callback/client.cpp b/tests/Crashed_Callback/client.cpp index 3530be3caba..33b5e775ea0 100644 --- a/tests/Crashed_Callback/client.cpp +++ b/tests/Crashed_Callback/client.cpp @@ -6,8 +6,6 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" -ACE_RCSID(Crashed_Callback, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -31,7 +29,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/tests/Crashed_Callback/server.cpp b/tests/Crashed_Callback/server.cpp index 107e83b1b12..2c74b294c77 100644 --- a/tests/Crashed_Callback/server.cpp +++ b/tests/Crashed_Callback/server.cpp @@ -7,8 +7,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Crashed_Callback, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +30,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/tests/DII_AMI_Forward/Makefile.am b/tests/DII_AMI_Forward/Makefile.am deleted file mode 100644 index 81d0271bee6..00000000000 --- a/tests/DII_AMI_Forward/Makefile.am +++ /dev/null @@ -1,126 +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.DII_AMI_Forward_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.DII_AMI_Forward_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 = \ - DII_ReplyHandler.cpp \ - client.cpp \ - testC.cpp \ - DII_ReplyHandler.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_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.DII_AMI_Forward_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - orb_initializer.cpp \ - server.cpp \ - server_interceptor.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - orb_initializer.h \ - server_interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## 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/DII_AMI_Forward/README b/tests/DII_AMI_Forward/README index 4ec6a7896b8..2c493a3c740 100644 --- a/tests/DII_AMI_Forward/README +++ b/tests/DII_AMI_Forward/README @@ -1,5 +1,5 @@ /** -$Id:$ +$Id$ @page DII_AMI_Forward Test README File diff --git a/tests/DII_AMI_Forward/client.cpp b/tests/DII_AMI_Forward/client.cpp index 44aa03178cc..93db338da7d 100644 --- a/tests/DII_AMI_Forward/client.cpp +++ b/tests/DII_AMI_Forward/client.cpp @@ -47,7 +47,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/DII_AMI_Forward/server.cpp b/tests/DII_AMI_Forward/server.cpp index dbdb20255ad..f9b0ef97a4b 100644 --- a/tests/DII_AMI_Forward/server.cpp +++ b/tests/DII_AMI_Forward/server.cpp @@ -35,7 +35,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/tests/DII_AMI_Forward/server_interceptor.cpp b/tests/DII_AMI_Forward/server_interceptor.cpp index 4ac94e07c1a..82d60fb0298 100644 --- a/tests/DII_AMI_Forward/server_interceptor.cpp +++ b/tests/DII_AMI_Forward/server_interceptor.cpp @@ -8,7 +8,9 @@ #include "ace/Thread.h" ForwardTest_Request_Interceptor::ForwardTest_Request_Interceptor (void) - : myname_ ("ForwardTest_Interceptor") + : myname_ ("ForwardTest_Interceptor"), + forward_location_ (CORBA::Object::_nil ()), + forward_location_done_ (false) { } diff --git a/tests/DII_Collocation_Tests/Makefile.am b/tests/DII_Collocation_Tests/Makefile.am deleted file mode 100644 index 2ceb2638651..00000000000 --- a/tests/DII_Collocation_Tests/Makefile.am +++ /dev/null @@ -1,14 +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 = \ - oneway \ - twoway - diff --git a/tests/DII_Collocation_Tests/oneway/Client_Task.cpp b/tests/DII_Collocation_Tests/oneway/Client_Task.cpp index f202d38bda6..38f5464a7dd 100644 --- a/tests/DII_Collocation_Tests/oneway/Client_Task.cpp +++ b/tests/DII_Collocation_Tests/oneway/Client_Task.cpp @@ -8,8 +8,6 @@ #include "TestC.h" #include "tao/Object.h" -ACE_RCSID(DII_Collocation_Tests, Client_Task, "$Id$") - char TEST_STR[] = "This is a DII collocation test."; CORBA::Long TEST_BASIC_VALUE = 12345; CORBA::Char TEST_SPECIAL_VALUE = 'x'; diff --git a/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp b/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp index 419a268a3e1..c62f0414f05 100644 --- a/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp +++ b/tests/DII_Collocation_Tests/oneway/Collocated_Test.cpp @@ -45,7 +45,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) // This is a hack but that is okay! return 0; } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/DII_Collocation_Tests/oneway/Hello.cpp b/tests/DII_Collocation_Tests/oneway/Hello.cpp index 4ce5dd499d6..976993601f0 100644 --- a/tests/DII_Collocation_Tests/oneway/Hello.cpp +++ b/tests/DII_Collocation_Tests/oneway/Hello.cpp @@ -8,8 +8,6 @@ // Force static build to load the DII_Arguments_Converter service. #include "tao/DynamicInterface/DII_Arguments_Converter_Impl.h" -ACE_RCSID(DII_Collocation_Tests, Hello, "$Id$") - extern CORBA::Boolean debug; extern char TEST_STR[]; extern CORBA::Long TEST_BASIC_VALUE; diff --git a/tests/DII_Collocation_Tests/oneway/Hello.h b/tests/DII_Collocation_Tests/oneway/Hello.h index 70d46f4813a..e2f9c1c9a8c 100644 --- a/tests/DII_Collocation_Tests/oneway/Hello.h +++ b/tests/DII_Collocation_Tests/oneway/Hello.h @@ -8,8 +8,6 @@ #include "TestS.h" -#include "ace/OS.h" - class Test_Simple_Test_i : public virtual POA_Test::Simple_Test { diff --git a/tests/DII_Collocation_Tests/oneway/Makefile.am b/tests/DII_Collocation_Tests/oneway/Makefile.am deleted file mode 100644 index a974149784d..00000000000 --- a/tests/DII_Collocation_Tests/oneway/Makefile.am +++ /dev/null @@ -1,91 +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) - - -## Makefile.DII_Collocation_Tests_Oneway.am - -if BUILD_CORBA_MESSAGING -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 = Collocated_Test - -Collocated_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocated_Test_SOURCES = \ - Client_Task.cpp \ - Collocated_Test.cpp \ - Hello.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - Client_Task.h \ - Hello.h \ - Server_Task.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -Collocated_Test_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_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 - -## 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/DII_Collocation_Tests/oneway/Server_Task.cpp b/tests/DII_Collocation_Tests/oneway/Server_Task.cpp index 21b76077e47..792a5a89711 100644 --- a/tests/DII_Collocation_Tests/oneway/Server_Task.cpp +++ b/tests/DII_Collocation_Tests/oneway/Server_Task.cpp @@ -7,11 +7,6 @@ #include "ace/Manual_Event.h" -ACE_RCSID(DII_Collocation_Tests, - Server_Task, - "$Id$") - - Server_Task::Server_Task (const ACE_TCHAR *output, const ACE_TCHAR *simple_test_output, CORBA::ORB_ptr sorb, diff --git a/tests/DII_Collocation_Tests/oneway/Test.idl b/tests/DII_Collocation_Tests/oneway/Test.idl index a38d373dfbe..e3e8a70dc4d 100644 --- a/tests/DII_Collocation_Tests/oneway/Test.idl +++ b/tests/DII_Collocation_Tests/oneway/Test.idl @@ -53,16 +53,16 @@ module Test oneway void test_object_arg (in Object o); - oneway void test_args_1 (in Object arg1, - in char arg2, + oneway void test_args_1 (in Object arg1, + in char arg2, in Simple_Test arg3); - oneway void test_args_2 (in string arg1, - in Fixed_Array arg2, + oneway void test_args_2 (in string arg1, + in Fixed_Array arg2, in TimeOfDay arg3); oneway void test_args_3 (in Bounded_String arg1, - in Bounded_Var_Size_Arg arg2, + in Bounded_Var_Size_Arg arg2, in Unbounded_Var_Size_Arg arg3, in Var_Array arg4); diff --git a/tests/DII_Collocation_Tests/twoway/Client_Task.cpp b/tests/DII_Collocation_Tests/twoway/Client_Task.cpp index fa640489fbb..5a5c8ad8d83 100644 --- a/tests/DII_Collocation_Tests/twoway/Client_Task.cpp +++ b/tests/DII_Collocation_Tests/twoway/Client_Task.cpp @@ -8,8 +8,6 @@ #include "TestC.h" #include "tao/Object.h" -ACE_RCSID(DII_Collocation_Tests, Client_Task, "$Id$") - char TEST_STR[] = "This is a DII collocation test."; char NULL_STR[] = ""; CORBA::Long TEST_BASIC_VALUE = 12345; diff --git a/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp b/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp index 99145711150..a166851db35 100644 --- a/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp +++ b/tests/DII_Collocation_Tests/twoway/Collocated_Test.cpp @@ -49,7 +49,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) // This is a hack but that is okay! return 0; } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/DII_Collocation_Tests/twoway/Hello.cpp b/tests/DII_Collocation_Tests/twoway/Hello.cpp index a38a7d163a2..61eeb7e06e0 100644 --- a/tests/DII_Collocation_Tests/twoway/Hello.cpp +++ b/tests/DII_Collocation_Tests/twoway/Hello.cpp @@ -8,8 +8,6 @@ // Force static build to load the DII_Arguments_Converter service. #include "tao/DynamicInterface/DII_Arguments_Converter_Impl.h" -ACE_RCSID(DII_Collocation_Tests, Hello, "$Id$") - extern CORBA::Boolean debug; extern char TEST_STR[]; extern CORBA::Long TEST_BASIC_VALUE; diff --git a/tests/DII_Collocation_Tests/twoway/Hello.h b/tests/DII_Collocation_Tests/twoway/Hello.h index 4dae7429cb1..059d4f52de8 100644 --- a/tests/DII_Collocation_Tests/twoway/Hello.h +++ b/tests/DII_Collocation_Tests/twoway/Hello.h @@ -8,8 +8,6 @@ #include "TestS.h" -#include "ace/OS.h" - class Test_Simple_Test_i : public virtual POA_Test::Simple_Test { diff --git a/tests/DII_Collocation_Tests/twoway/Makefile.am b/tests/DII_Collocation_Tests/twoway/Makefile.am deleted file mode 100644 index 492b5f08186..00000000000 --- a/tests/DII_Collocation_Tests/twoway/Makefile.am +++ /dev/null @@ -1,91 +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) - - -## Makefile.DII_Collocation_Tests_Twoway.am - -if BUILD_CORBA_MESSAGING -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 = Collocated_Test - -Collocated_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocated_Test_SOURCES = \ - Client_Task.cpp \ - Collocated_Test.cpp \ - Hello.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - Client_Task.h \ - Hello.h \ - Server_Task.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -Collocated_Test_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_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 - -## 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/DII_Collocation_Tests/twoway/Server_Task.cpp b/tests/DII_Collocation_Tests/twoway/Server_Task.cpp index f7984939597..7729e61fac4 100644 --- a/tests/DII_Collocation_Tests/twoway/Server_Task.cpp +++ b/tests/DII_Collocation_Tests/twoway/Server_Task.cpp @@ -5,11 +5,6 @@ #include "TestS.h" #include "Hello.h" -ACE_RCSID(DII_Collocation_Tests, - Server_Task, - "$Id$") - - Server_Task::Server_Task (const ACE_TCHAR *output, const ACE_TCHAR *simple_test_output, CORBA::ORB_ptr sorb, diff --git a/tests/DII_Collocation_Tests/twoway/Test.idl b/tests/DII_Collocation_Tests/twoway/Test.idl index 8fa814b4920..f60690dee31 100644 --- a/tests/DII_Collocation_Tests/twoway/Test.idl +++ b/tests/DII_Collocation_Tests/twoway/Test.idl @@ -14,6 +14,7 @@ module Test typedef sequence<char> Unbounded_Var_Size_Arg; typedef long Fixed_Array[FIX_ARRAY_SIZE]; typedef string Var_Array [VAR_ARRAY_SIZE]; + typedef string<BOUNDED_STRING_SIZE> Bounded_String; struct TimeOfDay { short hour; // 0 - 23 @@ -35,7 +36,7 @@ module Test void test_unbounded_string_arg_out(in string message, out string out_message); - void test_bounded_string_arg(in string<BOUNDED_STRING_SIZE> message); + void test_bounded_string_arg(in Bounded_String message); void test_fixed_array_arg(in Fixed_Array message); @@ -61,7 +62,7 @@ module Test in Fixed_Array arg2, in TimeOfDay arg3); - void test_args_3 (in string<BOUNDED_STRING_SIZE> arg1, + void test_args_3 (in Bounded_String arg1, in Bounded_Var_Size_Arg arg2, in Unbounded_Var_Size_Arg arg3, in Var_Array arg4); diff --git a/tests/DIOP/Makefile.am b/tests/DIOP/Makefile.am deleted file mode 100644 index 4fafabdfc8a..00000000000 --- a/tests/DIOP/Makefile.am +++ /dev/null @@ -1,119 +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.Basic_IDL.am - -BUILT_SOURCES = \ - UDPC.cpp \ - UDPC.h \ - UDPC.inl \ - UDPS.cpp \ - UDPS.h \ - UDPS.inl - -CLEANFILES = \ - UDP-stamp \ - UDPC.cpp \ - UDPC.h \ - UDPC.inl \ - UDPS.cpp \ - UDPS.h \ - UDPS.inl - -UDPC.cpp UDPC.h UDPC.inl UDPS.cpp UDPS.h UDPS.inl: UDP-stamp - -UDP-stamp: $(srcdir)/UDP.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Sp -Sd $(srcdir)/UDP.idl - @touch $@ - -noinst_HEADERS = \ - UDP.idl - -## Makefile.Basic_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - UDPC.cpp \ - UDPS.cpp \ - UDP_Client_i.cpp \ - UDP_i.cpp \ - client.cpp \ - UDP_Client_i.h \ - UDP_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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.Basic_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - UDPC.cpp \ - UDPS.cpp \ - UDP_Client_i.cpp \ - UDP_i.cpp \ - server.cpp \ - UDP_Client_i.h \ - UDP_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/DIOP/UDP_Client_i.h b/tests/DIOP/UDP_Client_i.h index f1b18efe785..bc6d2580966 100644 --- a/tests/DIOP/UDP_Client_i.h +++ b/tests/DIOP/UDP_Client_i.h @@ -1,21 +1,18 @@ // -*- C++ -*- -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/examples/Simple/UDP -// -// = FILENAME -// UDP_Client_i.h -// -// = DESCRIPTION -// This class implements the client functionality of the UDP test. -// -// = AUTHOR -// Michael Kircher <Michael.Kircher@mchp.siemens.de> -// -// ============================================================================ +//============================================================================= +/** + * @file UDP_Client_i.h + * + * $Id$ + * + * This class implements the client functionality of the UDP test. + * + * + * @author Michael Kircher <Michael.Kircher@mchp.siemens.de> + */ +//============================================================================= + #ifndef UDP_CLIENT_I_H #define UDP_CLIENT_I_H @@ -36,15 +33,15 @@ class UDP_Client_i // public: // = Initialization and termination methods. + /// Constructor UDP_Client_i (CORBA::ORB_ptr orb, UDP_ptr udp, UDP_ptr udpHandler, ACE_UINT32 msec, ACE_UINT32 iterations); - // Constructor + /// Destructor virtual ~UDP_Client_i (void); - // Destructor private: // Runs in a separate thread. diff --git a/tests/DIOP/UDP_i.cpp b/tests/DIOP/UDP_i.cpp index 25eb782e1c9..4c33ad2c521 100644 --- a/tests/DIOP/UDP_i.cpp +++ b/tests/DIOP/UDP_i.cpp @@ -2,8 +2,6 @@ #include "UDP_i.h" -ACE_RCSID(UDP, UDP_i, "") - // Constructor UDP_i::UDP_i (CORBA::ORB_ptr o) : orb_(CORBA::ORB::_duplicate (o)) diff --git a/tests/DIOP/UDP_i.h b/tests/DIOP/UDP_i.h index fc58a7bea4e..23a7b3da3e2 100644 --- a/tests/DIOP/UDP_i.h +++ b/tests/DIOP/UDP_i.h @@ -1,23 +1,20 @@ // -*- C++ -*- -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/examples/Simple/UDP -// -// = FILENAME -// UDP_i.h -// -// = DESCRIPTION -// This class implements the server functionality of the UDP test. -// We support only single threaded servers, as we have a null mutex -// for locking our state. -// -// = AUTHOR -// Michael Kircher <Michael.Kircher@mchp.siemens.de> -// -// ============================================================================ +//============================================================================= +/** + * @file UDP_i.h + * + * $Id$ + * + * This class implements the server functionality of the UDP test. + * We support only single threaded servers, as we have a null mutex + * for locking our state. + * + * + * @author Michael Kircher <Michael.Kircher@mchp.siemens.de> + */ +//============================================================================= + #ifndef UDP_I_H #define UDP_I_H @@ -26,34 +23,36 @@ #include "ace/Hash_Map_Manager.h" #include "ace/Null_Mutex.h" +/** + * @class UDP_i: + * + * @brief UDP Object Implementation + * + * This class implements the UDP object, which accepts two methods. + * The first, <invoke> accepts a string identifying the client + * and a request_id so that the server can verify if the requests + * arrived in order. + */ class UDP_i: public POA_UDP { - // = TITLE - // UDP Object Implementation - // - // = DESCRIPTION - // This class implements the UDP object, which accepts two methods. - // The first, <invoke> accepts a string identifying the client - // and a request_id so that the server can verify if the requests - // arrived in order. public: // = Initialization and termination methods. + /// Constructor UDP_i (CORBA::ORB_ptr o); - // Constructor + /// Destructor ~UDP_i (void); - // Destructor virtual void invoke (const char *client_name, UDP_ptr udpHandler, CORBA::Long request_id); + /// Shutdown the server. virtual void shutdown (void); - // Shutdown the server. private: + /// ORB pointer. CORBA::ORB_var orb_; - // ORB pointer. ACE_Hash_Map_Manager_Ex < CORBA::String_var, CORBA::Long, diff --git a/tests/DIOP/client.cpp b/tests/DIOP/client.cpp index dbb73d07644..8fd43270900 100644 --- a/tests/DIOP/client.cpp +++ b/tests/DIOP/client.cpp @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/examples/PluggableUDP/tests/Basic -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// This is the client for the UDP test. -// -// = AUTHOR -// Michael Kircher <Michael.Kircher@mchp.siemens.de> -// -// ============================================================================ + +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * This is the client for the UDP test. + * + * + * @author Michael Kircher <Michael.Kircher@mchp.siemens.de> + */ +//============================================================================= + #include "UDPC.h" @@ -30,8 +27,6 @@ // executable and initialized for static builds. #include "tao/Strategies/advanced_resource.h" -ACE_RCSID(AMI, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); unsigned int msec = 500; unsigned int iterations = 1; @@ -69,7 +64,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/tests/DIOP/server.cpp b/tests/DIOP/server.cpp index 01fdf921945..a7372010e30 100644 --- a/tests/DIOP/server.cpp +++ b/tests/DIOP/server.cpp @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/examples/PluggableUDP/tests/Basic -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// Implementation of the server running the UDP object. -// -// = AUTHOR -// Michael Kircher <Michael.Kircher@mchp.siemens.de> -// -// ============================================================================ + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * Implementation of the server running the UDP object. + * + * + * @author Michael Kircher <Michael.Kircher@mchp.siemens.de> + */ +//============================================================================= + #include "UDP_i.h" @@ -27,8 +24,6 @@ // executable and initialized for static builds. #include "tao/Strategies/advanced_resource.h" -ACE_RCSID(AMI, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -55,7 +50,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/tests/DLL_ORB/Makefile.am b/tests/DLL_ORB/Makefile.am deleted file mode 100644 index be927581d65..00000000000 --- a/tests/DLL_ORB/Makefile.am +++ /dev/null @@ -1,155 +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 = -noinst_PROGRAMS = - -## Makefile.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.DLL_ORB_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 \ - Test_Client_Module.h \ - Test_Client_Module_Export.h \ - Test_Server_Module.h \ - Test_Server_Module_Export.h \ - Test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.DLL_ORB_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - Test_Client_Module.h \ - Test_Client_Module_Export.h \ - Test_Server_Module.h \ - Test_Server_Module_Export.h \ - Test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.DLL_ORB_Test_Client_Module.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES += libTest_Client_Module.la - -libTest_Client_Module_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DTEST_CLIENT_MODULE_BUILD_DLL - -libTest_Client_Module_la_SOURCES = \ - TestC.cpp \ - Test_Client_Module.cpp - -noinst_HEADERS += \ - Test_Client_Module.h - -endif BUILD_EXCEPTIONS - -## Makefile.DLL_ORB_Test_Server_Module.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES += libTest_Server_Module.la - -libTest_Server_Module_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DTEST_SERVER_MODULE_BUILD_DLL - -libTest_Server_Module_la_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - Test_Server_Module.cpp \ - Test_i.cpp - -noinst_HEADERS += \ - Test_Server_Module.h \ - Test_i.h - -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/DLL_ORB/Test_Client_Module.cpp b/tests/DLL_ORB/Test_Client_Module.cpp index ed58e647d20..83f4d56e852 100644 --- a/tests/DLL_ORB/Test_Client_Module.cpp +++ b/tests/DLL_ORB/Test_Client_Module.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "Test_Client_Module.h" #include "tao/TAO_Singleton_Manager.h" @@ -7,11 +8,6 @@ #include "ace/Get_Opt.h" #include "ace/Argv_Type_Converter.h" -ACE_RCSID (DLL_ORB, - Test_Client_Module, - "$Id$") - - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -34,7 +30,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/DLL_ORB/Test_Server_Module.cpp b/tests/DLL_ORB/Test_Server_Module.cpp index b972ede5455..6f6702697e3 100644 --- a/tests/DLL_ORB/Test_Server_Module.cpp +++ b/tests/DLL_ORB/Test_Server_Module.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "Test_Server_Module.h" #include "tao/TAO_Singleton_Manager.h" @@ -6,11 +7,6 @@ #include "ace/Service_Config.h" #include "ace/Argv_Type_Converter.h" - -ACE_RCSID (DLL_ORB, - Test_Server_Module, - "$Id$") - #include "ace/Get_Opt.h" diff --git a/tests/DLL_ORB/Test_i.cpp b/tests/DLL_ORB/Test_i.cpp index 9a3414ab41e..be88b80cb16 100644 --- a/tests/DLL_ORB/Test_i.cpp +++ b/tests/DLL_ORB/Test_i.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "Test_i.h" -ACE_RCSID (DLL_ORB, - Test_i, - "$Id$") - Test_i::Test_i (void) : orb_ () { diff --git a/tests/DSI_AMH/Makefile.am b/tests/DSI_AMH/Makefile.am deleted file mode 100644 index f1878cc76e5..00000000000 --- a/tests/DSI_AMH/Makefile.am +++ /dev/null @@ -1,112 +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.DSI_AMH_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.DSI_AMH_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 \ - Roundtrip.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.DSI_AMH_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Roundtrip.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Roundtrip.h - -server_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_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 - -## 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/DSI_AMH/Test.idl b/tests/DSI_AMH/Test.idl index fb38537f0b7..057177a145b 100644 --- a/tests/DSI_AMH/Test.idl +++ b/tests/DSI_AMH/Test.idl @@ -9,7 +9,7 @@ module Test interface Roundtrip { - /// The operation simply returns its argument. + /// The operation simply returns its argument. Timestamp test_method (in Timestamp send_time); /// Shutdown the ORB diff --git a/tests/DSI_AMH/client.cpp b/tests/DSI_AMH/client.cpp index 77a0d4f54cd..ef0384b966d 100644 --- a/tests/DSI_AMH/client.cpp +++ b/tests/DSI_AMH/client.cpp @@ -41,7 +41,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/tests/DSI_AMH/server.cpp b/tests/DSI_AMH/server.cpp index 562fb7485b6..85caa9c72c1 100644 --- a/tests/DSI_AMH/server.cpp +++ b/tests/DSI_AMH/server.cpp @@ -27,7 +27,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/tests/DSI_AMI_Gateway/Makefile.am b/tests/DSI_AMI_Gateway/Makefile.am deleted file mode 100644 index 8051e6a1654..00000000000 --- a/tests/DSI_AMI_Gateway/Makefile.am +++ /dev/null @@ -1,161 +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.DSI_AMI_Gateway_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.DSI_AMI_Gateway_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 \ - testC.cpp \ - My_DII_Reply_Handler.h \ - test_dsi.h \ - test_dsi.inl \ - test_i.h \ - test_i.inl - -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_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.DSI_AMI_Gateway_Gateway.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += gateway - -gateway_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -gateway_SOURCES = \ - My_DII_Reply_Handler.cpp \ - gateway.cpp \ - test_dsi.cpp \ - My_DII_Reply_Handler.h \ - test_dsi.h \ - test_dsi.inl - -gateway_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_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.DSI_AMI_Gateway_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_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_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 - -## 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/DSI_AMI_Gateway/client.cpp b/tests/DSI_AMI_Gateway/client.cpp index 93f9893fe24..2b6331ab8e5 100644 --- a/tests/DSI_AMI_Gateway/client.cpp +++ b/tests/DSI_AMI_Gateway/client.cpp @@ -5,8 +5,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(DSI_Gateway, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://gateway.ior"); int niterations = 5; int do_shutdown = 0; @@ -56,7 +54,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/DSI_AMI_Gateway/gateway.cpp b/tests/DSI_AMI_Gateway/gateway.cpp index 7a21ca92299..0bd127fc870 100644 --- a/tests/DSI_AMI_Gateway/gateway.cpp +++ b/tests/DSI_AMI_Gateway/gateway.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(DSI_Gateway, server, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 5; int do_shutdown = 0; @@ -49,7 +47,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/DSI_AMI_Gateway/server.cpp b/tests/DSI_AMI_Gateway/server.cpp index 9ca30d840a2..1e520c7ff9a 100644 --- a/tests/DSI_AMI_Gateway/server.cpp +++ b/tests/DSI_AMI_Gateway/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(DSI_Gateway, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int nthreads = 4; @@ -36,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/tests/DSI_AMI_Gateway/test_dsi.cpp b/tests/DSI_AMI_Gateway/test_dsi.cpp index 7afaf5d2873..5f7fecd6224 100644 --- a/tests/DSI_AMI_Gateway/test_dsi.cpp +++ b/tests/DSI_AMI_Gateway/test_dsi.cpp @@ -13,12 +13,8 @@ #include "test_dsi.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(DSI_AMI_Gateway, test_dsi, "$Id$") - void -DSI_Simple_Server::_dispatch (TAO_ServerRequest &request, - void * //context - ) +DSI_Simple_Server::_dispatch (TAO_ServerRequest &request, void *) { // No need to do any of this if the client isn't waiting. if (request.response_expected ()) diff --git a/tests/DSI_AMI_Gateway/test_dsi.h b/tests/DSI_AMI_Gateway/test_dsi.h index 46a0b4aa99d..4f33fc644f8 100644 --- a/tests/DSI_AMI_Gateway/test_dsi.h +++ b/tests/DSI_AMI_Gateway/test_dsi.h @@ -1,17 +1,14 @@ -// $Id$ -// =================================================== -// -// = LIBRARY -// TAO/tests/DSI_Gateway -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// =================================================== +//============================================================================= +/** + * @file test_dsi.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_DSI_GATEWAY_TEST_DSI_H #define TAO_DSI_GATEWAY_TEST_DSI_H @@ -22,25 +19,28 @@ #include "tao/PortableServer/PortableServer.h" #include "tao/ORB.h" +/** + * @class DSI_Simple_Server + * + * @brief DSI Simpler Server implementation + * + * Implements the DSI/DII gateway. + */ class DSI_Simple_Server : public TAO_DynamicImplementation { - // = TITLE - // DSI Simpler Server implementation - // - // = DESCRIPTION - // Implements the DSI/DII gateway. - // public: + /// ctor DSI_Simple_Server (CORBA::ORB_ptr orb, CORBA::Object_ptr target, PortableServer::POA_ptr poa); - // ctor + /** + * Turns around and calls invoke, but using AMH style handler + * = The DynamicImplementation methods. + * + */ virtual void _dispatch (TAO_ServerRequest &request, void *context); - // Turns around and calls invoke, but using AMH style handler - // = The DynamicImplementation methods. - // // we need this because it is a pure virtual method in // its parent class @@ -57,14 +57,14 @@ public: ); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB + /// Target object, forward requests to it... CORBA::Object_var target_; - // Target object, forward requests to it... + /// The POA PortableServer::POA_var poa_; - // The POA }; #if defined(__ACE_INLINE__) diff --git a/tests/DSI_AMI_Gateway/test_i.cpp b/tests/DSI_AMI_Gateway/test_i.cpp index 550fc830999..34ec0538137 100644 --- a/tests/DSI_AMI_Gateway/test_i.cpp +++ b/tests/DSI_AMI_Gateway/test_i.cpp @@ -7,8 +7,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(DSI_Gateway, test_i, "$Id$") - CORBA::Long Simple_Server_i::test_method (CORBA::Long x, const Structure& the_in_structure, diff --git a/tests/DSI_AMI_Gateway/test_i.h b/tests/DSI_AMI_Gateway/test_i.h index 89e1c70d9f6..0810aac6c63 100644 --- a/tests/DSI_AMI_Gateway/test_i.h +++ b/tests/DSI_AMI_Gateway/test_i.h @@ -1,34 +1,32 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/DSI_Gateway -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_DSI_GATEWAY_TEST_I_H #define TAO_DSI_GATEWAY_TEST_I_H #include "testS.h" +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb); - // ctor // = The Simple_Server methods. CORBA::Long test_method (CORBA::Long x, diff --git a/tests/DSI_Gateway/Makefile.am b/tests/DSI_Gateway/Makefile.am deleted file mode 100644 index 8b3af31f0d8..00000000000 --- a/tests/DSI_Gateway/Makefile.am +++ /dev/null @@ -1,160 +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.DSI_Gateway_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.DSI_Gateway_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 \ - testC.cpp \ - test_dsi.h \ - test_dsi.inl \ - test_i.h \ - test_i.inl - -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_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.DSI_Gateway_Gateway.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += gateway - -gateway_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -gateway_SOURCES = \ - gateway.cpp \ - testC.cpp \ - testS.cpp \ - test_dsi.cpp \ - test_dsi.h \ - test_dsi.inl - -gateway_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_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.DSI_Gateway_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_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_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 - -## 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/DSI_Gateway/client.cpp b/tests/DSI_Gateway/client.cpp index 066fe3dd849..e579139a181 100644 --- a/tests/DSI_Gateway/client.cpp +++ b/tests/DSI_Gateway/client.cpp @@ -5,8 +5,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(DSI_Gateway, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://gateway.ior"); int niterations = 5; int do_shutdown = 0; @@ -56,7 +54,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/DSI_Gateway/gateway.cpp b/tests/DSI_Gateway/gateway.cpp index 59f599ff015..7f64bfc18b3 100644 --- a/tests/DSI_Gateway/gateway.cpp +++ b/tests/DSI_Gateway/gateway.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(DSI_Gateway, server, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 5; int do_shutdown = 0; @@ -49,7 +47,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/DSI_Gateway/server.cpp b/tests/DSI_Gateway/server.cpp index 9ca30d840a2..1e520c7ff9a 100644 --- a/tests/DSI_Gateway/server.cpp +++ b/tests/DSI_Gateway/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(DSI_Gateway, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int nthreads = 4; @@ -36,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/tests/DSI_Gateway/test_dsi.cpp b/tests/DSI_Gateway/test_dsi.cpp index 39c6e6ded6e..59b695330f6 100644 --- a/tests/DSI_Gateway/test_dsi.cpp +++ b/tests/DSI_Gateway/test_dsi.cpp @@ -8,8 +8,6 @@ #include "test_dsi.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(DSI_Gateway, test_dsi, "$Id$") - void DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request) { diff --git a/tests/DSI_Gateway/test_dsi.h b/tests/DSI_Gateway/test_dsi.h index 5c5ea947a47..8b1e958e2b9 100644 --- a/tests/DSI_Gateway/test_dsi.h +++ b/tests/DSI_Gateway/test_dsi.h @@ -1,17 +1,14 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/DSI_Gateway -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ +//============================================================================= +/** + * @file test_dsi.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_DSI_GATEWAY_TEST_DSI_H #define TAO_DSI_GATEWAY_TEST_DSI_H @@ -21,19 +18,20 @@ #include "tao/PortableServer/PortableServer.h" #include "tao/ORB.h" +/** + * @class DSI_Simple_Server + * + * @brief DSI Simpler Server implementation + * + * Implements the DSI/DII gateway. + */ class DSI_Simple_Server : public TAO_DynamicImplementation { - // = TITLE - // DSI Simpler Server implementation - // - // = DESCRIPTION - // Implements the DSI/DII gateway. - // public: + /// ctor DSI_Simple_Server (CORBA::ORB_ptr orb, CORBA::Object_ptr target, PortableServer::POA_ptr poa); - // ctor // = The DynamicImplementation methods. virtual void invoke (CORBA::ServerRequest_ptr request); @@ -47,14 +45,14 @@ public: ); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB + /// Target object, forward requests to it... CORBA::Object_var target_; - // Target object, forward requests to it... + /// The POA PortableServer::POA_var poa_; - // The POA }; #if defined(__ACE_INLINE__) diff --git a/tests/DSI_Gateway/test_i.cpp b/tests/DSI_Gateway/test_i.cpp index 550fc830999..34ec0538137 100644 --- a/tests/DSI_Gateway/test_i.cpp +++ b/tests/DSI_Gateway/test_i.cpp @@ -7,8 +7,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(DSI_Gateway, test_i, "$Id$") - CORBA::Long Simple_Server_i::test_method (CORBA::Long x, const Structure& the_in_structure, diff --git a/tests/DSI_Gateway/test_i.h b/tests/DSI_Gateway/test_i.h index 89e1c70d9f6..0810aac6c63 100644 --- a/tests/DSI_Gateway/test_i.h +++ b/tests/DSI_Gateway/test_i.h @@ -1,34 +1,32 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/DSI_Gateway -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_DSI_GATEWAY_TEST_I_H #define TAO_DSI_GATEWAY_TEST_I_H #include "testS.h" +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb); - // ctor // = The Simple_Server methods. CORBA::Long test_method (CORBA::Long x, diff --git a/tests/DiffServ/Makefile.am b/tests/DiffServ/Makefile.am deleted file mode 100644 index 99da8e0eff2..00000000000 --- a/tests/DiffServ/Makefile.am +++ /dev/null @@ -1,110 +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.diffserv_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.diffserv_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 \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_DiffServPolicy.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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.diffserv_server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_DiffServPolicy.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/DiffServ/server.cpp b/tests/DiffServ/server.cpp index 5e159633bcf..181543d020b 100644 --- a/tests/DiffServ/server.cpp +++ b/tests/DiffServ/server.cpp @@ -106,7 +106,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) simple_servant_ior_file = get_opts.opt_arg (); break; } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/DynAny_Test/Makefile.am b/tests/DynAny_Test/Makefile.am deleted file mode 100644 index 80782d7a26c..00000000000 --- a/tests/DynAny_Test/Makefile.am +++ /dev/null @@ -1,99 +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) - - -## Makefile.DynAny_Test_Basic.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - da_testsC.cpp \ - da_testsC.h \ - da_testsC.inl \ - da_testsS.cpp \ - da_testsS.h \ - da_testsS.inl - -CLEANFILES = \ - da_tests-stamp \ - da_testsC.cpp \ - da_testsC.h \ - da_testsC.inl \ - da_testsS.cpp \ - da_testsS.h \ - da_testsS.inl - -da_testsC.cpp da_testsC.h da_testsC.inl da_testsS.cpp da_testsS.h da_testsS.inl: da_tests-stamp - -da_tests-stamp: $(srcdir)/da_tests.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/da_tests.idl - @touch $@ - -noinst_PROGRAMS = basic_test - -basic_test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -basic_test_SOURCES = \ - analyzer.cpp \ - da_testsC.cpp \ - da_testsS.cpp \ - data.cpp \ - driver.cpp \ - test_dynany.cpp \ - test_dynarray.cpp \ - test_dynenum.cpp \ - test_dynsequence.cpp \ - test_dynstruct.cpp \ - test_dynunion.cpp \ - test_wrapper.cpp \ - analyzer.h \ - da_testsC.h \ - da_testsC.inl \ - da_testsS.h \ - da_testsS.inl \ - data.h \ - driver.h \ - test_dynany.h \ - test_dynarray.h \ - test_dynenum.h \ - test_dynsequence.h \ - test_dynstruct.h \ - test_dynunion.h \ - test_wrapper.h - -basic_test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/tests/DynAny_Test/data.cpp b/tests/DynAny_Test/data.cpp index 321efcf4f22..e54d076e045 100644 --- a/tests/DynAny_Test/data.cpp +++ b/tests/DynAny_Test/data.cpp @@ -36,8 +36,8 @@ Data::Data (CORBA::ORB_var orb) m_wchar1 (666), m_wchar2 (0), orb_ (orb) { - ACE_CDR_LONG_DOUBLE_ASSIGNMENT (m_longdouble1, 88888888888.8888); - ACE_CDR_LONG_DOUBLE_ASSIGNMENT (m_longdouble2, 99999999999.9999); + ACE_CDR_LONG_DOUBLE_ASSIGNMENT (m_longdouble1, 88888888888.8888); + ACE_CDR_LONG_DOUBLE_ASSIGNMENT (m_longdouble2, 99999999999.9999); try { diff --git a/tests/DynAny_Test/data.h b/tests/DynAny_Test/data.h index 05133d6de65..e25a35da1ad 100644 --- a/tests/DynAny_Test/data.h +++ b/tests/DynAny_Test/data.h @@ -40,7 +40,7 @@ public: CORBA::Object_var m_objref1, m_objref2; CORBA::ShortSeq m_shortseq1; CORBA::ShortSeq_var m_shortseq2; - CORBA::LongDouble m_longdouble1, m_longdouble2; + CORBA::LongDouble m_longdouble1, m_longdouble2; const char* labels[20]; diff --git a/tests/DynAny_Test/test_dynany.cpp b/tests/DynAny_Test/test_dynany.cpp index 344d2542c63..baa4bb70a10 100644 --- a/tests/DynAny_Test/test_dynany.cpp +++ b/tests/DynAny_Test/test_dynany.cpp @@ -79,7 +79,7 @@ Test_DynAny::run_test (void) CORBA::Double d_out = fa1->get_double (); - if (d_out == data.m_double1) + if (ACE::is_equal (d_out, data.m_double1)) { ACE_DEBUG ((LM_DEBUG, "++ OK ++\n")); @@ -102,7 +102,7 @@ Test_DynAny::run_test (void) CORBA::Any_var out_any1 = ftc1->to_any (); out_any1 >>= d_out; - if (d_out == data.m_double1) + if (ACE::is_equal (d_out, data.m_double1)) { ACE_DEBUG ((LM_DEBUG, "++ OK ++\n")); @@ -133,7 +133,7 @@ Test_DynAny::run_test (void) CORBA::LongDouble d_out = fa1->get_longdouble (); - if (d_out == data.m_longdouble1) + if (ACE::is_equal (d_out, data.m_longdouble1)) { ACE_DEBUG ((LM_DEBUG, "++ OK ++\n")); @@ -160,7 +160,7 @@ Test_DynAny::run_test (void) out_any1.in() >>= d_out; - if (d_out == data.m_longdouble1) + if (ACE::is_equal (d_out, data.m_longdouble1)) { ACE_DEBUG ((LM_DEBUG, "++ OK ++\n")); @@ -174,7 +174,6 @@ Test_DynAny::run_test (void) ftc1->destroy (); } - ACE_DEBUG ((LM_DEBUG, "\t*=*=*=*= %C =*=*=*=*\n", data.labels[12])); diff --git a/tests/DynAny_Test/test_dynstruct.cpp b/tests/DynAny_Test/test_dynstruct.cpp index dfbe9bbcf9f..548e6847c0e 100644 --- a/tests/DynAny_Test/test_dynstruct.cpp +++ b/tests/DynAny_Test/test_dynstruct.cpp @@ -364,7 +364,7 @@ Test_DynStruct::run_test (void) corba_long_double <<= l_long_double_in_struct; DynamicAny::DynAny_var l_dynany = dynany_factory->create_dyn_any (corba_long_double); - try + try { l_dynany->destroy (); ACE_DEBUG ((LM_DEBUG, diff --git a/tests/DynAny_Test/test_wrapper.cpp b/tests/DynAny_Test/test_wrapper.cpp index e51088848d8..e2e846a0a76 100644 --- a/tests/DynAny_Test/test_wrapper.cpp +++ b/tests/DynAny_Test/test_wrapper.cpp @@ -16,7 +16,6 @@ #define TEST_WRAPPER_CPP #include "test_wrapper.h" -#include "ace/OS.h" #include "ace/Log_Msg.h" // Constructor diff --git a/tests/DynUnion_Test/Makefile.am b/tests/DynUnion_Test/Makefile.am deleted file mode 100644 index 2cc91a69d5b..00000000000 --- a/tests/DynUnion_Test/Makefile.am +++ /dev/null @@ -1,85 +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) - - -## Makefile.dynunion_test_IDL.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - dynanyC.cpp \ - dynanyC.h \ - dynanyC.inl \ - dynanyS.cpp \ - dynanyS.h \ - dynanyS.inl - -CLEANFILES = \ - dynany-stamp \ - dynanyC.cpp \ - dynanyC.h \ - dynanyC.inl \ - dynanyS.cpp \ - dynanyS.h \ - dynanyS.inl - -dynanyC.cpp dynanyC.h dynanyC.inl dynanyS.cpp dynanyS.h dynanyS.inl: dynany-stamp - -dynany-stamp: $(srcdir)/dynany.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/dynany.idl - @touch $@ - -noinst_HEADERS = \ - dynany.idl - -endif BUILD_EXCEPTIONS - -## Makefile.dynuniontest.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = dynuniontest - -dynuniontest_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -dynuniontest_SOURCES = \ - DynUnionTest.cpp \ - dynanyC.cpp - -dynuniontest_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/Explicit_Event_Loop/Makefile.am b/tests/Explicit_Event_Loop/Makefile.am deleted file mode 100644 index 87b19edbdf7..00000000000 --- a/tests/Explicit_Event_Loop/Makefile.am +++ /dev/null @@ -1,105 +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.Explicit_Event_Loop_Idl.am - -BUILT_SOURCES = \ - timeC.cpp \ - timeC.h \ - timeC.inl \ - timeS.cpp \ - timeS.h \ - timeS.inl - -CLEANFILES = \ - time-stamp \ - timeC.cpp \ - timeC.h \ - timeC.inl \ - timeS.cpp \ - timeS.h \ - timeS.inl - -timeC.cpp timeC.h timeC.inl timeS.cpp timeS.h timeS.inl: time-stamp - -time-stamp: $(srcdir)/time.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/time.idl - @touch $@ - -noinst_HEADERS = \ - time.idl - -## Makefile.Explicit_Event_Loop_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 \ - timeC.cpp \ - server.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Explicit_Event_Loop_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - timeC.cpp \ - timeS.cpp \ - server.h - -server_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/Explicit_Event_Loop/client.cpp b/tests/Explicit_Event_Loop/client.cpp index 79309f3e6ad..ccf9be6b357 100644 --- a/tests/Explicit_Event_Loop/client.cpp +++ b/tests/Explicit_Event_Loop/client.cpp @@ -1,23 +1,17 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Explicit_Event_Loop -// -// = FILENAME -// client.cpp -// -// = AUTHORS -// Source code used in TAO has been modified and adapted from the -// code provided in the book, "Advanced CORBA Programming with C++" -// by Michi Henning and Steve Vinoski. Copyright -// 1999. Addison-Wesley, Reading, MA. Used with permission of -// Addison-Wesley. -// -// Modified for TAO by Mike Moran <mm4@cs.wustl.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * @author Source code used in TAO has been modified and adapted from thecode provided in the book + * @author "Advanced CORBA Programming with C++"by Michi Henning and Steve Vinoski. Copyright1999. Addison-Wesley + * @author Reading + * @author MA. Used with permission ofAddison-Wesley.Modified for TAO by Mike Moran <mm4@cs.wustl.edu> + */ +//============================================================================= + #include "timeC.h" diff --git a/tests/Explicit_Event_Loop/server.cpp b/tests/Explicit_Event_Loop/server.cpp index 01184bdb811..8da642317de 100644 --- a/tests/Explicit_Event_Loop/server.cpp +++ b/tests/Explicit_Event_Loop/server.cpp @@ -1,23 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Explicit_Event_Loop -// -// = FILENAME -// server.cpp -// -// = AUTHORS -// Source code used in TAO has been modified and adapted from the -// code provided in the book, "Advanced CORBA Programming with C++" -// by Michi Henning and Steve Vinoski. Copyright -// 1999. Addison-Wesley, Reading, MA. Used with permission of -// Addison-Wesley. -// -// Modified for TAO by Mike Moran <mm4@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * @author Source code used in TAO has been modified and adapted from thecode provided in the book + * @author "Advanced CORBA Programming with C++"by Michi Henning and Steve Vinoski. Copyright1999. Addison-Wesley + * @author Reading + * @author MA. Used with permission ofAddison-Wesley.Modified for TAO by Mike Moran <mm4@cs.wustl.edu> + */ +//============================================================================= + #include "server.h" #include "tao/debug.h" @@ -53,7 +47,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/tests/Explicit_Event_Loop/server.h b/tests/Explicit_Event_Loop/server.h index 63a80d2c89f..207cc33c69d 100644 --- a/tests/Explicit_Event_Loop/server.h +++ b/tests/Explicit_Event_Loop/server.h @@ -1,22 +1,17 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Explicit_Event_Loop -// -// = FILENAME -// server.h -// -// = AUTHORS -// Source code used in TAO has been modified and adapted from the code -// provided in the book, "Advanced CORBA Programming with C++" by Michi -// Henning and Steve Vinoski. Copyright 1999. Addison-Wesley, Reading, -// MA. Used with permission of Addison-Wesley. -// -// Modified for TAO by Mike Moran <mm4@cs.wustl.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file server.h + * + * $Id$ + * + * @author Source code used in TAO has been modified and adapted from the codeprovided in the book + * @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley + * @author Reading + * @author MA. Used with permission of Addison-Wesley.Modified for TAO by Mike Moran <mm4@cs.wustl.edu> + */ +//============================================================================= + #ifndef server_HH_ #define server_HH_ diff --git a/tests/Exposed_Policies/Counter_i.cpp b/tests/Exposed_Policies/Counter_i.cpp index fc0b34451e7..9ec2282ccda 100644 --- a/tests/Exposed_Policies/Counter_i.cpp +++ b/tests/Exposed_Policies/Counter_i.cpp @@ -2,8 +2,6 @@ #include "Counter_i.h" -ACE_RCSID(tao, Counter_Servant, "$Id$") - // Dtor-Ctor Implementation. Counter_Servant::Counter_Servant (Policy_Tester *policy_tester) diff --git a/tests/Exposed_Policies/Counter_i.h b/tests/Exposed_Policies/Counter_i.h index 8703a2d95a9..18e32d1c90b 100644 --- a/tests/Exposed_Policies/Counter_i.h +++ b/tests/Exposed_Policies/Counter_i.h @@ -1,20 +1,17 @@ -//$Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Exposed_Policies -// -// = FILENAME -// Counter_i.h -// -// = DESCRIPTION -// This class implements the Counter IDL interface. -// -// = AUTHOR -// Angelo Corsaro <corsaro@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file Counter_i.h + * + * $Id$ + * + * This class implements the Counter IDL interface. + * + * + * @author Angelo Corsaro <corsaro@cs.wustl.edu> + */ +//============================================================================= + #ifndef COUNTER_I_H_ #define COUNTER_I_H_ diff --git a/tests/Exposed_Policies/Makefile.am b/tests/Exposed_Policies/Makefile.am deleted file mode 100644 index a87f6d18d2b..00000000000 --- a/tests/Exposed_Policies/Makefile.am +++ /dev/null @@ -1,130 +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.Exposed_Policies_Idl.am - -BUILT_SOURCES = \ - CounterC.cpp \ - CounterC.h \ - CounterC.inl \ - CounterS.cpp \ - CounterS.h \ - CounterS.inl - -CLEANFILES = \ - Counter-stamp \ - CounterC.cpp \ - CounterC.h \ - CounterC.inl \ - CounterS.cpp \ - CounterS.h \ - CounterS.inl - -CounterC.cpp CounterC.h CounterC.inl CounterS.cpp CounterS.h CounterS.inl: Counter-stamp - -Counter-stamp: $(srcdir)/Counter.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Counter.idl - @touch $@ - -noinst_HEADERS = \ - Counter.idl - -## Makefile.Exposed_Policies_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - CounterC.cpp \ - Policy_Tester.cpp \ - Policy_Verifier.cpp \ - RT_Properties.cpp \ - client.cpp \ - Policy_Tester.h \ - Policy_Verifier.h \ - RT_Properties.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.Exposed_Policies_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - CounterC.cpp \ - CounterS.cpp \ - Policy_Tester.cpp \ - Policy_Verifier.cpp \ - RT_Properties.cpp \ - server.cpp \ - Policy_Tester.h \ - Policy_Verifier.h \ - RT_Properties.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/Exposed_Policies/Policy_Tester.cpp b/tests/Exposed_Policies/Policy_Tester.cpp index 83d40afff39..f49887a77b8 100644 --- a/tests/Exposed_Policies/Policy_Tester.cpp +++ b/tests/Exposed_Policies/Policy_Tester.cpp @@ -18,8 +18,6 @@ #include "tao/ORB_Constants.h" #include "tao/ORB_Core.h" -ACE_RCSID (tao, Policy_Tester, "$Id$") - Policy_Tester::Policy_Tester (void) : rt_object_properties_ (0), rt_poa_properties_ (0) diff --git a/tests/Exposed_Policies/Policy_Tester.h b/tests/Exposed_Policies/Policy_Tester.h index 1a659c8c01c..8ca8eed1c75 100644 --- a/tests/Exposed_Policies/Policy_Tester.h +++ b/tests/Exposed_Policies/Policy_Tester.h @@ -1,21 +1,16 @@ -// $Id$ -// -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Exposed_Policies -// -// = FILENAME -// Policy_Verifier.h -// -// = DESCRIPTION -// This class verifies that the policy are correctly embedded -// in the IOR. -// -// = AUTHOR -// Angelo Corsaro <corsaro@cs.wustl.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file Policy_Tester.h + * + * $Id$ + * + * This class verifies that the policy are correctly embedded + * in the IOR. + * + * @author Angelo Corsaro <corsaro@cs.wustl.edu> + */ +//============================================================================= + #ifndef POLICY_TESTER_H_ #define POLICY_TESTER_H_ @@ -35,8 +30,8 @@ public: Policy_Tester (void); ~Policy_Tester (void); + /// Runs the test. void run (void); - // Runs the test. int init (int argc, ACE_TCHAR *argv[]); diff --git a/tests/Exposed_Policies/Policy_Verifier.cpp b/tests/Exposed_Policies/Policy_Verifier.cpp index 3215c2ef7b8..0fdb414c1c1 100644 --- a/tests/Exposed_Policies/Policy_Verifier.cpp +++ b/tests/Exposed_Policies/Policy_Verifier.cpp @@ -1,8 +1,7 @@ +// $Id$ #include "Policy_Verifier.h" #include "ace/OS_NS_string.h" -ACE_RCSID (tao, Policy_Verifier, "$Id$") - Policy_Verifier::Policy_Verifier (void) : rt_object_properties_ (0) , rt_poa_properties_ (0) diff --git a/tests/Exposed_Policies/Policy_Verifier.h b/tests/Exposed_Policies/Policy_Verifier.h index 52d06f1cdcb..ba7a03d7180 100644 --- a/tests/Exposed_Policies/Policy_Verifier.h +++ b/tests/Exposed_Policies/Policy_Verifier.h @@ -1,21 +1,17 @@ -// $Id$ -// -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Exposed_Policies -// -// = FILENAME -// Policy_Verifier.h -// -// = DESCRIPTION -// This class verifies that the policy are correctly embedded -// in the IOR. -// -// = AUTHOR -// Angelo Corsaro <corsaro@cs.wustl.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file Policy_Verifier.h + * + * $Id$ + * + * This class verifies that the policy are correctly embedded + * in the IOR. + * + * + * @author Angelo Corsaro <corsaro@cs.wustl.edu> + */ +//============================================================================= + #ifndef POLICY_VERIFIER_H_ #define POLICY_VERIFIER_H_ diff --git a/tests/Exposed_Policies/RT_Properties.cpp b/tests/Exposed_Policies/RT_Properties.cpp index e50ee9913a3..e943914b047 100644 --- a/tests/Exposed_Policies/RT_Properties.cpp +++ b/tests/Exposed_Policies/RT_Properties.cpp @@ -7,8 +7,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" -ACE_RCSID (ExposedPolicies, RT_Properties, "$Id$") - RT_Properties::RT_Properties (void) : priority_ (10) { @@ -43,20 +41,28 @@ RT_Properties::read_from (const ACE_TCHAR *file_name) if (ACE_OS::strcmp (string_field, "Priority") == 0) { n_matched = fscanf (fp, "%d", &int_field); + ACE_UNUSED_ARG (n_matched); + rt_properties->priority (int_field); } else if (ACE_OS::strcmp (string_field, "Priority_Bands") == 0) { n_matched = fscanf (fp, "%d", &int_field); + ACE_UNUSED_ARG (n_matched); + rt_properties->priority_bands_.length (int_field); } else if (ACE_OS::strcmp (string_field, "Priority_Range") == 0) { n_matched = fscanf (fp, "%d", &int_field); + ACE_UNUSED_ARG (n_matched); + rt_properties->priority_bands_[i].low = int_field; n_matched = fscanf (fp, "%d", &int_field); + ACE_UNUSED_ARG (n_matched); + rt_properties->priority_bands_[i].high = int_field; ++i; diff --git a/tests/Exposed_Policies/RT_Properties.h b/tests/Exposed_Policies/RT_Properties.h index 5184952e4cd..e37728ae291 100644 --- a/tests/Exposed_Policies/RT_Properties.h +++ b/tests/Exposed_Policies/RT_Properties.h @@ -1,21 +1,17 @@ -//$Id$ -// -// ============================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// RT_Properties.h -// -// = DESCRIPTION -// Defines a series of "real time" property that an Object -// or a POA created on a RT-ORB can have. -// -// = AUTHOR -// Angelo Corsaro <corsaro@cs.wustl.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file RT_Properties.h + * + * $Id$ + * + * Defines a series of "real time" property that an Object + * or a POA created on a RT-ORB can have. + * + * + * @author Angelo Corsaro <corsaro@cs.wustl.edu> + */ +//============================================================================= + #ifndef RT_PROPERTIES_H_ #define RT_PROPERTIES_H_ diff --git a/tests/Exposed_Policies/client.cpp b/tests/Exposed_Policies/client.cpp index 92ef57a48c3..dddf5c131c4 100644 --- a/tests/Exposed_Policies/client.cpp +++ b/tests/Exposed_Policies/client.cpp @@ -9,8 +9,6 @@ #include "tao/Strategies/advanced_resource.h" -ACE_RCSID(tao, client, "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/tests/Exposed_Policies/server.cpp b/tests/Exposed_Policies/server.cpp index 80dd35351b3..370dde2c27a 100644 --- a/tests/Exposed_Policies/server.cpp +++ b/tests/Exposed_Policies/server.cpp @@ -15,9 +15,6 @@ #include "tao/Strategies/advanced_resource.h" -ACE_RCSID(tao, server, "$Id$") - - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/tests/Exposed_Policies/svc.conf b/tests/Exposed_Policies/svc.conf index 37973382e2c..c72881a107c 100644 --- a/tests/Exposed_Policies/svc.conf +++ b/tests/Exposed_Policies/svc.conf @@ -1,2 +1,4 @@ +# $Id$ + # Regular test static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO" diff --git a/tests/FL_Cube/Makefile.am b/tests/FL_Cube/Makefile.am deleted file mode 100644 index 8606fc77cde..00000000000 --- a/tests/FL_Cube/Makefile.am +++ /dev/null @@ -1,169 +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 = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.FL_Cube_Client.am - -if BUILD_ACE_FLREACTOR -if BUILD_EXCEPTIONS -if BUILD_FL -if BUILD_GL -if BUILD_TAO_FLRESOURCE -if BUILD_X11 - -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_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - $(ACE_FLTK_CPPFLAGS) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -client_LDFLAGS = \ - $(ACE_FLTK_LDFLAGS) - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_FlResource.la \ - $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_FLTK_LIBS) - -endif BUILD_X11 -endif BUILD_TAO_FLRESOURCE -endif BUILD_GL -endif BUILD_FL -endif BUILD_EXCEPTIONS -endif BUILD_ACE_FLREACTOR - -## Makefile.FL_Cube_Server.am - -if BUILD_ACE_FLREACTOR -if BUILD_EXCEPTIONS -if BUILD_FL -if BUILD_GL -if BUILD_TAO_FLRESOURCE -if BUILD_X11 - -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_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - $(ACE_FLTK_CPPFLAGS) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ - test_i.h - -server_LDFLAGS = \ - $(ACE_FLTK_LDFLAGS) - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_FlResource.la \ - $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_FLTK_LIBS) - -endif BUILD_X11 -endif BUILD_TAO_FLRESOURCE -endif BUILD_GL -endif BUILD_FL -endif BUILD_EXCEPTIONS -endif BUILD_ACE_FLREACTOR - -## 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/FL_Cube/client.cpp b/tests/FL_Cube/client.cpp index 49152351bee..4c3c82b1eda 100644 --- a/tests/FL_Cube/client.cpp +++ b/tests/FL_Cube/client.cpp @@ -3,8 +3,6 @@ #include "testC.h" #include "ace/Get_Opt.h" -ACE_RCSID(FL_Cube, client, "$Id$") - #include <FL/Fl.H> #include <FL/Fl_Window.H> #include <FL/Fl_Roller.H> diff --git a/tests/FL_Cube/server.cpp b/tests/FL_Cube/server.cpp index a1fa8259e32..06ab83c9456 100644 --- a/tests/FL_Cube/server.cpp +++ b/tests/FL_Cube/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "tao/FlResource/FlResource_Loader.h" -ACE_RCSID(FL_Cube, server, "$Id$") - #include <FL/Fl.H> const ACE_TCHAR *ior_output_file = 0; @@ -32,7 +30,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/tests/FL_Cube/test_i.cpp b/tests/FL_Cube/test_i.cpp index 467b010daa7..2a9e6954f04 100644 --- a/tests/FL_Cube/test_i.cpp +++ b/tests/FL_Cube/test_i.cpp @@ -3,8 +3,6 @@ #include "test_i.h" #include <GL/gl.h> -ACE_RCSID(FL_Cube, test_i, "$Id$") - Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, Simple_Window *window) : orb_ (CORBA::ORB::_duplicate (orb)), diff --git a/tests/FL_Cube/test_i.h b/tests/FL_Cube/test_i.h index df7b3e46e23..0e44cef3353 100644 --- a/tests/FL_Cube/test_i.h +++ b/tests/FL_Cube/test_i.h @@ -1,17 +1,14 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/FL_Server -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_FL_SERVER_TEST_I_H #define TAO_FL_SERVER_TEST_I_H @@ -24,42 +21,43 @@ class Simple_Window : public Fl_Gl_Window { public: + /// Constructor Simple_Window (int x, int y, int w, int h, const char * l = 0); - // Constructor void set_x_angle (CORBA::Long x); void set_y_angle (CORBA::Long y); private: + /// from the Fl_Gl_Window... virtual void draw (void); - // from the Fl_Gl_Window... virtual void draw_cube (void); + /// The angles... CORBA::Long x_angle_; CORBA::Long y_angle_; - // The angles... + /// The vertices of the cube float boxv0[3]; float boxv1[3]; float boxv2[3]; float boxv3[3]; float boxv4[3]; float boxv5[3]; float boxv6[3]; float boxv7[3]; - // The vertices of the cube }; +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb, Simple_Window* window); - // ctor // = The Simple_Server methods. void set_x_angle (CORBA::Long x); @@ -67,11 +65,11 @@ public: void shutdown (void); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB + /// Display the graphics... Simple_Window* window_; - // Display the graphics... }; #endif /* TAO_FL_SERVER_TEST_I_H */ diff --git a/tests/Faults/Makefile.am b/tests/Faults/Makefile.am deleted file mode 100644 index 8e1faf037bd..00000000000 --- a/tests/Faults/Makefile.am +++ /dev/null @@ -1,219 +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.Faults_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 $@ - -BUILT_SOURCES += \ - pingC.cpp \ - pingC.h \ - pingC.inl \ - pingS.cpp \ - pingS.h \ - pingS.inl - -CLEANFILES += \ - ping-stamp \ - pingC.cpp \ - pingC.h \ - pingC.inl \ - pingS.cpp \ - pingS.h \ - pingS.inl - -pingC.cpp pingC.h pingC.inl pingS.cpp pingS.h pingS.inl: ping-stamp - -ping-stamp: $(srcdir)/ping.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/ping.idl - @touch $@ - -noinst_HEADERS = \ - ping.idl \ - test.idl - -## Makefile.Faults_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 \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -client_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.Faults_Middle.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += middle - -middle_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -middle_SOURCES = \ - middle.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -middle_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.Faults_Ping.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += ping - -ping_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -ping_SOURCES = \ - ping.cpp \ - pingC.cpp \ - pingS.cpp \ - ping_i.cpp \ - ping_i.h \ - ping_i.inl - -ping_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.Faults_Pong.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += pong - -pong_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -pong_SOURCES = \ - pingC.cpp \ - pingS.cpp \ - ping_i.cpp \ - pong.cpp \ - ping_i.h \ - ping_i.inl - -pong_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.Faults_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_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/Faults/client.cpp b/tests/Faults/client.cpp index 6b75438f351..d8d2d54cc08 100644 --- a/tests/Faults/client.cpp +++ b/tests/Faults/client.cpp @@ -5,8 +5,6 @@ #include "test_i.h" -ACE_RCSID(Failure, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 10; int do_shutdown = 0; @@ -63,7 +61,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; } @@ -137,9 +135,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { server->shutdown_now (0); } - catch (const CORBA::COMM_FAILURE& comm_failure) + catch (const CORBA::COMM_FAILURE&) { - ACE_UNUSED_ARG (comm_failure); // Expected exception, continue.... } } @@ -149,9 +146,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { server->shutdown_now (1); } - catch (const CORBA::COMM_FAILURE& comm_failure) + catch (const CORBA::COMM_FAILURE&) { - ACE_UNUSED_ARG (comm_failure); // Expected exception, continue.... } } @@ -187,7 +183,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught in client:"); - return 1; + return -1; } return 0; diff --git a/tests/Faults/middle.cpp b/tests/Faults/middle.cpp index 94cac6ee205..7f1aa5fd6d9 100644 --- a/tests/Faults/middle.cpp +++ b/tests/Faults/middle.cpp @@ -4,8 +4,6 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Failure, middle, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("middle.ior"); const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 10; @@ -42,7 +40,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/tests/Faults/ping.cpp b/tests/Faults/ping.cpp index e3148bfe27b..14219aae5fb 100644 --- a/tests/Faults/ping.cpp +++ b/tests/Faults/ping.cpp @@ -4,8 +4,6 @@ #include "ping_i.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Faults, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("ping.ior"); int @@ -30,7 +28,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/tests/Faults/ping_i.cpp b/tests/Faults/ping_i.cpp index 44c4ff825aa..17462fd4fc4 100644 --- a/tests/Faults/ping_i.cpp +++ b/tests/Faults/ping_i.cpp @@ -6,8 +6,6 @@ #include "ping_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Faults, test_i, "$Id$") - void PingObject_i::ping (PingObject_ptr callback) { diff --git a/tests/Faults/ping_i.h b/tests/Faults/ping_i.h index 79ec976b05c..6031f7e400f 100644 --- a/tests/Faults/ping_i.h +++ b/tests/Faults/ping_i.h @@ -1,37 +1,35 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Faults -// -// = FILENAME -// ping_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file ping_i.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_PING_I_H #define TAO_PING_I_H #include "pingS.h" +/** + * @class PingObject_i + * + * @brief A simple implementation of the <ping> interface + * + * Used to verify that the client can tolerate server crashes with + * oneway invocations and that there are no problems with + * persistent object references after the crash. + */ class PingObject_i : public POA_PingObject { - // = TITLE - // A simple implementation of the <ping> interface - // - // = DESCRIPTION - // Used to verify that the client can tolerate server crashes with - // oneway invocations and that there are no problems with - // persistent object references after the crash. - // public: + /// ctor PingObject_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr the_poa); - // ctor // = The PingObject interface methods void ping (PingObject_ptr callback); @@ -41,11 +39,11 @@ public: PortableServer::POA_ptr _default_POA (void); private: + /// The orb CORBA::ORB_var orb_; - // The orb + /// The poa PortableServer::POA_var poa_; - // The poa }; #if defined(__ACE_INLINE__) diff --git a/tests/Faults/pong.cpp b/tests/Faults/pong.cpp index 322c2cefc01..580fa5b624f 100644 --- a/tests/Faults/pong.cpp +++ b/tests/Faults/pong.cpp @@ -5,8 +5,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Faults, server, "$Id$") - int iterations = 60; int period = 10; int kill_on = 30; @@ -49,7 +47,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/tests/Faults/server.cpp b/tests/Faults/server.cpp index 7825120bda4..03c87f5762a 100644 --- a/tests/Faults/server.cpp +++ b/tests/Faults/server.cpp @@ -4,8 +4,6 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Failure, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int @@ -30,7 +28,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/tests/Faults/test_i.cpp b/tests/Faults/test_i.cpp index e8582c9ddeb..c7046eac7a7 100644 --- a/tests/Faults/test_i.cpp +++ b/tests/Faults/test_i.cpp @@ -8,8 +8,6 @@ #include "ace/OS_NS_unistd.h" -ACE_RCSID(Failure, test_i, "$Id$") - void Callback_i::shutdown (CORBA::Boolean is_clean) { @@ -17,10 +15,9 @@ Callback_i::shutdown (CORBA::Boolean is_clean) { ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n")); -// Tru64 seems to hang and not abort and dump core when abort() is called -// here. This needs further investigation. This fix is a temporary one. -// Likewise for OpenVMS. -#if defined (DIGITAL_UNIX) || defined (DEC_CXX) || defined (ACE_OPENVMS) +// OpenVMS seems to hang and not abort and dump core when abort() is called +// here. This needs further investigation. +#if defined (DEC_CXX) || defined (ACE_OPENVMS) ACE_OS::_exit(); #else ACE_OS::abort(); @@ -56,7 +53,7 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean) if (is_clean == 0) { ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n")); -#if defined (DIGITAL_UNIX) || defined (DEC_CXX) || defined (ACE_OPENVMS) +#if defined (DEC_CXX) || defined (ACE_OPENVMS) ACE_OS::_exit(); #else ACE_OS::abort(); diff --git a/tests/Faults/test_i.h b/tests/Faults/test_i.h index 33cb36484d3..68d5f80cd05 100644 --- a/tests/Faults/test_i.h +++ b/tests/Faults/test_i.h @@ -1,17 +1,14 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/MT_Server -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_FAILURE_TEST_I_H #define TAO_FAILURE_TEST_I_H @@ -29,28 +26,29 @@ class Callback_i // receives a callback object. // public: + /// ctor Callback_i (CORBA::ORB_ptr orb); - // ctor + /// The callback method void shutdown (CORBA::Boolean is_clean); - // The callback method private: + /// The orb CORBA::ORB_var orb_; - // The orb }; +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb); - // ctor // = The Simple_Server methods. CORBA::Long test_method (CORBA::Boolean do_callback, @@ -62,22 +60,23 @@ public: void shutdown (void); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB }; +/** + * @class Middle_i + * + * @brief Another implementation of the simple server... + * + * Implements the Simple_Server interface in test.idl + */ class Middle_i : public virtual POA_Simple_Server { - // = TITLE - // Another implementation of the simple server... - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Middle_i (CORBA::ORB_ptr orb, Simple_Server_ptr server); - // ctor // = The Simple_Server methods. CORBA::Long test_method (CORBA::Boolean do_callback, @@ -89,11 +88,11 @@ public: void shutdown (void); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB + /// The real server Simple_Server_var server_; - // The real server }; #if defined(__ACE_INLINE__) diff --git a/tests/File_IO/File.idl b/tests/File_IO/File.idl index 2d5070bfdbb..f8c0f49183f 100644 --- a/tests/File_IO/File.idl +++ b/tests/File_IO/File.idl @@ -1,17 +1,17 @@ -// $Id$ - -//================================================================= -// -// = FILENAME -// File.idl -// -// = DESCRIPTION -// A simple File Descriptor and File System IDL interface. -// -// = AUTHOR -// Irfan Pyarali -// -//================================================================== + +//============================================================================= +/** + * @file File.idl + * + * $Id$ + * + * A simple File Descriptor and File System IDL interface. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + // IDL diff --git a/tests/File_IO/File_i.cpp b/tests/File_IO/File_i.cpp index 106ae0b6573..1776c7394c0 100644 --- a/tests/File_IO/File_i.cpp +++ b/tests/File_IO/File_i.cpp @@ -1,26 +1,24 @@ -// $Id$ - -//=================================================================== -// -// = FILENAME -// File_i.cpp -// -// = DESCRIPTION -// Implementation of the File IDL module and the interfaces -// Descriptor and System in it. -// -// = AUTHOR -// Irfan Pyarali -// -//==================================================================== + +//============================================================================= +/** + * @file File_i.cpp + * + * $Id$ + * + * Implementation of the File IDL module and the interfaces + * Descriptor and System in it. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "File_i.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Default_Servant, File_i, "File_i.cpp,v 1.14 2001/03/04 19:27:53 irfan Exp") - // IDL File::System constructor FileImpl::System::System (PortableServer::POA_ptr poa) : poa_ (PortableServer::POA::_duplicate (poa)), diff --git a/tests/File_IO/File_i.h b/tests/File_IO/File_i.h index 3b4858c1c18..37d90074392 100644 --- a/tests/File_IO/File_i.h +++ b/tests/File_IO/File_i.h @@ -1,87 +1,96 @@ -// $Id$ - -//=================================================================== -// -// = FILENAME -// File_i.h -// -// = DESCRIPTION -// Defines the implementation classes for the File IDL -// module -// -// = AUTHOR -// Irfan Pyarali -// -//==================================================================== + +//============================================================================= +/** + * @file File_i.h + * + * $Id$ + * + * Defines the implementation classes for the File IDL + * module + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "FileS.h" +/** + * @class FileImpl + * + * @brief FileImpl class provides the namespace for the File IDL module . + */ class FileImpl { - // = TITLE - // FileImpl class provides the namespace for the File IDL module . public: + /** + * @class Descriptor + * + * @brief Descriptor implements the Descriptor interface in the File + * Module A single Descriptor servant can serve multiple object + * references + */ class Descriptor : public POA_File::Descriptor { - // = TITLE - // Descriptor implements the Descriptor interface in the File - // Module A single Descriptor servant can serve multiple object - // references public: + /// Constructor Descriptor (PortableServer::POA_ptr poa); - // Constructor + /// Destructor ~Descriptor (void); - // Destructor + /// Returns the default POA of this object PortableServer::POA_ptr _default_POA (void); - // Returns the default POA of this object + /// write buffer to File corresponding to this Descriptor virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer); - // write buffer to File corresponding to this Descriptor virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes); + /// seek to the offset in file from whence virtual CORBA::ULong lseek (CORBA::ULong offset, CORBA::Long whence); - // seek to the offset in file from whence + /// closes the file corresponding to the requested ObjectID virtual void destroy (void); - // closes the file corresponding to the requested ObjectID private: + /// Extracts the ACE_HANDLE from the objectID ACE_HANDLE fd (void); - // Extracts the ACE_HANDLE from the objectID PortableServer::POA_var poa_; }; + /** + * @class System + * + * @brief File System implementation class. + */ class System : public POA_File::System { - // = TITLE - // File System implementation class. public: + /// Constructor, Creates a single File Descriptor Servant and + /// registers it with the POA as the Default Servant System (PortableServer::POA_ptr poa); - // Constructor, Creates a single File Descriptor Servant and - // registers it with the POA as the Default Servant + ///Destructor ~System (void); - //Destructor + ///Returns the default POA of this object PortableServer::POA_ptr _default_POA (void); - //Returns the default POA of this object + /// Opens a file ,creates a Descriptor reference with the + /// ACE_HANDLE and returns that reference File::Descriptor_ptr open (const char *file_name, CORBA::Long flags); - // Opens a file ,creates a Descriptor reference with the - // ACE_HANDLE and returns that reference private: PortableServer::POA_var poa_; + /// The single File Descriptor servant which serves requests for + /// any Descriptor object under poa_. Descriptor fd_servant_; - // The single File Descriptor servant which serves requests for - // any Descriptor object under poa_. }; }; diff --git a/tests/File_IO/Makefile.am b/tests/File_IO/Makefile.am deleted file mode 100644 index a6bb85be07e..00000000000 --- a/tests/File_IO/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.File_IO_Idl.am - -BUILT_SOURCES = \ - FileC.cpp \ - FileC.h \ - FileC.inl \ - FileS.cpp \ - FileS.h \ - FileS.inl - -CLEANFILES = \ - File-stamp \ - FileC.cpp \ - FileC.h \ - FileC.inl \ - FileS.cpp \ - FileS.h \ - FileS.inl - -FileC.cpp FileC.h FileC.inl FileS.cpp FileS.h FileS.inl: File-stamp - -File-stamp: $(srcdir)/File.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/File.idl - @touch $@ - -noinst_HEADERS = \ - File.idl - -## Makefile.File_IO_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - FileC.cpp \ - client.cpp \ - File_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.File_IO_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - FileC.cpp \ - FileS.cpp \ - File_i.cpp \ - server.cpp \ - File_i.h - -server_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/File_IO/client.cpp b/tests/File_IO/client.cpp index e5bc56086c0..fa43de2625b 100644 --- a/tests/File_IO/client.cpp +++ b/tests/File_IO/client.cpp @@ -1,31 +1,28 @@ -// $Id$ - -//=================================================================== -// = LIBRARY -// TAO/tests/POA/Default_Servant/client -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// A client program for the File IDL module -// -// = AUTHOR -// Irfan Pyarali -// -//==================================================================== + +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * A client program for the File IDL module + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "FileC.h" #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" -#include "ace/OS.h" #include "ace/SString.h" #include "ace/Thread_Manager.h" +#include "ace/OS_NS_fcntl.h" +#include "ace/OS_NS_unistd.h" -ACE_RCSID(Default_Servant, client, "client.cpp,v 1.8 2001/03/26 21:16:52 coryan Exp") - - static const ACE_TCHAR *iorfile = ACE_TEXT("ior"); +static const ACE_TCHAR *iorfile = ACE_TEXT("ior"); static const ACE_TCHAR *filename = ACE_TEXT("big.txt"); static int NUM_THREADS = 4; diff --git a/tests/File_IO/run_test.pl b/tests/File_IO/run_test.pl index 7f03bd227fa..61749665a3f 100755 --- a/tests/File_IO/run_test.pl +++ b/tests/File_IO/run_test.pl @@ -15,10 +15,10 @@ $client_debug_level = '0'; foreach $i (@ARGV) { if ($i eq '-sdebug') { $server_debug_level = '10'; - } + } if ($i eq '-cdebug') { $client_debug_level = '10'; - } + } } diff --git a/tests/File_IO/server.cpp b/tests/File_IO/server.cpp index c02ab0419a1..d358a3ffbc4 100644 --- a/tests/File_IO/server.cpp +++ b/tests/File_IO/server.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "File_i.h" #include "tao/debug.h" @@ -8,22 +9,17 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_fcntl.h" -ACE_RCSID (File_IO, - server, - "$Id$") - static const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); static const int nthreads = 2; +/** + * Run a server thread + * + * Use the ACE_Task_Base class to run server threads + */ class Worker : public ACE_Task_Base { - // = TITLE - // Run a server thread - // - // = DESCRIPTION - // Use the ACE_Task_Base class to run server threads - // public: Worker (CORBA::ORB_ptr orb); // ctor diff --git a/tests/ForwardOnceUponException/client.cpp b/tests/ForwardOnceUponException/client.cpp index 75910c8096d..5d3e11e6777 100755 --- a/tests/ForwardOnceUponException/client.cpp +++ b/tests/ForwardOnceUponException/client.cpp @@ -3,11 +3,9 @@ #include "testC.h" #include "ace/Get_Opt.h" #include "ace/Task.h" -#include "ace/OS.h" #include "ace/streams.h" #include "tao/Invocation_Utils.h" - -ACE_RCSID(ForwardOnceUponException, client, "$Id$") +#include "ace/OS_NS_unistd.h" const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 1; @@ -64,7 +62,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) ACE_OS::strlen(corbaloc_prefix)) != 0) return 1; - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } @@ -83,7 +81,7 @@ public: // Return number of received exceptions. int num_received_ex () const; - // Is test done ? + // Is test done ? void done (); private: @@ -120,9 +118,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) int timeout = 30; int now = 0; - while (now < timeout - && ((expect_ex_kind != TAO::FOE_NON - && worker.received_ex_kind () != expect_ex_kind + while (now < timeout + && ((expect_ex_kind != TAO::FOE_NON + && worker.received_ex_kind () != expect_ex_kind && worker.num_received_ex () != expect_num_ex) || expect_ex_kind == TAO::FOE_NON)) { @@ -152,16 +150,16 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) worker.thr_mgr ()->wait (); - if (worker.received_ex_kind () != expect_ex_kind + if (worker.received_ex_kind () != expect_ex_kind || worker.num_received_ex () != expect_num_ex) { ACE_ERROR_RETURN ((LM_ERROR, ("(%P|%t)client: test failed - expected is different from received. " - "expected %d/%d received %d/%d.\n"), + "expected %d/%d received %d/%d.\n"), expect_ex_kind, expect_num_ex, worker.received_ex_kind (), worker.num_received_ex()), 1); } - + ACE_DEBUG ((LM_DEBUG, "(%P|%t)client: test passed.\n")); } catch (const CORBA::Exception& ex) @@ -212,7 +210,7 @@ Worker::svc (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) unexpected result = %d\n", r)); - + } catch (const CORBA::OBJECT_NOT_EXIST &) { @@ -257,25 +255,25 @@ Worker::svc (void) ex._tao_print_exception ( "Unexpected exception caught"); } - + return 0; } -int +int Worker::received_ex_kind () const { return received_ex_kind_; } -int +int Worker::num_received_ex () const { return num_received_ex_; } -void -Worker::done () +void +Worker::done () { done_ = true; } diff --git a/tests/ForwardOnceUponException/run_test.pl b/tests/ForwardOnceUponException/run_test.pl index 0271ba7cbaf..cf934765749 100755 --- a/tests/ForwardOnceUponException/run_test.pl +++ b/tests/ForwardOnceUponException/run_test.pl @@ -18,74 +18,74 @@ foreach $i (@ARGV) { } # Current supported forward once exceptions: -# EF_OBJECT_NOT_EXIST = 0x1, -# EF_COMM_FAILURE = 0x2, -# EF_TRANSIENT = 0x4, -# EF_INV_OBJREF = 0x8, +# EF_OBJECT_NOT_EXIST = 0x1, +# EF_COMM_FAILURE = 0x2, +# EF_TRANSIENT = 0x4, +# EF_INV_OBJREF = 0x8, @configurations = ({ - description => "case 1: not forward upon OBJECT_NOT_EXIST exception", + description => "case 1: not forward upon OBJECT_NOT_EXIST exception", orb_exception_forward_opt => "-ORBForwardOnceOnObjectNotExist 0", num_requests => "1", client_expect_num_ex => "1", - client_expect_ex_kind => "1", - server_raise_ex_kind => "1", + client_expect_ex_kind => "1", + server_raise_ex_kind => "1", servant_calls => "1", },{ - description => "case 2: default Fault Tolerant always forward upon COMM_FAILURE exception", + description => "case 2: default Fault Tolerant always forward upon COMM_FAILURE exception", orb_exception_forward_opt => "-ORBForwardOnceOnCommFailure 0", num_requests => "1", client_expect_num_ex => "0", - client_expect_ex_kind => "0", - server_raise_ex_kind => "2", + client_expect_ex_kind => "0", + server_raise_ex_kind => "2", servant_calls => "0", # use 0 to indicate request looping case },{ - description => "case 3: default Fault Tolerant always forward upon TRANSIENT exception", + description => "case 3: default Fault Tolerant always forward upon TRANSIENT exception", orb_exception_forward_opt => "-ORBForwardOnceOnTransient 0", num_requests => "1", client_expect_num_ex => "0", - client_expect_ex_kind => "0", - server_raise_ex_kind => "4", + client_expect_ex_kind => "0", + server_raise_ex_kind => "4", servant_calls => "0", # use 0 to indicate request looping case },{ - description => "case 4: not forward upon INV_OBJREF exception", + description => "case 4: not forward upon INV_OBJREF exception", orb_exception_forward_opt => "-ORBForwardOnceOnInvObjref 0", num_requests => "1", - client_expect_num_ex => "1", - client_expect_ex_kind => "8", - server_raise_ex_kind => "8", + client_expect_num_ex => "1", + client_expect_ex_kind => "8", + server_raise_ex_kind => "8", servant_calls => "1", },{ - description => "case 5: forward once upon OBJECT_NOT_EXIST exception", + description => "case 5: forward once upon OBJECT_NOT_EXIST exception", orb_exception_forward_opt => "-ORBForwardOnceOnObjectNotExist 1", num_requests => "4", - client_expect_num_ex => "4", - client_expect_ex_kind => "1", - server_raise_ex_kind => "1", - servant_calls => "5", # 4 requests + 1 forward + client_expect_num_ex => "4", + client_expect_ex_kind => "1", + server_raise_ex_kind => "1", + servant_calls => "5", # 4 requests + 1 forward },{ - description => "case 6: forward once upon COMM_FAILURE exception", + description => "case 6: forward once upon COMM_FAILURE exception", orb_exception_forward_opt => "-ORBForwardOnceOnCommFailure 1", - num_requests => "4", - client_expect_num_ex => "4", - client_expect_ex_kind => "2", - server_raise_ex_kind => "2", - servant_calls => "5", # 4 requests + 1 forward + num_requests => "4", + client_expect_num_ex => "4", + client_expect_ex_kind => "2", + server_raise_ex_kind => "2", + servant_calls => "5", # 4 requests + 1 forward },{ - description => "case 7: forward once upon TRANSIENT exception", + description => "case 7: forward once upon TRANSIENT exception", orb_exception_forward_opt => "-ORBForwardOnceOnTransient 1", num_requests => "4", - client_expect_num_ex => "4", - client_expect_ex_kind => "4", - server_raise_ex_kind => "4", - servant_calls => "5", # 4 requests + 1 forward + client_expect_num_ex => "4", + client_expect_ex_kind => "4", + server_raise_ex_kind => "4", + servant_calls => "5", # 4 requests + 1 forward },{ - description => "case 8: forward once upon INV_OBJREF exception", + description => "case 8: forward once upon INV_OBJREF exception", orb_exception_forward_opt => "-ORBForwardOnceOnInvObjref 1", num_requests => "4", - client_expect_num_ex => "4", - client_expect_ex_kind => "8", - server_raise_ex_kind => "8", - servant_calls => "5", # 4 requests + 1 forward + client_expect_num_ex => "4", + client_expect_ex_kind => "8", + server_raise_ex_kind => "8", + servant_calls => "5", # 4 requests + 1 forward }, ); @@ -114,7 +114,7 @@ for $test (@configurations) { "-e $test->{client_expect_ex_kind} " . "-n $test->{client_expect_num_ex} ". "-i $test->{num_requests} $test->{orb_exception_forward_opt}"); - + print STDERR $SV->CommandLine () . "\n"; print STDERR $CL->CommandLine () . "\n"; diff --git a/tests/ForwardOnceUponException/server.cpp b/tests/ForwardOnceUponException/server.cpp index 915615adbee..cde9adfca59 100755 --- a/tests/ForwardOnceUponException/server.cpp +++ b/tests/ForwardOnceUponException/server.cpp @@ -6,8 +6,6 @@ #include "ace/OS_NS_stdio.h" #include "tao/Invocation_Utils.h" -ACE_RCSID(ForwardOnceUponException, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int expect_servant_calls = 1; int raise_exception = TAO::FOE_NON; @@ -43,7 +41,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; } @@ -112,7 +110,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "(%P|%t)server: event loop finished\n")); - // If expect_servant_calls is 0, it means it's the request forward looping case so the + // If expect_servant_calls is 0, it means it's the request forward looping case so the // servant continue receiving calls from a single request. We can not determine how many // servant calls but it should be more than the number of requests. if ((expect_servant_calls == 0 && (server_impl.ncalls () > num_requests)) diff --git a/tests/ForwardOnceUponException/test_i.cpp b/tests/ForwardOnceUponException/test_i.cpp index e899da4f4b4..e139a027d6c 100755 --- a/tests/ForwardOnceUponException/test_i.cpp +++ b/tests/ForwardOnceUponException/test_i.cpp @@ -6,7 +6,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(ForwardOnceUponException, test_i, "$Id$") extern int raise_exception; CORBA::Boolean @@ -19,19 +18,19 @@ Simple_Server_i::test_is_a (const char * /* type */) //ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a called %d and raise OBJECT_NOT_EXIST\n", ncalls_)); throw ::CORBA::OBJECT_NOT_EXIST (); } - + if ((raise_exception & TAO::FOE_COMM_FAILURE) == TAO::FOE_COMM_FAILURE) { //ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a called %d and raise COMM_FAILURE\n", ncalls_)); throw ::CORBA::COMM_FAILURE (); } - + if ((raise_exception & TAO::FOE_TRANSIENT) == TAO::FOE_TRANSIENT) { //ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a called %d and raise TRANSIENT\n", ncalls_)); throw ::CORBA::TRANSIENT (); } - + if ((raise_exception & TAO::FOE_INV_OBJREF) == TAO::FOE_INV_OBJREF) { //ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a called %d and raise INV_OBJREF\n", ncalls_)); diff --git a/tests/ForwardOnceUponException/test_i.h b/tests/ForwardOnceUponException/test_i.h index ce17954e580..169a6a7823f 100755 --- a/tests/ForwardOnceUponException/test_i.h +++ b/tests/ForwardOnceUponException/test_i.h @@ -1,34 +1,32 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Forwarding -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_FORWARDING_TEST_I_H #define TAO_FORWARDING_TEST_I_H #include "testS.h" +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb); - // ctor // = The Simple_Server methods. CORBA::Boolean test_is_a (const char * type); @@ -38,8 +36,8 @@ public: int ncalls () const; private: + /// The ORB CORBA::ORB_var orb_; - // The ORB int ncalls_; int raise_exception_; diff --git a/tests/ForwardUponObjectNotExist/client.cpp b/tests/ForwardUponObjectNotExist/client.cpp index 4243ec5ee13..783d187e115 100755 --- a/tests/ForwardUponObjectNotExist/client.cpp +++ b/tests/ForwardUponObjectNotExist/client.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(Forwarding, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 1; int do_shutdown = 0; @@ -49,7 +47,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) ACE_OS::strlen (corbaloc_prefix)) != 0) return 1; - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } @@ -190,7 +188,7 @@ Worker::run_test (void) r)); } -int +int Worker::got_object_not_exist () const { return got_object_not_exist_; diff --git a/tests/ForwardUponObjectNotExist/server.cpp b/tests/ForwardUponObjectNotExist/server.cpp index 94f63160aeb..eb95494366b 100755 --- a/tests/ForwardUponObjectNotExist/server.cpp +++ b/tests/ForwardUponObjectNotExist/server.cpp @@ -5,8 +5,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Forwarding, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -31,7 +29,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/tests/ForwardUponObjectNotExist/test_i.cpp b/tests/ForwardUponObjectNotExist/test_i.cpp index fbb43910dbb..bc33c618f74 100755 --- a/tests/ForwardUponObjectNotExist/test_i.cpp +++ b/tests/ForwardUponObjectNotExist/test_i.cpp @@ -6,8 +6,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Forwarding, test_i, "$Id$") - CORBA::Boolean Simple_Server_i::test_is_a (const char * /* type */) { diff --git a/tests/ForwardUponObjectNotExist/test_i.h b/tests/ForwardUponObjectNotExist/test_i.h index 60670e13d54..abf27c63925 100755 --- a/tests/ForwardUponObjectNotExist/test_i.h +++ b/tests/ForwardUponObjectNotExist/test_i.h @@ -1,34 +1,32 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Forwarding -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_FORWARDING_TEST_I_H #define TAO_FORWARDING_TEST_I_H #include "testS.h" +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb); - // ctor // = The Simple_Server methods. CORBA::Boolean test_is_a (const char * type); @@ -36,8 +34,8 @@ public: void shutdown (void); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB }; #if defined(__ACE_INLINE__) diff --git a/tests/Forwarding/Makefile.am b/tests/Forwarding/Makefile.am deleted file mode 100644 index f2d088fb389..00000000000 --- a/tests/Forwarding/Makefile.am +++ /dev/null @@ -1,109 +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.Forwarding_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.Forwarding_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 \ - testC.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Forwarding_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -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/tests/Forwarding/client.cpp b/tests/Forwarding/client.cpp index c92a7dcf9b6..bfd91f357d5 100644 --- a/tests/Forwarding/client.cpp +++ b/tests/Forwarding/client.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(Forwarding, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 10; int nthreads = 1; @@ -42,7 +40,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/tests/Forwarding/server.cpp b/tests/Forwarding/server.cpp index 3f969e20acc..7abc09e549a 100644 --- a/tests/Forwarding/server.cpp +++ b/tests/Forwarding/server.cpp @@ -5,8 +5,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Forwarding, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -31,7 +29,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/tests/Forwarding/test_i.cpp b/tests/Forwarding/test_i.cpp index 120c6f7b96b..4c2a71f0302 100644 --- a/tests/Forwarding/test_i.cpp +++ b/tests/Forwarding/test_i.cpp @@ -6,8 +6,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Forwarding, test_i, "$Id$") - CORBA::Boolean Simple_Server_i::test_is_a (const char * /* type */) { diff --git a/tests/Forwarding/test_i.h b/tests/Forwarding/test_i.h index 60670e13d54..abf27c63925 100644 --- a/tests/Forwarding/test_i.h +++ b/tests/Forwarding/test_i.h @@ -1,34 +1,32 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Forwarding -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_FORWARDING_TEST_I_H #define TAO_FORWARDING_TEST_I_H #include "testS.h" +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb); - // ctor // = The Simple_Server methods. CORBA::Boolean test_is_a (const char * type); @@ -36,8 +34,8 @@ public: void shutdown (void); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB }; #if defined(__ACE_INLINE__) diff --git a/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp b/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp index b7af4d6d5b2..56c489c9f5a 100644 --- a/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp +++ b/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp @@ -4,8 +4,6 @@ #include "Client_Task.h" -ACE_RCSID(Muxing, Client_Task, "$Id$") - Client_Task::Client_Task (Test::Big_Reply_ptr reply_gen, int event_count, ACE_Thread_Manager *thr_mgr) diff --git a/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am b/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am deleted file mode 100644 index 42a0e234115..00000000000 --- a/tests/GIOP_Fragments/Java_Big_Reply/Makefile.am +++ /dev/null @@ -1,109 +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) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.Java_Big_Reply_IDL.am - -if BUILD_JAVA - -BUILT_SOURCES += \ - Test/ - -CLEANFILES += \ - Test/ - -Test/: $(srcdir)/Test.idl - mkdir -p Test - idlj -fall $(srcdir)/Test.idl - -endif BUILD_JAVA - -## Makefile.Java_Big_Reply.am - -if BUILD_EXCEPTIONS -if BUILD_JAVA - -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 $@ - -BUILT_SOURCES += \ - server.class - -CLEANFILES += \ - server.class - -server.class: $(srcdir)/server.java - javac -d . $(srcdir)/server.java - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Client_Task.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -client_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_JAVA -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/GIOP_Fragments/Java_Big_Reply/client.cpp b/tests/GIOP_Fragments/Java_Big_Reply/client.cpp index a8c008992f5..2edab1ba7d7 100644 --- a/tests/GIOP_Fragments/Java_Big_Reply/client.cpp +++ b/tests/GIOP_Fragments/Java_Big_Reply/client.cpp @@ -3,8 +3,6 @@ #include "Client_Task.h" #include "ace/Get_Opt.h" -ACE_RCSID(Muxing, client, "$Id$") - static const ACE_TCHAR *ior = ACE_TEXT("file://server.ior"); static size_t nthreads = 1; @@ -33,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/tests/GIOP_Fragments/Java_Big_Reply/server.java b/tests/GIOP_Fragments/Java_Big_Reply/server.java index f23d552c542..c89b7595e7f 100644 --- a/tests/GIOP_Fragments/Java_Big_Reply/server.java +++ b/tests/GIOP_Fragments/Java_Big_Reply/server.java @@ -59,4 +59,4 @@ public class server e.printStackTrace (System.out); } } -} +} diff --git a/tests/GIOP_Fragments/Java_Big_Request/Makefile.am b/tests/GIOP_Fragments/Java_Big_Request/Makefile.am deleted file mode 100644 index 581f28beb4e..00000000000 --- a/tests/GIOP_Fragments/Java_Big_Request/Makefile.am +++ /dev/null @@ -1,109 +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) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.Java_Big_Request_IDL.am - -if BUILD_JAVA - -BUILT_SOURCES += \ - Test/ - -CLEANFILES += \ - Test/ - -Test/: $(srcdir)/Test.idl - mkdir -p Test - idlj $(srcdir)/Test.idl - -endif BUILD_JAVA - -## Makefile.Java_Big_Request.am - -if BUILD_EXCEPTIONS -if BUILD_JAVA - -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 $@ - -BUILT_SOURCES += \ - client.class - -CLEANFILES += \ - client.class - -client.class: $(srcdir)/client.java - javac -d . $(srcdir)/client.java - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Payload_Receiver.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Payload_Receiver.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_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_JAVA -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/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp b/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp index 81ee459c199..df4950cf28c 100644 --- a/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp +++ b/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp @@ -3,8 +3,6 @@ // #include "Payload_Receiver.h" -ACE_RCSID(Big_Request_Muxing, Payload_Receiver, "$Id$") - Payload_Receiver::Payload_Receiver (CORBA::ORB_ptr orb) : count_ (0), orb_(CORBA::ORB::_duplicate (orb)) diff --git a/tests/GIOP_Fragments/Java_Big_Request/server.cpp b/tests/GIOP_Fragments/Java_Big_Request/server.cpp index 8be5ca51ce4..127a41292a1 100644 --- a/tests/GIOP_Fragments/Java_Big_Request/server.cpp +++ b/tests/GIOP_Fragments/Java_Big_Request/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Big_Request_Muxing, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int @@ -29,7 +27,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/tests/GIOP_Fragments/Makefile.am b/tests/GIOP_Fragments/Makefile.am deleted file mode 100644 index a3b8104e475..00000000000 --- a/tests/GIOP_Fragments/Makefile.am +++ /dev/null @@ -1,15 +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 = \ - Java_Big_Reply \ - Java_Big_Request \ - PMB_With_Fragments - diff --git a/tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am b/tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am deleted file mode 100644 index 1f6a5ba4b6b..00000000000 --- a/tests/GIOP_Fragments/PMB_With_Fragments/Makefile.am +++ /dev/null @@ -1,80 +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) - - -## Makefile.PMB_With_Fragments.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) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Payload_Receiver.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Payload_Receiver.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_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/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp b/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp index 1da64d18952..df4950cf28c 100644 --- a/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp +++ b/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp @@ -3,8 +3,6 @@ // #include "Payload_Receiver.h" -ACE_RCSID(PMB_With_Fragments, Payload_Receiver, "$Id$") - Payload_Receiver::Payload_Receiver (CORBA::ORB_ptr orb) : count_ (0), orb_(CORBA::ORB::_duplicate (orb)) diff --git a/tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl b/tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl index 26a561aa58b..3e10a136d4d 100755 --- a/tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl +++ b/tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl @@ -53,7 +53,7 @@ if (!$result) { my($initial) = length($str); my($length) = $initial; my($maxLine) = 78; - + print $str; foreach my $key (sort keys %options) { diff --git a/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp b/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp index b3a64237d4a..8c5e4caddff 100644 --- a/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp +++ b/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Big_Request_Muxing, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int @@ -29,7 +27,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/tests/HandleExhaustion/Makefile.am b/tests/HandleExhaustion/Makefile.am deleted file mode 100644 index f096aa29bea..00000000000 --- a/tests/HandleExhaustion/Makefile.am +++ /dev/null @@ -1,102 +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.HandleExhaustion_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.HandleExhaustion_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 \ - TestS.cpp \ - server.cpp - -server_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.HandleExhaustion_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 - -client_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/HandleExhaustion/client.cpp b/tests/HandleExhaustion/client.cpp index dd2e4af7a87..7a9d40c66d6 100644 --- a/tests/HandleExhaustion/client.cpp +++ b/tests/HandleExhaustion/client.cpp @@ -4,9 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(ConnectionSpinning, - client, "$Id$") - static const ACE_TCHAR *ior = ACE_TEXT ("file://server.ior"); int @@ -31,7 +28,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/tests/HandleExhaustion/server.cpp b/tests/HandleExhaustion/server.cpp index 38eced40b06..8b09a8fddd0 100644 --- a/tests/HandleExhaustion/server.cpp +++ b/tests/HandleExhaustion/server.cpp @@ -8,9 +8,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_resource.h" -ACE_RCSID (ConnectionSpinning, - server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior"); class Test_i: public virtual POA_Test @@ -102,7 +99,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/tests/Hang_Shutdown/Makefile.am b/tests/Hang_Shutdown/Makefile.am deleted file mode 100644 index 467eea862ac..00000000000 --- a/tests/Hang_Shutdown/Makefile.am +++ /dev/null @@ -1,107 +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.Hang_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.Hang_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 \ - TestS.cpp \ - server.cpp \ - test_i.h - -server_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.Hang_Client.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 = \ - TestC.cpp \ - client.cpp \ - test_i.h - -client_LDADD = \ - $(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/tests/Hang_Shutdown/client.cpp b/tests/Hang_Shutdown/client.cpp index 2763c058f75..b9a6d27a1fb 100644 --- a/tests/Hang_Shutdown/client.cpp +++ b/tests/Hang_Shutdown/client.cpp @@ -2,11 +2,9 @@ #include "TestC.h" #include "ace/Get_Opt.h" -#include "ace/OS.h" #include "ace/Task.h" #include "ace/Profile_Timer.h" - -ACE_RCSID(Hello, client, "$Id$") +#include "ace/OS_NS_unistd.h" namespace Test { @@ -50,7 +48,7 @@ namespace Test false); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return true; } diff --git a/tests/Hang_Shutdown/server.cpp b/tests/Hang_Shutdown/server.cpp index 1b4a98d57b3..aed5b6d77dc 100644 --- a/tests/Hang_Shutdown/server.cpp +++ b/tests/Hang_Shutdown/server.cpp @@ -30,7 +30,7 @@ namespace Test argv [0]), -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Hello/Hello.cpp b/tests/Hello/Hello.cpp index df5dc90d3d9..df49d37a507 100644 --- a/tests/Hello/Hello.cpp +++ b/tests/Hello/Hello.cpp @@ -1,10 +1,6 @@ -// // $Id$ -// #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Hello/Makefile.am b/tests/Hello/Makefile.am deleted file mode 100644 index a0e2286e095..00000000000 --- a/tests/Hello/Makefile.am +++ /dev/null @@ -1,105 +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.Hello_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 -Sp $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Hello_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 \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Hello_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_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/Hello/client.cpp b/tests/Hello/client.cpp index 940e5439939..1bb3e718137 100644 --- a/tests/Hello/client.cpp +++ b/tests/Hello/client.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int diff --git a/tests/Hello/server.cpp b/tests/Hello/server.cpp index cacd790a6ff..205a7c179e0 100644 --- a/tests/Hello/server.cpp +++ b/tests/Hello/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int @@ -32,7 +28,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/tests/ICMG_Any_Bug/Hello.cpp b/tests/ICMG_Any_Bug/Hello.cpp index 785ca17bae2..4242c5294a4 100644 --- a/tests/ICMG_Any_Bug/Hello.cpp +++ b/tests/ICMG_Any_Bug/Hello.cpp @@ -4,8 +4,6 @@ #include "Hello.h" #include "HelloWorld.h" -ACE_RCSID(ICMG_Any_Bug, Hello, "$Id") - Hello::Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) : poa_ (PortableServer::POA::_duplicate (poa)), orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/tests/ICMG_Any_Bug/HelloWorld.cpp b/tests/ICMG_Any_Bug/HelloWorld.cpp index a3811dfb3d9..9fe083d79ed 100644 --- a/tests/ICMG_Any_Bug/HelloWorld.cpp +++ b/tests/ICMG_Any_Bug/HelloWorld.cpp @@ -4,10 +4,6 @@ #include "HelloWorld.h" - -ACE_RCSID (ICMG_Any_Bug, HelloWorld, "$Id$") - - HelloWorld::HelloWorld (void) { } diff --git a/tests/ICMG_Any_Bug/Makefile.am b/tests/ICMG_Any_Bug/Makefile.am deleted file mode 100644 index 28b42bb7108..00000000000 --- a/tests/ICMG_Any_Bug/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.ICMG_Any_Bug_Hello_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) $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.ICMG_Any_Bug_Hello_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 = \ - TestC.cpp \ - client.cpp \ - Hello.h \ - HelloWorld.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_PortableServer.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 -endif BUILD_CORBA_MESSAGING - -## Makefile.ICMG_Any_Bug_Hello_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - HelloWorld.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h \ - HelloWorld.h - -server_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/ICMG_Any_Bug/client.cpp b/tests/ICMG_Any_Bug/client.cpp index 8638de85caa..04ee037423f 100644 --- a/tests/ICMG_Any_Bug/client.cpp +++ b/tests/ICMG_Any_Bug/client.cpp @@ -6,10 +6,6 @@ #include "ace/Get_Opt.h" #include <string> -ACE_RCSID (ICMG_Any_Bug, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -34,7 +30,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/tests/ICMG_Any_Bug/server.cpp b/tests/ICMG_Any_Bug/server.cpp index f0e69cd322c..aea9277fb44 100644 --- a/tests/ICMG_Any_Bug/server.cpp +++ b/tests/ICMG_Any_Bug/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (ICMG_Any_Bug, - server, - "$Id$ ") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +28,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/tests/IDL_Inherited_Operation/InheritedOp.idl b/tests/IDL_Inherited_Operation/InheritedOp.idl index b8d54bafcb2..b24866358c6 100644 --- a/tests/IDL_Inherited_Operation/InheritedOp.idl +++ b/tests/IDL_Inherited_Operation/InheritedOp.idl @@ -13,9 +13,9 @@ module Outer }; }; }; - + module Outer -{ +{ module Inner { interface Base; diff --git a/tests/IDL_Inherited_Operation/InheritedOp_i.cpp b/tests/IDL_Inherited_Operation/InheritedOp_i.cpp index d7727558b6a..1fdf64ad83d 100644 --- a/tests/IDL_Inherited_Operation/InheritedOp_i.cpp +++ b/tests/IDL_Inherited_Operation/InheritedOp_i.cpp @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ #include "InheritedOp_i.h" diff --git a/tests/IDL_Inherited_Operation/InheritedOp_i.h b/tests/IDL_Inherited_Operation/InheritedOp_i.h index 2248ee1d872..efc430f3851 100644 --- a/tests/IDL_Inherited_Operation/InheritedOp_i.h +++ b/tests/IDL_Inherited_Operation/InheritedOp_i.h @@ -1,5 +1,5 @@ // -*- C++ -*- -// $Id:$ +// $Id$ #ifndef INHERITED_OP_I_H #define INHERITED_OP_I_H @@ -11,10 +11,10 @@ class Derived_i : public virtual POA_Outer::Derived { public: Derived_i (CORBA::ORB_ptr orb); - + virtual void BaseOp (void); virtual void shutdown (void); - + private: CORBA::ORB_ptr orb_; }; diff --git a/tests/IDL_Inherited_Operation/server.cpp b/tests/IDL_Inherited_Operation/server.cpp index dfaf09025f6..ae20f1251a1 100644 --- a/tests/IDL_Inherited_Operation/server.cpp +++ b/tests/IDL_Inherited_Operation/server.cpp @@ -27,7 +27,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/tests/IDL_Test/Bug_3312_Regression.idl b/tests/IDL_Test/Bug_3312_Regression.idl new file mode 100644 index 00000000000..25c96b4ac7e --- /dev/null +++ b/tests/IDL_Test/Bug_3312_Regression.idl @@ -0,0 +1,18 @@ +// $Id$ + +module CallMe + { + enum Colors { Red, Green, Blue }; + + union YourColorBaby switch (enum ColorMe { Red, Blue }) + { + case Red: enum Val { one, two } c_1; + case Blue: long c_2; + }; + + union YourCar switch (enum ColorMe { Green, Pink }) + { + case Green: short c_1; + case Pink: short c_2; + }; + }; diff --git a/tests/IDL_Test/IDL_Test.mpc b/tests/IDL_Test/IDL_Test.mpc index 4b865bc15ab..8c58bdf1d55 100644 --- a/tests/IDL_Test/IDL_Test.mpc +++ b/tests/IDL_Test/IDL_Test.mpc @@ -1,5 +1,6 @@ // -*- MPC -*- // $Id$ + project(*IDL): taoserver, messaging, gen_ostream { custom_only=1 idlflags += -GC -GH -Gd -GT @@ -15,7 +16,6 @@ project(*IDL): taoserver, messaging, gen_ostream { } IDL_Files { - array.idl Bug_2350_Regression.idl Bug_2577_Regression.idl Bug_2582_Regression.idl @@ -23,14 +23,12 @@ project(*IDL): taoserver, messaging, gen_ostream { Bug_2616_Regression.idl Bug_2619_Regression.idl Bug_3243_Regression.idl + Bug_3312_Regression.idl Bug_3819_Regression.idl Bug_3821_Regression.idl - enum_in_struct.idl full.idl fwd.idl gperf.idl - included.idl - including.idl interface.idl nested_scope.idl @@ -48,17 +46,32 @@ project(*IDL): taoserver, messaging, gen_ostream { struct.idl reopen_include1.idl reopen_include2.idl - sequence.idl typeprefix.idl + } + + IDL_Files { + idlflags += -as + enum_in_struct.idl + array.idl + array_anon_nested.idl + included.idl + including.idl + sequence.idl union.idl + anyunion.idl } IDL_Files { - idlflags += -GA + idlflags += -GA -as anonymous.idl + dif2.idl + valuetype.idl + } + + IDL_Files { + idlflags += -GA array_only.idl constants.idl - dif2.idl generic_object.idl keywords.idl @@ -70,7 +83,6 @@ project(*IDL): taoserver, messaging, gen_ostream { repo_id_mod.idl typedef.idl typecode.idl - valuetype.idl } } @@ -88,8 +100,12 @@ project(*DLL): taoidldefaults, taolib, messaging { anonymousA.cpp anonymousC.cpp anonymousS.cpp + anyunionC.cpp + anyunionS.cpp arrayC.cpp arrayS.cpp + array_anon_nestedC.cpp + array_anon_nestedS.cpp array_onlyA.cpp array_onlyC.cpp array_onlyS.cpp @@ -107,6 +123,8 @@ project(*DLL): taoidldefaults, taolib, messaging { Bug_2619_RegressionS.cpp Bug_3243_RegressionC.cpp Bug_3243_RegressionS.cpp + Bug_3312_RegressionC.cpp + Bug_3312_RegressionS.cpp Bug_3819_RegressionC.cpp Bug_3819_RegressionS.cpp Bug_3821_RegressionC.cpp @@ -218,10 +236,10 @@ project(*Main): taoserver, messaging, gen_ostream { Source_Files { main.cpp } - + Header_Files { } - + Inline_Files { } @@ -229,7 +247,7 @@ project(*Main): taoserver, messaging, gen_ostream { } } -project(*NDDS_IDL): ndds_ts_defaults { +project(*NDDS_IDL): ndds_cck_ts_defaults { custom_only=1 NDDSTypeSupport_Files { @@ -244,6 +262,64 @@ project(*NDDS_IDL): ndds_ts_defaults { Bug_2616_Regression.idl Bug_2619_Regression.idl Bug_3243_Regression.idl + Bug_3312_Regression.idl + Bug_3819_Regression.idl + Bug_3821_Regression.idl + constants.idl + dif2.idl + enum_in_struct.idl + full.idl + fwd.idl + generic_object.idl + gperf.idl + included.idl + including.idl + inherit.idl + interface.idl + keywords.idl + module.idl + nested_scope.idl + old_array.idl + old_constants.idl + old_sequence.idl + old_struct.idl + old_union.idl +// old_union2.idl + params.idl + pragma.idl + primtypes.idl + reopened_modules.idl + reopen_include1.idl + reopen_include2.idl + repo_id_mod.idl + sequence.idl + simple.idl + simple2.idl + struct.idl + typecode.idl + typedef.idl + typeprefix.idl + union.idl + valuetype.idl + } +} + +project(*CoreDX_IDL): coredx_ts_defaults { + custom_only=1 + + CoreDXTypeSupport_Files { + anonymous.idl + array.idl + array_only.idl + attribute.idl + Bug_2350_Regression.idl + Bug_2577_Regression.idl + Bug_2582_Regression.idl + Bug_2583_Regression.idl + Bug_2616_Regression.idl + Bug_2619_Regression.idl + Bug_3243_Regression.idl + Bug_3312_Regression.idl Bug_3819_Regression.idl Bug_3821_Regression.idl constants.idl @@ -333,6 +409,8 @@ project(*NDDS_Lib): taolib, messaging, gen_ostream, nddslib { Bug_3243_Regression.cxx Bug_3243_RegressionPlugin.cxx Bug_3243_RegressionSupport.cxx +// Bug_3312_RegressionPlugin.cxx +// Bug_3312_RegressionSupport.cxx Bug_3819_Regression.cxx Bug_3819_RegressionPlugin.cxx Bug_3819_RegressionSupport.cxx diff --git a/tests/IDL_Test/Makefile.am b/tests/IDL_Test/Makefile.am deleted file mode 100644 index 6745c1b473b..00000000000 --- a/tests/IDL_Test/Makefile.am +++ /dev/null @@ -1,1671 +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) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.IDL_Test_Main.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - arrayC.cpp \ - arrayC.h \ - arrayC.inl \ - arrayS.cpp \ - arrayS.h \ - arrayS.inl \ - arrayS_T.cpp \ - arrayS_T.h - -CLEANFILES += \ - array-stamp \ - arrayC.cpp \ - arrayC.h \ - arrayC.inl \ - arrayS.cpp \ - arrayS.h \ - arrayS.inl \ - arrayS_T.cpp \ - arrayS_T.h - -arrayC.cpp arrayC.h arrayC.inl arrayS.cpp arrayS.h arrayS.inl arrayS_T.cpp arrayS_T.h: array-stamp - -array-stamp: $(srcdir)/array.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/array.idl - @touch $@ - -BUILT_SOURCES += \ - Bug_2350_RegressionC.cpp \ - Bug_2350_RegressionC.h \ - Bug_2350_RegressionC.inl \ - Bug_2350_RegressionS.cpp \ - Bug_2350_RegressionS.h \ - Bug_2350_RegressionS.inl \ - Bug_2350_RegressionS_T.cpp \ - Bug_2350_RegressionS_T.h - -CLEANFILES += \ - Bug_2350_Regression-stamp \ - Bug_2350_RegressionC.cpp \ - Bug_2350_RegressionC.h \ - Bug_2350_RegressionC.inl \ - Bug_2350_RegressionS.cpp \ - Bug_2350_RegressionS.h \ - Bug_2350_RegressionS.inl \ - Bug_2350_RegressionS_T.cpp \ - Bug_2350_RegressionS_T.h - -Bug_2350_RegressionC.cpp Bug_2350_RegressionC.h Bug_2350_RegressionC.inl Bug_2350_RegressionS.cpp Bug_2350_RegressionS.h Bug_2350_RegressionS.inl Bug_2350_RegressionS_T.cpp Bug_2350_RegressionS_T.h: Bug_2350_Regression-stamp - -Bug_2350_Regression-stamp: $(srcdir)/Bug_2350_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2350_Regression.idl - @touch $@ - -BUILT_SOURCES += \ - Bug_2577_RegressionC.cpp \ - Bug_2577_RegressionC.h \ - Bug_2577_RegressionC.inl \ - Bug_2577_RegressionS.cpp \ - Bug_2577_RegressionS.h \ - Bug_2577_RegressionS.inl \ - Bug_2577_RegressionS_T.cpp \ - Bug_2577_RegressionS_T.h - -CLEANFILES += \ - Bug_2577_Regression-stamp \ - Bug_2577_RegressionC.cpp \ - Bug_2577_RegressionC.h \ - Bug_2577_RegressionC.inl \ - Bug_2577_RegressionS.cpp \ - Bug_2577_RegressionS.h \ - Bug_2577_RegressionS.inl \ - Bug_2577_RegressionS_T.cpp \ - Bug_2577_RegressionS_T.h - -Bug_2577_RegressionC.cpp Bug_2577_RegressionC.h Bug_2577_RegressionC.inl Bug_2577_RegressionS.cpp Bug_2577_RegressionS.h Bug_2577_RegressionS.inl Bug_2577_RegressionS_T.cpp Bug_2577_RegressionS_T.h: Bug_2577_Regression-stamp - -Bug_2577_Regression-stamp: $(srcdir)/Bug_2577_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2577_Regression.idl - @touch $@ - -BUILT_SOURCES += \ - Bug_2582_RegressionC.cpp \ - Bug_2582_RegressionC.h \ - Bug_2582_RegressionC.inl \ - Bug_2582_RegressionS.cpp \ - Bug_2582_RegressionS.h \ - Bug_2582_RegressionS.inl \ - Bug_2582_RegressionS_T.cpp \ - Bug_2582_RegressionS_T.h - -CLEANFILES += \ - Bug_2582_Regression-stamp \ - Bug_2582_RegressionC.cpp \ - Bug_2582_RegressionC.h \ - Bug_2582_RegressionC.inl \ - Bug_2582_RegressionS.cpp \ - Bug_2582_RegressionS.h \ - Bug_2582_RegressionS.inl \ - Bug_2582_RegressionS_T.cpp \ - Bug_2582_RegressionS_T.h - -Bug_2582_RegressionC.cpp Bug_2582_RegressionC.h Bug_2582_RegressionC.inl Bug_2582_RegressionS.cpp Bug_2582_RegressionS.h Bug_2582_RegressionS.inl Bug_2582_RegressionS_T.cpp Bug_2582_RegressionS_T.h: Bug_2582_Regression-stamp - -Bug_2582_Regression-stamp: $(srcdir)/Bug_2582_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2582_Regression.idl - @touch $@ - -BUILT_SOURCES += \ - Bug_2583_RegressionC.cpp \ - Bug_2583_RegressionC.h \ - Bug_2583_RegressionC.inl \ - Bug_2583_RegressionS.cpp \ - Bug_2583_RegressionS.h \ - Bug_2583_RegressionS.inl \ - Bug_2583_RegressionS_T.cpp \ - Bug_2583_RegressionS_T.h - -CLEANFILES += \ - Bug_2583_Regression-stamp \ - Bug_2583_RegressionC.cpp \ - Bug_2583_RegressionC.h \ - Bug_2583_RegressionC.inl \ - Bug_2583_RegressionS.cpp \ - Bug_2583_RegressionS.h \ - Bug_2583_RegressionS.inl \ - Bug_2583_RegressionS_T.cpp \ - Bug_2583_RegressionS_T.h - -Bug_2583_RegressionC.cpp Bug_2583_RegressionC.h Bug_2583_RegressionC.inl Bug_2583_RegressionS.cpp Bug_2583_RegressionS.h Bug_2583_RegressionS.inl Bug_2583_RegressionS_T.cpp Bug_2583_RegressionS_T.h: Bug_2583_Regression-stamp - -Bug_2583_Regression-stamp: $(srcdir)/Bug_2583_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2583_Regression.idl - @touch $@ - -BUILT_SOURCES += \ - Bug_2616_RegressionC.cpp \ - Bug_2616_RegressionC.h \ - Bug_2616_RegressionC.inl \ - Bug_2616_RegressionS.cpp \ - Bug_2616_RegressionS.h \ - Bug_2616_RegressionS.inl \ - Bug_2616_RegressionS_T.cpp \ - Bug_2616_RegressionS_T.h - -CLEANFILES += \ - Bug_2616_Regression-stamp \ - Bug_2616_RegressionC.cpp \ - Bug_2616_RegressionC.h \ - Bug_2616_RegressionC.inl \ - Bug_2616_RegressionS.cpp \ - Bug_2616_RegressionS.h \ - Bug_2616_RegressionS.inl \ - Bug_2616_RegressionS_T.cpp \ - Bug_2616_RegressionS_T.h - -Bug_2616_RegressionC.cpp Bug_2616_RegressionC.h Bug_2616_RegressionC.inl Bug_2616_RegressionS.cpp Bug_2616_RegressionS.h Bug_2616_RegressionS.inl Bug_2616_RegressionS_T.cpp Bug_2616_RegressionS_T.h: Bug_2616_Regression-stamp - -Bug_2616_Regression-stamp: $(srcdir)/Bug_2616_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2616_Regression.idl - @touch $@ - -BUILT_SOURCES += \ - Bug_2619_RegressionC.cpp \ - Bug_2619_RegressionC.h \ - Bug_2619_RegressionC.inl \ - Bug_2619_RegressionS.cpp \ - Bug_2619_RegressionS.h \ - Bug_2619_RegressionS.inl \ - Bug_2619_RegressionS_T.cpp \ - Bug_2619_RegressionS_T.h - -CLEANFILES += \ - Bug_2619_Regression-stamp \ - Bug_2619_RegressionC.cpp \ - Bug_2619_RegressionC.h \ - Bug_2619_RegressionC.inl \ - Bug_2619_RegressionS.cpp \ - Bug_2619_RegressionS.h \ - Bug_2619_RegressionS.inl \ - Bug_2619_RegressionS_T.cpp \ - Bug_2619_RegressionS_T.h - -Bug_2619_RegressionC.cpp Bug_2619_RegressionC.h Bug_2619_RegressionC.inl Bug_2619_RegressionS.cpp Bug_2619_RegressionS.h Bug_2619_RegressionS.inl Bug_2619_RegressionS_T.cpp Bug_2619_RegressionS_T.h: Bug_2619_Regression-stamp - -Bug_2619_Regression-stamp: $(srcdir)/Bug_2619_Regression.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/Bug_2619_Regression.idl - @touch $@ - -BUILT_SOURCES += \ - enum_in_structC.cpp \ - enum_in_structC.h \ - enum_in_structC.inl \ - enum_in_structS.cpp \ - enum_in_structS.h \ - enum_in_structS.inl \ - enum_in_structS_T.cpp \ - enum_in_structS_T.h - -CLEANFILES += \ - enum_in_struct-stamp \ - enum_in_structC.cpp \ - enum_in_structC.h \ - enum_in_structC.inl \ - enum_in_structS.cpp \ - enum_in_structS.h \ - enum_in_structS.inl \ - enum_in_structS_T.cpp \ - enum_in_structS_T.h - -enum_in_structC.cpp enum_in_structC.h enum_in_structC.inl enum_in_structS.cpp enum_in_structS.h enum_in_structS.inl enum_in_structS_T.cpp enum_in_structS_T.h: enum_in_struct-stamp - -enum_in_struct-stamp: $(srcdir)/enum_in_struct.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/enum_in_struct.idl - @touch $@ - -BUILT_SOURCES += \ - fullC.cpp \ - fullC.h \ - fullC.inl \ - fullS.cpp \ - fullS.h \ - fullS.inl \ - fullS_T.cpp \ - fullS_T.h - -CLEANFILES += \ - full-stamp \ - fullC.cpp \ - fullC.h \ - fullC.inl \ - fullS.cpp \ - fullS.h \ - fullS.inl \ - fullS_T.cpp \ - fullS_T.h - -fullC.cpp fullC.h fullC.inl fullS.cpp fullS.h fullS.inl fullS_T.cpp fullS_T.h: full-stamp - -full-stamp: $(srcdir)/full.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/full.idl - @touch $@ - -BUILT_SOURCES += \ - fwdC.cpp \ - fwdC.h \ - fwdC.inl \ - fwdS.cpp \ - fwdS.h \ - fwdS.inl \ - fwdS_T.cpp \ - fwdS_T.h - -CLEANFILES += \ - fwd-stamp \ - fwdC.cpp \ - fwdC.h \ - fwdC.inl \ - fwdS.cpp \ - fwdS.h \ - fwdS.inl \ - fwdS_T.cpp \ - fwdS_T.h - -fwdC.cpp fwdC.h fwdC.inl fwdS.cpp fwdS.h fwdS.inl fwdS_T.cpp fwdS_T.h: fwd-stamp - -fwd-stamp: $(srcdir)/fwd.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/fwd.idl - @touch $@ - -BUILT_SOURCES += \ - gperfC.cpp \ - gperfC.h \ - gperfC.inl \ - gperfS.cpp \ - gperfS.h \ - gperfS.inl \ - gperfS_T.cpp \ - gperfS_T.h - -CLEANFILES += \ - gperf-stamp \ - gperfC.cpp \ - gperfC.h \ - gperfC.inl \ - gperfS.cpp \ - gperfS.h \ - gperfS.inl \ - gperfS_T.cpp \ - gperfS_T.h - -gperfC.cpp gperfC.h gperfC.inl gperfS.cpp gperfS.h gperfS.inl gperfS_T.cpp gperfS_T.h: gperf-stamp - -gperf-stamp: $(srcdir)/gperf.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/gperf.idl - @touch $@ - -BUILT_SOURCES += \ - includingC.cpp \ - includingC.h \ - includingC.inl \ - includingS.cpp \ - includingS.h \ - includingS.inl \ - includingS_T.cpp \ - includingS_T.h - -CLEANFILES += \ - including-stamp \ - includingC.cpp \ - includingC.h \ - includingC.inl \ - includingS.cpp \ - includingS.h \ - includingS.inl \ - includingS_T.cpp \ - includingS_T.h - -includingC.cpp includingC.h includingC.inl includingS.cpp includingS.h includingS.inl includingS_T.cpp includingS_T.h: including-stamp - -including-stamp: $(srcdir)/including.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/including.idl - @touch $@ - -BUILT_SOURCES += \ - interfaceC.cpp \ - interfaceC.h \ - interfaceC.inl \ - interfaceS.cpp \ - interfaceS.h \ - interfaceS.inl \ - interfaceS_T.cpp \ - interfaceS_T.h - -CLEANFILES += \ - interface-stamp \ - interfaceC.cpp \ - interfaceC.h \ - interfaceC.inl \ - interfaceS.cpp \ - interfaceS.h \ - interfaceS.inl \ - interfaceS_T.cpp \ - interfaceS_T.h - -interfaceC.cpp interfaceC.h interfaceC.inl interfaceS.cpp interfaceS.h interfaceS.inl interfaceS_T.cpp interfaceS_T.h: interface-stamp - -interface-stamp: $(srcdir)/interface.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/interface.idl - @touch $@ - -BUILT_SOURCES += \ - includedC.cpp \ - includedC.h \ - includedC.inl \ - includedS.cpp \ - includedS.h \ - includedS.inl \ - includedS_T.cpp \ - includedS_T.h - -CLEANFILES += \ - included-stamp \ - includedC.cpp \ - includedC.h \ - includedC.inl \ - includedS.cpp \ - includedS.h \ - includedS.inl \ - includedS_T.cpp \ - includedS_T.h - -includedC.cpp includedC.h includedC.inl includedS.cpp includedS.h includedS.inl includedS_T.cpp includedS_T.h: included-stamp - -included-stamp: $(srcdir)/included.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/included.idl - @touch $@ - -BUILT_SOURCES += \ - nested_scopeC.cpp \ - nested_scopeC.h \ - nested_scopeC.inl \ - nested_scopeS.cpp \ - nested_scopeS.h \ - nested_scopeS.inl \ - nested_scopeS_T.cpp \ - nested_scopeS_T.h - -CLEANFILES += \ - nested_scope-stamp \ - nested_scopeC.cpp \ - nested_scopeC.h \ - nested_scopeC.inl \ - nested_scopeS.cpp \ - nested_scopeS.h \ - nested_scopeS.inl \ - nested_scopeS_T.cpp \ - nested_scopeS_T.h - -nested_scopeC.cpp nested_scopeC.h nested_scopeC.inl nested_scopeS.cpp nested_scopeS.h nested_scopeS.inl nested_scopeS_T.cpp nested_scopeS_T.h: nested_scope-stamp - -nested_scope-stamp: $(srcdir)/nested_scope.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/nested_scope.idl - @touch $@ - -BUILT_SOURCES += \ - old_arrayC.cpp \ - old_arrayC.h \ - old_arrayC.inl \ - old_arrayS.cpp \ - old_arrayS.h \ - old_arrayS.inl \ - old_arrayS_T.cpp \ - old_arrayS_T.h - -CLEANFILES += \ - old_array-stamp \ - old_arrayC.cpp \ - old_arrayC.h \ - old_arrayC.inl \ - old_arrayS.cpp \ - old_arrayS.h \ - old_arrayS.inl \ - old_arrayS_T.cpp \ - old_arrayS_T.h - -old_arrayC.cpp old_arrayC.h old_arrayC.inl old_arrayS.cpp old_arrayS.h old_arrayS.inl old_arrayS_T.cpp old_arrayS_T.h: old_array-stamp - -old_array-stamp: $(srcdir)/old_array.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_array.idl - @touch $@ - -BUILT_SOURCES += \ - old_constantsC.cpp \ - old_constantsC.h \ - old_constantsC.inl \ - old_constantsS.cpp \ - old_constantsS.h \ - old_constantsS.inl \ - old_constantsS_T.cpp \ - old_constantsS_T.h - -CLEANFILES += \ - old_constants-stamp \ - old_constantsC.cpp \ - old_constantsC.h \ - old_constantsC.inl \ - old_constantsS.cpp \ - old_constantsS.h \ - old_constantsS.inl \ - old_constantsS_T.cpp \ - old_constantsS_T.h - -old_constantsC.cpp old_constantsC.h old_constantsC.inl old_constantsS.cpp old_constantsS.h old_constantsS.inl old_constantsS_T.cpp old_constantsS_T.h: old_constants-stamp - -old_constants-stamp: $(srcdir)/old_constants.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_constants.idl - @touch $@ - -BUILT_SOURCES += \ - old_sequenceC.cpp \ - old_sequenceC.h \ - old_sequenceC.inl \ - old_sequenceS.cpp \ - old_sequenceS.h \ - old_sequenceS.inl \ - old_sequenceS_T.cpp \ - old_sequenceS_T.h - -CLEANFILES += \ - old_sequence-stamp \ - old_sequenceC.cpp \ - old_sequenceC.h \ - old_sequenceC.inl \ - old_sequenceS.cpp \ - old_sequenceS.h \ - old_sequenceS.inl \ - old_sequenceS_T.cpp \ - old_sequenceS_T.h - -old_sequenceC.cpp old_sequenceC.h old_sequenceC.inl old_sequenceS.cpp old_sequenceS.h old_sequenceS.inl old_sequenceS_T.cpp old_sequenceS_T.h: old_sequence-stamp - -old_sequence-stamp: $(srcdir)/old_sequence.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_sequence.idl - @touch $@ - -BUILT_SOURCES += \ - simpleC.cpp \ - simpleC.h \ - simpleC.inl \ - simpleS.cpp \ - simpleS.h \ - simpleS.inl \ - simpleS_T.cpp \ - simpleS_T.h - -CLEANFILES += \ - simple-stamp \ - simpleC.cpp \ - simpleC.h \ - simpleC.inl \ - simpleS.cpp \ - simpleS.h \ - simpleS.inl \ - simpleS_T.cpp \ - simpleS_T.h - -simpleC.cpp simpleC.h simpleC.inl simpleS.cpp simpleS.h simpleS.inl simpleS_T.cpp simpleS_T.h: simple-stamp - -simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/simple.idl - @touch $@ - -BUILT_SOURCES += \ - simple2C.cpp \ - simple2C.h \ - simple2C.inl \ - simple2S.cpp \ - simple2S.h \ - simple2S.inl \ - simple2S_T.cpp \ - simple2S_T.h - -CLEANFILES += \ - simple2-stamp \ - simple2C.cpp \ - simple2C.h \ - simple2C.inl \ - simple2S.cpp \ - simple2S.h \ - simple2S.inl \ - simple2S_T.cpp \ - simple2S_T.h - -simple2C.cpp simple2C.h simple2C.inl simple2S.cpp simple2S.h simple2S.inl simple2S_T.cpp simple2S_T.h: simple2-stamp - -simple2-stamp: $(srcdir)/simple2.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/simple2.idl - @touch $@ - -BUILT_SOURCES += \ - old_structC.cpp \ - old_structC.h \ - old_structC.inl \ - old_structS.cpp \ - old_structS.h \ - old_structS.inl \ - old_structS_T.cpp \ - old_structS_T.h - -CLEANFILES += \ - old_struct-stamp \ - old_structC.cpp \ - old_structC.h \ - old_structC.inl \ - old_structS.cpp \ - old_structS.h \ - old_structS.inl \ - old_structS_T.cpp \ - old_structS_T.h - -old_structC.cpp old_structC.h old_structC.inl old_structS.cpp old_structS.h old_structS.inl old_structS_T.cpp old_structS_T.h: old_struct-stamp - -old_struct-stamp: $(srcdir)/old_struct.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_struct.idl - @touch $@ - -BUILT_SOURCES += \ - old_unionC.cpp \ - old_unionC.h \ - old_unionC.inl \ - old_unionS.cpp \ - old_unionS.h \ - old_unionS.inl \ - old_unionS_T.cpp \ - old_unionS_T.h - -CLEANFILES += \ - old_union-stamp \ - old_unionC.cpp \ - old_unionC.h \ - old_unionC.inl \ - old_unionS.cpp \ - old_unionS.h \ - old_unionS.inl \ - old_unionS_T.cpp \ - old_unionS_T.h - -old_unionC.cpp old_unionC.h old_unionC.inl old_unionS.cpp old_unionS.h old_unionS.inl old_unionS_T.cpp old_unionS_T.h: old_union-stamp - -old_union-stamp: $(srcdir)/old_union.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_union.idl - @touch $@ - -BUILT_SOURCES += \ - old_union2C.cpp \ - old_union2C.h \ - old_union2C.inl \ - old_union2S.cpp \ - old_union2S.h \ - old_union2S.inl \ - old_union2S_T.cpp \ - old_union2S_T.h - -CLEANFILES += \ - old_union2-stamp \ - old_union2C.cpp \ - old_union2C.h \ - old_union2C.inl \ - old_union2S.cpp \ - old_union2S.h \ - old_union2S.inl \ - old_union2S_T.cpp \ - old_union2S_T.h - -old_union2C.cpp old_union2C.h old_union2C.inl old_union2S.cpp old_union2S.h old_union2S.inl old_union2S_T.cpp old_union2S_T.h: old_union2-stamp - -old_union2-stamp: $(srcdir)/old_union2.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/old_union2.idl - @touch $@ - -BUILT_SOURCES += \ - paramsC.cpp \ - paramsC.h \ - paramsC.inl \ - paramsS.cpp \ - paramsS.h \ - paramsS.inl \ - paramsS_T.cpp \ - paramsS_T.h - -CLEANFILES += \ - params-stamp \ - paramsC.cpp \ - paramsC.h \ - paramsC.inl \ - paramsS.cpp \ - paramsS.h \ - paramsS.inl \ - paramsS_T.cpp \ - paramsS_T.h - -paramsC.cpp paramsC.h paramsC.inl paramsS.cpp paramsS.h paramsS.inl paramsS_T.cpp paramsS_T.h: params-stamp - -params-stamp: $(srcdir)/params.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/params.idl - @touch $@ - -BUILT_SOURCES += \ - reopened_modulesC.cpp \ - reopened_modulesC.h \ - reopened_modulesC.inl \ - reopened_modulesS.cpp \ - reopened_modulesS.h \ - reopened_modulesS.inl \ - reopened_modulesS_T.cpp \ - reopened_modulesS_T.h - -CLEANFILES += \ - reopened_modules-stamp \ - reopened_modulesC.cpp \ - reopened_modulesC.h \ - reopened_modulesC.inl \ - reopened_modulesS.cpp \ - reopened_modulesS.h \ - reopened_modulesS.inl \ - reopened_modulesS_T.cpp \ - reopened_modulesS_T.h - -reopened_modulesC.cpp reopened_modulesC.h reopened_modulesC.inl reopened_modulesS.cpp reopened_modulesS.h reopened_modulesS.inl reopened_modulesS_T.cpp reopened_modulesS_T.h: reopened_modules-stamp - -reopened_modules-stamp: $(srcdir)/reopened_modules.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopened_modules.idl - @touch $@ - -BUILT_SOURCES += \ - sequenceC.cpp \ - sequenceC.h \ - sequenceC.inl \ - sequenceS.cpp \ - sequenceS.h \ - sequenceS.inl \ - sequenceS_T.cpp \ - sequenceS_T.h - -CLEANFILES += \ - sequence-stamp \ - sequenceC.cpp \ - sequenceC.h \ - sequenceC.inl \ - sequenceS.cpp \ - sequenceS.h \ - sequenceS.inl \ - sequenceS_T.cpp \ - sequenceS_T.h - -sequenceC.cpp sequenceC.h sequenceC.inl sequenceS.cpp sequenceS.h sequenceS.inl sequenceS_T.cpp sequenceS_T.h: sequence-stamp - -sequence-stamp: $(srcdir)/sequence.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/sequence.idl - @touch $@ - -BUILT_SOURCES += \ - structC.cpp \ - structC.h \ - structC.inl \ - structS.cpp \ - structS.h \ - structS.inl \ - structS_T.cpp \ - structS_T.h - -CLEANFILES += \ - struct-stamp \ - structC.cpp \ - structC.h \ - structC.inl \ - structS.cpp \ - structS.h \ - structS.inl \ - structS_T.cpp \ - structS_T.h - -structC.cpp structC.h structC.inl structS.cpp structS.h structS.inl structS_T.cpp structS_T.h: struct-stamp - -struct-stamp: $(srcdir)/struct.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/struct.idl - @touch $@ - -BUILT_SOURCES += \ - reopen_include1C.cpp \ - reopen_include1C.h \ - reopen_include1C.inl \ - reopen_include1S.cpp \ - reopen_include1S.h \ - reopen_include1S.inl \ - reopen_include1S_T.cpp \ - reopen_include1S_T.h - -CLEANFILES += \ - reopen_include1-stamp \ - reopen_include1C.cpp \ - reopen_include1C.h \ - reopen_include1C.inl \ - reopen_include1S.cpp \ - reopen_include1S.h \ - reopen_include1S.inl \ - reopen_include1S_T.cpp \ - reopen_include1S_T.h - -reopen_include1C.cpp reopen_include1C.h reopen_include1C.inl reopen_include1S.cpp reopen_include1S.h reopen_include1S.inl reopen_include1S_T.cpp reopen_include1S_T.h: reopen_include1-stamp - -reopen_include1-stamp: $(srcdir)/reopen_include1.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopen_include1.idl - @touch $@ - -BUILT_SOURCES += \ - reopen_include2C.cpp \ - reopen_include2C.h \ - reopen_include2C.inl \ - reopen_include2S.cpp \ - reopen_include2S.h \ - reopen_include2S.inl \ - reopen_include2S_T.cpp \ - reopen_include2S_T.h - -CLEANFILES += \ - reopen_include2-stamp \ - reopen_include2C.cpp \ - reopen_include2C.h \ - reopen_include2C.inl \ - reopen_include2S.cpp \ - reopen_include2S.h \ - reopen_include2S.inl \ - reopen_include2S_T.cpp \ - reopen_include2S_T.h - -reopen_include2C.cpp reopen_include2C.h reopen_include2C.inl reopen_include2S.cpp reopen_include2S.h reopen_include2S.inl reopen_include2S_T.cpp reopen_include2S_T.h: reopen_include2-stamp - -reopen_include2-stamp: $(srcdir)/reopen_include2.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/reopen_include2.idl - @touch $@ - -BUILT_SOURCES += \ - typeprefixC.cpp \ - typeprefixC.h \ - typeprefixC.inl \ - typeprefixS.cpp \ - typeprefixS.h \ - typeprefixS.inl \ - typeprefixS_T.cpp \ - typeprefixS_T.h - -CLEANFILES += \ - typeprefix-stamp \ - typeprefixC.cpp \ - typeprefixC.h \ - typeprefixC.inl \ - typeprefixS.cpp \ - typeprefixS.h \ - typeprefixS.inl \ - typeprefixS_T.cpp \ - typeprefixS_T.h - -typeprefixC.cpp typeprefixC.h typeprefixC.inl typeprefixS.cpp typeprefixS.h typeprefixS.inl typeprefixS_T.cpp typeprefixS_T.h: typeprefix-stamp - -typeprefix-stamp: $(srcdir)/typeprefix.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/typeprefix.idl - @touch $@ - -BUILT_SOURCES += \ - unionC.cpp \ - unionC.h \ - unionC.inl \ - unionS.cpp \ - unionS.h \ - unionS.inl \ - unionS_T.cpp \ - unionS_T.h - -CLEANFILES += \ - union-stamp \ - unionC.cpp \ - unionC.h \ - unionC.inl \ - unionS.cpp \ - unionS.h \ - unionS.inl \ - unionS_T.cpp \ - unionS_T.h - -unionC.cpp unionC.h unionC.inl unionS.cpp unionS.h unionS.inl unionS_T.cpp unionS_T.h: union-stamp - -union-stamp: $(srcdir)/union.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT $(srcdir)/union.idl - @touch $@ - -BUILT_SOURCES += \ - anonymousA.cpp \ - anonymousA.h \ - anonymousC.cpp \ - anonymousC.h \ - anonymousC.inl \ - anonymousS.cpp \ - anonymousS.h \ - anonymousS.inl \ - anonymousS_T.cpp \ - anonymousS_T.h - -CLEANFILES += \ - anonymous-stamp \ - anonymousA.cpp \ - anonymousA.h \ - anonymousC.cpp \ - anonymousC.h \ - anonymousC.inl \ - anonymousS.cpp \ - anonymousS.h \ - anonymousS.inl \ - anonymousS_T.cpp \ - anonymousS_T.h - -anonymousA.cpp anonymousA.h anonymousC.cpp anonymousC.h anonymousC.inl anonymousS.cpp anonymousS.h anonymousS.inl anonymousS_T.cpp anonymousS_T.h: anonymous-stamp - -anonymous-stamp: $(srcdir)/anonymous.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/anonymous.idl - @touch $@ - -BUILT_SOURCES += \ - array_onlyA.cpp \ - array_onlyA.h \ - array_onlyC.cpp \ - array_onlyC.h \ - array_onlyC.inl \ - array_onlyS.cpp \ - array_onlyS.h \ - array_onlyS.inl \ - array_onlyS_T.cpp \ - array_onlyS_T.h - -CLEANFILES += \ - array_only-stamp \ - array_onlyA.cpp \ - array_onlyA.h \ - array_onlyC.cpp \ - array_onlyC.h \ - array_onlyC.inl \ - array_onlyS.cpp \ - array_onlyS.h \ - array_onlyS.inl \ - array_onlyS_T.cpp \ - array_onlyS_T.h - -array_onlyA.cpp array_onlyA.h array_onlyC.cpp array_onlyC.h array_onlyC.inl array_onlyS.cpp array_onlyS.h array_onlyS.inl array_onlyS_T.cpp array_onlyS_T.h: array_only-stamp - -array_only-stamp: $(srcdir)/array_only.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/array_only.idl - @touch $@ - -BUILT_SOURCES += \ - constantsA.cpp \ - constantsA.h \ - constantsC.cpp \ - constantsC.h \ - constantsC.inl \ - constantsS.cpp \ - constantsS.h \ - constantsS.inl \ - constantsS_T.cpp \ - constantsS_T.h - -CLEANFILES += \ - constants-stamp \ - constantsA.cpp \ - constantsA.h \ - constantsC.cpp \ - constantsC.h \ - constantsC.inl \ - constantsS.cpp \ - constantsS.h \ - constantsS.inl \ - constantsS_T.cpp \ - constantsS_T.h - -constantsA.cpp constantsA.h constantsC.cpp constantsC.h constantsC.inl constantsS.cpp constantsS.h constantsS.inl constantsS_T.cpp constantsS_T.h: constants-stamp - -constants-stamp: $(srcdir)/constants.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/constants.idl - @touch $@ - -BUILT_SOURCES += \ - generic_objectA.cpp \ - generic_objectA.h \ - generic_objectC.cpp \ - generic_objectC.h \ - generic_objectC.inl \ - generic_objectS.cpp \ - generic_objectS.h \ - generic_objectS.inl \ - generic_objectS_T.cpp \ - generic_objectS_T.h - -CLEANFILES += \ - generic_object-stamp \ - generic_objectA.cpp \ - generic_objectA.h \ - generic_objectC.cpp \ - generic_objectC.h \ - generic_objectC.inl \ - generic_objectS.cpp \ - generic_objectS.h \ - generic_objectS.inl \ - generic_objectS_T.cpp \ - generic_objectS_T.h - -generic_objectA.cpp generic_objectA.h generic_objectC.cpp generic_objectC.h generic_objectC.inl generic_objectS.cpp generic_objectS.h generic_objectS.inl generic_objectS_T.cpp generic_objectS_T.h: generic_object-stamp - -generic_object-stamp: $(srcdir)/generic_object.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/generic_object.idl - @touch $@ - -BUILT_SOURCES += \ - keywordsA.cpp \ - keywordsA.h \ - keywordsC.cpp \ - keywordsC.h \ - keywordsC.inl \ - keywordsS.cpp \ - keywordsS.h \ - keywordsS.inl \ - keywordsS_T.cpp \ - keywordsS_T.h - -CLEANFILES += \ - keywords-stamp \ - keywordsA.cpp \ - keywordsA.h \ - keywordsC.cpp \ - keywordsC.h \ - keywordsC.inl \ - keywordsS.cpp \ - keywordsS.h \ - keywordsS.inl \ - keywordsS_T.cpp \ - keywordsS_T.h - -keywordsA.cpp keywordsA.h keywordsC.cpp keywordsC.h keywordsC.inl keywordsS.cpp keywordsS.h keywordsS.inl keywordsS_T.cpp keywordsS_T.h: keywords-stamp - -keywords-stamp: $(srcdir)/keywords.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/keywords.idl - @touch $@ - -BUILT_SOURCES += \ - dif2A.cpp \ - dif2A.h \ - dif2C.cpp \ - dif2C.h \ - dif2C.inl \ - dif2S.cpp \ - dif2S.h \ - dif2S.inl \ - dif2S_T.cpp \ - dif2S_T.h - -CLEANFILES += \ - dif2-stamp \ - dif2A.cpp \ - dif2A.h \ - dif2C.cpp \ - dif2C.h \ - dif2C.inl \ - dif2S.cpp \ - dif2S.h \ - dif2S.inl \ - dif2S_T.cpp \ - dif2S_T.h - -dif2A.cpp dif2A.h dif2C.cpp dif2C.h dif2C.inl dif2S.cpp dif2S.h dif2S.inl dif2S_T.cpp dif2S_T.h: dif2-stamp - -dif2-stamp: $(srcdir)/dif2.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/dif2.idl - @touch $@ - -BUILT_SOURCES += \ - inheritA.cpp \ - inheritA.h \ - inheritC.cpp \ - inheritC.h \ - inheritC.inl \ - inheritS.cpp \ - inheritS.h \ - inheritS.inl \ - inheritS_T.cpp \ - inheritS_T.h - -CLEANFILES += \ - inherit-stamp \ - inheritA.cpp \ - inheritA.h \ - inheritC.cpp \ - inheritC.h \ - inheritC.inl \ - inheritS.cpp \ - inheritS.h \ - inheritS.inl \ - inheritS_T.cpp \ - inheritS_T.h - -inheritA.cpp inheritA.h inheritC.cpp inheritC.h inheritC.inl inheritS.cpp inheritS.h inheritS.inl inheritS_T.cpp inheritS_T.h: inherit-stamp - -inherit-stamp: $(srcdir)/inherit.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/inherit.idl - @touch $@ - -BUILT_SOURCES += \ - moduleA.cpp \ - moduleA.h \ - moduleC.cpp \ - moduleC.h \ - moduleC.inl \ - moduleS.cpp \ - moduleS.h \ - moduleS.inl \ - moduleS_T.cpp \ - moduleS_T.h - -CLEANFILES += \ - module-stamp \ - moduleA.cpp \ - moduleA.h \ - moduleC.cpp \ - moduleC.h \ - moduleC.inl \ - moduleS.cpp \ - moduleS.h \ - moduleS.inl \ - moduleS_T.cpp \ - moduleS_T.h - -moduleA.cpp moduleA.h moduleC.cpp moduleC.h moduleC.inl moduleS.cpp moduleS.h moduleS.inl moduleS_T.cpp moduleS_T.h: module-stamp - -module-stamp: $(srcdir)/module.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/module.idl - @touch $@ - -BUILT_SOURCES += \ - primtypesA.cpp \ - primtypesA.h \ - primtypesC.cpp \ - primtypesC.h \ - primtypesC.inl \ - primtypesS.cpp \ - primtypesS.h \ - primtypesS.inl \ - primtypesS_T.cpp \ - primtypesS_T.h - -CLEANFILES += \ - primtypes-stamp \ - primtypesA.cpp \ - primtypesA.h \ - primtypesC.cpp \ - primtypesC.h \ - primtypesC.inl \ - primtypesS.cpp \ - primtypesS.h \ - primtypesS.inl \ - primtypesS_T.cpp \ - primtypesS_T.h - -primtypesA.cpp primtypesA.h primtypesC.cpp primtypesC.h primtypesC.inl primtypesS.cpp primtypesS.h primtypesS.inl primtypesS_T.cpp primtypesS_T.h: primtypes-stamp - -primtypes-stamp: $(srcdir)/primtypes.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/primtypes.idl - @touch $@ - -BUILT_SOURCES += \ - pragmaA.cpp \ - pragmaA.h \ - pragmaC.cpp \ - pragmaC.h \ - pragmaC.inl \ - pragmaS.cpp \ - pragmaS.h \ - pragmaS.inl \ - pragmaS_T.cpp \ - pragmaS_T.h - -CLEANFILES += \ - pragma-stamp \ - pragmaA.cpp \ - pragmaA.h \ - pragmaC.cpp \ - pragmaC.h \ - pragmaC.inl \ - pragmaS.cpp \ - pragmaS.h \ - pragmaS.inl \ - pragmaS_T.cpp \ - pragmaS_T.h - -pragmaA.cpp pragmaA.h pragmaC.cpp pragmaC.h pragmaC.inl pragmaS.cpp pragmaS.h pragmaS.inl pragmaS_T.cpp pragmaS_T.h: pragma-stamp - -pragma-stamp: $(srcdir)/pragma.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/pragma.idl - @touch $@ - -BUILT_SOURCES += \ - repo_id_modA.cpp \ - repo_id_modA.h \ - repo_id_modC.cpp \ - repo_id_modC.h \ - repo_id_modC.inl \ - repo_id_modS.cpp \ - repo_id_modS.h \ - repo_id_modS.inl \ - repo_id_modS_T.cpp \ - repo_id_modS_T.h - -CLEANFILES += \ - repo_id_mod-stamp \ - repo_id_modA.cpp \ - repo_id_modA.h \ - repo_id_modC.cpp \ - repo_id_modC.h \ - repo_id_modC.inl \ - repo_id_modS.cpp \ - repo_id_modS.h \ - repo_id_modS.inl \ - repo_id_modS_T.cpp \ - repo_id_modS_T.h - -repo_id_modA.cpp repo_id_modA.h repo_id_modC.cpp repo_id_modC.h repo_id_modC.inl repo_id_modS.cpp repo_id_modS.h repo_id_modS.inl repo_id_modS_T.cpp repo_id_modS_T.h: repo_id_mod-stamp - -repo_id_mod-stamp: $(srcdir)/repo_id_mod.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/repo_id_mod.idl - @touch $@ - -BUILT_SOURCES += \ - typedefA.cpp \ - typedefA.h \ - typedefC.cpp \ - typedefC.h \ - typedefC.inl \ - typedefS.cpp \ - typedefS.h \ - typedefS.inl \ - typedefS_T.cpp \ - typedefS_T.h - -CLEANFILES += \ - typedef-stamp \ - typedefA.cpp \ - typedefA.h \ - typedefC.cpp \ - typedefC.h \ - typedefC.inl \ - typedefS.cpp \ - typedefS.h \ - typedefS.inl \ - typedefS_T.cpp \ - typedefS_T.h - -typedefA.cpp typedefA.h typedefC.cpp typedefC.h typedefC.inl typedefS.cpp typedefS.h typedefS.inl typedefS_T.cpp typedefS_T.h: typedef-stamp - -typedef-stamp: $(srcdir)/typedef.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/typedef.idl - @touch $@ - -BUILT_SOURCES += \ - typecodeA.cpp \ - typecodeA.h \ - typecodeC.cpp \ - typecodeC.h \ - typecodeC.inl \ - typecodeS.cpp \ - typecodeS.h \ - typecodeS.inl \ - typecodeS_T.cpp \ - typecodeS_T.h - -CLEANFILES += \ - typecode-stamp \ - typecodeA.cpp \ - typecodeA.h \ - typecodeC.cpp \ - typecodeC.h \ - typecodeC.inl \ - typecodeS.cpp \ - typecodeS.h \ - typecodeS.inl \ - typecodeS_T.cpp \ - typecodeS_T.h - -typecodeA.cpp typecodeA.h typecodeC.cpp typecodeC.h typecodeC.inl typecodeS.cpp typecodeS.h typecodeS.inl typecodeS_T.cpp typecodeS_T.h: typecode-stamp - -typecode-stamp: $(srcdir)/typecode.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/typecode.idl - @touch $@ - -BUILT_SOURCES += \ - valuetypeA.cpp \ - valuetypeA.h \ - valuetypeC.cpp \ - valuetypeC.h \ - valuetypeC.inl \ - valuetypeS.cpp \ - valuetypeS.h \ - valuetypeS.inl \ - valuetypeS_T.cpp \ - valuetypeS_T.h - -CLEANFILES += \ - valuetype-stamp \ - valuetypeA.cpp \ - valuetypeA.h \ - valuetypeC.cpp \ - valuetypeC.h \ - valuetypeC.inl \ - valuetypeS.cpp \ - valuetypeS.h \ - valuetypeS.inl \ - valuetypeS_T.cpp \ - valuetypeS_T.h - -valuetypeA.cpp valuetypeA.h valuetypeC.cpp valuetypeC.h valuetypeC.inl valuetypeS.cpp valuetypeS.h valuetypeS.inl valuetypeS_T.cpp valuetypeS_T.h: valuetype-stamp - -valuetype-stamp: $(srcdir)/valuetype.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC -GH -Gd -GT -GA $(srcdir)/valuetype.idl - @touch $@ - -noinst_PROGRAMS = main - -main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -main_SOURCES = \ - Bug_2350_RegressionC.cpp \ - Bug_2350_RegressionS.cpp \ - Bug_2577_RegressionC.cpp \ - Bug_2577_RegressionS.cpp \ - Bug_2582_RegressionC.cpp \ - Bug_2582_RegressionS.cpp \ - Bug_2583_RegressionC.cpp \ - Bug_2583_RegressionS.cpp \ - Bug_2616_RegressionC.cpp \ - Bug_2616_RegressionS.cpp \ - Bug_2619_RegressionC.cpp \ - Bug_2619_RegressionS.cpp \ - anonymousA.cpp \ - anonymousC.cpp \ - anonymousS.cpp \ - arrayC.cpp \ - arrayS.cpp \ - array_onlyA.cpp \ - array_onlyC.cpp \ - array_onlyS.cpp \ - constantsA.cpp \ - constantsC.cpp \ - constantsS.cpp \ - dif2A.cpp \ - dif2C.cpp \ - dif2S.cpp \ - enum_in_structC.cpp \ - enum_in_structS.cpp \ - fullC.cpp \ - fullS.cpp \ - fwdC.cpp \ - fwdS.cpp \ - generic_objectA.cpp \ - generic_objectC.cpp \ - generic_objectS.cpp \ - gperfC.cpp \ - gperfS.cpp \ - includedC.cpp \ - includedS.cpp \ - includingC.cpp \ - includingS.cpp \ - inheritA.cpp \ - inheritC.cpp \ - inheritS.cpp \ - interfaceC.cpp \ - interfaceS.cpp \ - keywordsA.cpp \ - keywordsC.cpp \ - keywordsS.cpp \ - main.cpp \ - moduleA.cpp \ - moduleC.cpp \ - moduleS.cpp \ - nested_scopeC.cpp \ - nested_scopeS.cpp \ - old_arrayC.cpp \ - old_arrayS.cpp \ - old_constantsC.cpp \ - old_constantsS.cpp \ - old_sequenceC.cpp \ - old_sequenceS.cpp \ - old_structC.cpp \ - old_structS.cpp \ - old_union2C.cpp \ - old_union2S.cpp \ - old_unionC.cpp \ - old_unionS.cpp \ - paramsC.cpp \ - paramsS.cpp \ - pragmaA.cpp \ - pragmaC.cpp \ - pragmaS.cpp \ - primtypesA.cpp \ - primtypesC.cpp \ - primtypesS.cpp \ - reopen_include1C.cpp \ - reopen_include1S.cpp \ - reopen_include2C.cpp \ - reopen_include2S.cpp \ - reopened_modulesC.cpp \ - reopened_modulesS.cpp \ - repo_id_modA.cpp \ - repo_id_modC.cpp \ - repo_id_modS.cpp \ - sequenceC.cpp \ - sequenceS.cpp \ - simple2C.cpp \ - simple2S.cpp \ - simpleC.cpp \ - simpleS.cpp \ - structC.cpp \ - structS.cpp \ - typecodeA.cpp \ - typecodeC.cpp \ - typecodeS.cpp \ - typedefA.cpp \ - typedefC.cpp \ - typedefS.cpp \ - typeprefixC.cpp \ - typeprefixS.cpp \ - unionC.cpp \ - unionS.cpp \ - valuetypeA.cpp \ - valuetypeC.cpp \ - valuetypeS.cpp \ - Bug_2350_RegressionC.h \ - Bug_2350_RegressionC.inl \ - Bug_2350_RegressionS.h \ - Bug_2350_RegressionS.inl \ - Bug_2350_RegressionS_T.h \ - Bug_2577_RegressionC.h \ - Bug_2577_RegressionC.inl \ - Bug_2577_RegressionS.h \ - Bug_2577_RegressionS.inl \ - Bug_2577_RegressionS_T.h \ - Bug_2582_RegressionC.h \ - Bug_2582_RegressionC.inl \ - Bug_2582_RegressionS.h \ - Bug_2582_RegressionS.inl \ - Bug_2582_RegressionS_T.h \ - Bug_2583_RegressionC.h \ - Bug_2583_RegressionC.inl \ - Bug_2583_RegressionS.h \ - Bug_2583_RegressionS.inl \ - Bug_2583_RegressionS_T.h \ - Bug_2616_RegressionC.h \ - Bug_2616_RegressionC.inl \ - Bug_2616_RegressionS.h \ - Bug_2616_RegressionS.inl \ - Bug_2616_RegressionS_T.h \ - Bug_2619_RegressionC.h \ - Bug_2619_RegressionC.inl \ - Bug_2619_RegressionS.h \ - Bug_2619_RegressionS.inl \ - Bug_2619_RegressionS_T.h \ - anonymousA.h \ - anonymousC.h \ - anonymousC.inl \ - anonymousS.h \ - anonymousS.inl \ - anonymousS_T.h \ - arrayC.h \ - arrayC.inl \ - arrayS.h \ - arrayS.inl \ - arrayS_T.h \ - array_onlyA.h \ - array_onlyC.h \ - array_onlyC.inl \ - array_onlyS.h \ - array_onlyS.inl \ - array_onlyS_T.h \ - constantsA.h \ - constantsC.h \ - constantsC.inl \ - constantsS.h \ - constantsS.inl \ - constantsS_T.h \ - dif2A.h \ - dif2C.h \ - dif2C.inl \ - dif2S.h \ - dif2S.inl \ - dif2S_T.h \ - enum_in_structC.h \ - enum_in_structC.inl \ - enum_in_structS.h \ - enum_in_structS.inl \ - enum_in_structS_T.h \ - fullC.h \ - fullC.inl \ - fullS.h \ - fullS.inl \ - fullS_T.h \ - fwdC.h \ - fwdC.inl \ - fwdS.h \ - fwdS.inl \ - fwdS_T.h \ - generic_objectA.h \ - generic_objectC.h \ - generic_objectC.inl \ - generic_objectS.h \ - generic_objectS.inl \ - generic_objectS_T.h \ - gperfC.h \ - gperfC.inl \ - gperfS.h \ - gperfS.inl \ - gperfS_T.h \ - includedC.h \ - includedC.inl \ - includedS.h \ - includedS.inl \ - includedS_T.h \ - includingC.h \ - includingC.inl \ - includingS.h \ - includingS.inl \ - includingS_T.h \ - inheritA.h \ - inheritC.h \ - inheritC.inl \ - inheritS.h \ - inheritS.inl \ - inheritS_T.h \ - interfaceC.h \ - interfaceC.inl \ - interfaceS.h \ - interfaceS.inl \ - interfaceS_T.h \ - keywordsA.h \ - keywordsC.h \ - keywordsC.inl \ - keywordsS.h \ - keywordsS.inl \ - keywordsS_T.h \ - moduleA.h \ - moduleC.h \ - moduleC.inl \ - moduleS.h \ - moduleS.inl \ - moduleS_T.h \ - nested_scopeC.h \ - nested_scopeC.inl \ - nested_scopeS.h \ - nested_scopeS.inl \ - nested_scopeS_T.h \ - old_arrayC.h \ - old_arrayC.inl \ - old_arrayS.h \ - old_arrayS.inl \ - old_arrayS_T.h \ - old_constantsC.h \ - old_constantsC.inl \ - old_constantsS.h \ - old_constantsS.inl \ - old_constantsS_T.h \ - old_sequenceC.h \ - old_sequenceC.inl \ - old_sequenceS.h \ - old_sequenceS.inl \ - old_sequenceS_T.h \ - old_structC.h \ - old_structC.inl \ - old_structS.h \ - old_structS.inl \ - old_structS_T.h \ - old_union2C.h \ - old_union2C.inl \ - old_union2S.h \ - old_union2S.inl \ - old_union2S_T.h \ - old_unionC.h \ - old_unionC.inl \ - old_unionS.h \ - old_unionS.inl \ - old_unionS_T.h \ - paramsC.h \ - paramsC.inl \ - paramsS.h \ - paramsS.inl \ - paramsS_T.h \ - pragmaA.h \ - pragmaC.h \ - pragmaC.inl \ - pragmaS.h \ - pragmaS.inl \ - pragmaS_T.h \ - primtypesA.h \ - primtypesC.h \ - primtypesC.inl \ - primtypesS.h \ - primtypesS.inl \ - primtypesS_T.h \ - reopen_include1C.h \ - reopen_include1C.inl \ - reopen_include1S.h \ - reopen_include1S.inl \ - reopen_include1S_T.h \ - reopen_include2C.h \ - reopen_include2C.inl \ - reopen_include2S.h \ - reopen_include2S.inl \ - reopen_include2S_T.h \ - reopened_modulesC.h \ - reopened_modulesC.inl \ - reopened_modulesS.h \ - reopened_modulesS.inl \ - reopened_modulesS_T.h \ - repo_id_modA.h \ - repo_id_modC.h \ - repo_id_modC.inl \ - repo_id_modS.h \ - repo_id_modS.inl \ - repo_id_modS_T.h \ - sequenceC.h \ - sequenceC.inl \ - sequenceS.h \ - sequenceS.inl \ - sequenceS_T.h \ - simple2C.h \ - simple2C.inl \ - simple2S.h \ - simple2S.inl \ - simple2S_T.h \ - simpleC.h \ - simpleC.inl \ - simpleS.h \ - simpleS.inl \ - simpleS_T.h \ - structC.h \ - structC.inl \ - structS.h \ - structS.inl \ - structS_T.h \ - typecodeA.h \ - typecodeC.h \ - typecodeC.inl \ - typecodeS.h \ - typecodeS.inl \ - typecodeS_T.h \ - typedefA.h \ - typedefC.h \ - typedefC.inl \ - typedefS.h \ - typedefS.inl \ - typedefS_T.h \ - typeprefixC.h \ - typeprefixC.inl \ - typeprefixS.h \ - typeprefixS.inl \ - typeprefixS_T.h \ - unionC.h \ - unionC.inl \ - unionS.h \ - unionS.inl \ - unionS_T.h \ - valuetypeA.h \ - valuetypeC.h \ - valuetypeC.inl \ - valuetypeS.h \ - valuetypeS.inl \ - valuetypeS_T.h - -main_LDADD = \ - $(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_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 - -## 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/IDL_Test/anonymous.idl b/tests/IDL_Test/anonymous.idl index f3eeb99b731..98f0ccf5c19 100644 --- a/tests/IDL_Test/anonymous.idl +++ b/tests/IDL_Test/anonymous.idl @@ -1,23 +1,20 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// anonymous.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ +//============================================================================= +/** + * @file anonymous.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + // Normal typedef'd sequence module Not_Anon @@ -55,7 +52,7 @@ module All_Anon }; // Neither array nor sequence are typedef'd. - exception Nested_Anon + exception Nested_Anon { sequence<float> float_seq_array[6]; sequence<float> another_fsa[6]; @@ -72,3 +69,4 @@ module Second { typedef string<32> SecondString; }; + diff --git a/tests/IDL_Test/anyunion.idl b/tests/IDL_Test/anyunion.idl new file mode 100644 index 00000000000..adb185425b0 --- /dev/null +++ b/tests/IDL_Test/anyunion.idl @@ -0,0 +1,27 @@ + +//============================================================================= +/** + * @file anyunion.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + + +// AnyUnion +enum AnyUnionEnum { + ANYUNIONENUM2 +}; + +union MyAnyUnion switch (AnyUnionEnum) { + case ANYUNIONENUM2: + any my_any; +}; diff --git a/tests/IDL_Test/array.idl b/tests/IDL_Test/array.idl index ff24c1b7c74..1b0b9d3c12e 100644 --- a/tests/IDL_Test/array.idl +++ b/tests/IDL_Test/array.idl @@ -1,23 +1,20 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// array.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ + +//============================================================================= +/** + * @file array.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + // Multidimensional arrays - constant vigilance. typedef short TwoDArray[64][63]; @@ -164,3 +161,4 @@ module bug_2126 case FALSE: long wibble; }; }; + diff --git a/tests/IDL_Test/array_anon_nested.idl b/tests/IDL_Test/array_anon_nested.idl new file mode 100644 index 00000000000..d10972445c6 --- /dev/null +++ b/tests/IDL_Test/array_anon_nested.idl @@ -0,0 +1,35 @@ + +//============================================================================= +/** + * @file array_anon_nested.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + + +/// There was a problem generating the *_Forany +/// for the inner array. This construct is in a separate +/// IDL file for two reasons - (1) to avoid the -GA +/// option, which does not work when there are constructs +/// that result in nested C++ classes, and (2) to avoid +/// the RTI DDS processor, which chokes on this unusual +/// IDL. +typedef struct teststruct +{ + char b[4]; + + struct embeddedstruct + { + char a[4]; + } estruct; + +} tstruct; diff --git a/tests/IDL_Test/array_only.idl b/tests/IDL_Test/array_only.idl index bb791128223..705d7c56319 100644 --- a/tests/IDL_Test/array_only.idl +++ b/tests/IDL_Test/array_only.idl @@ -1,23 +1,20 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// array_only.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ +//============================================================================= +/** + * @file array_only.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + // The IDL compiler used to generated code that would not compile if // an IDL file contained nothing but an array definition, but only if diff --git a/tests/IDL_Test/constants.idl b/tests/IDL_Test/constants.idl index a5ba3bc4f4d..b93e5d3a385 100644 --- a/tests/IDL_Test/constants.idl +++ b/tests/IDL_Test/constants.idl @@ -1,23 +1,20 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// constants.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ + +//============================================================================= +/** + * @file constants.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + const string all_escape = "\n\t\v\b\r\f\a\\\?\'\""; @@ -72,6 +69,15 @@ const double take = 2e3; const double dip = 1.797693134862315E+308; const double trouble = 2.2250738585072014E-308; +// A few long double cases. No test for values outside +// the range of 8-byte doubles, since some supported +// platforms have 8-byte long doubles. + +const long double dbl_easy = 698.91148263188057; +const long double dbl_dip = 1.797693134862315E+308; +const long double dbl_trouble = 2.2250738585072014E-308; +const long double dbl_int = 7.; + // const values created through mathematic operations const long neg = -8; const long sub1 = 0x10 - 0x01; diff --git a/tests/IDL_Test/dif2.idl b/tests/IDL_Test/dif2.idl index 5f605c3b16d..107fb7994c2 100644 --- a/tests/IDL_Test/dif2.idl +++ b/tests/IDL_Test/dif2.idl @@ -1,103 +1,100 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// dif2.idl -// -// = DESCRIPTION -// Tests of interface operations and attributes in IDL constructs -// -// = AUTHORS -// Andy Gokhale <gokhale@dre.vanderbilt.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file dif2.idl + * + * $Id$ + * + * Tests of interface operations and attributes in IDL constructs + * + * + * @author Andy Gokhale <gokhale@dre.vanderbilt.edu> + */ +//============================================================================= + module OldDif2 { interface ex1 { void op0 (); - + float op1 (in float f, out double d, inout long l); - + double op2 (in double d, out long l, inout short s); - + long op3 (in long l, out short s, inout unsigned long ul); - + short op4 (in short s, out unsigned long ul, inout unsigned short us); - + unsigned long op5 (inout unsigned long ul, in unsigned short us, out char c, in boolean b); - + unsigned short op6 (out unsigned short us, inout char c); }; - interface ex2 : ex1 + interface ex2 : ex1 { // Operations continued from ex1. char op7 (in char c, out boolean b, inout octet o); - + boolean op8 (out boolean b, in octet o); - + octet op9 (inout octet o, out string s, in string <10> ls, inout long l); - + string op10 (in string s, out string <10> ls); - + string <10> op11 (inout string <10> ls, out long l); - + long op12 (in long l); }; interface ex3 : ex1 { readonly attribute float float_attribute; - + attribute double double_attribute; - + readonly attribute long long_attribute; - + attribute short short_attribute; - + readonly attribute unsigned long unsigned_long_attribute; }; interface ex4 : ex2, ex3 { attribute unsigned short unsigned_short_attribute; - + readonly attribute char char_attribute; - + attribute boolean boolean_attribute; - + readonly attribute octet octet_attribute; - + attribute string string_attribute; - + readonly attribute string <10> limited_string_attribute; - + readonly attribute ex4 an_object_attribute; }; }; diff --git a/tests/IDL_Test/enum_in_struct.idl b/tests/IDL_Test/enum_in_struct.idl index d3c41ce7781..d71e766fa19 100644 --- a/tests/IDL_Test/enum_in_struct.idl +++ b/tests/IDL_Test/enum_in_struct.idl @@ -1,23 +1,20 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// enum_in_struct.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ +//============================================================================= +/** + * @file enum_in_struct.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + // Tests for correct parsing and code generation for // both named and anonymous enums in a struct. @@ -31,11 +28,11 @@ enum UnNamed struct HoldsEnum { - enum Named - { - NAMED_FIRST, - NAMED_SECOND, - NAMED_THIRD + enum Named + { + NAMED_FIRST, + NAMED_SECOND, + NAMED_THIRD } named_enum; UnNamed unnamed_enum; @@ -45,22 +42,22 @@ struct HoldsEnum struct decl_heavy_struct { - enum str_en + enum str_en { - a, - b, + a, + b, c } m_en[10]; - struct st + struct st { - long a; + long a; char b; } m_st[10]; - union un switch (long) + union un switch (long) { - case 1: long a; + case 1: long a; case 2: char b; } m_un[10]; }; diff --git a/tests/IDL_Test/full.idl b/tests/IDL_Test/full.idl index 6df0fdc4383..95b8eae7591 100644 --- a/tests/IDL_Test/full.idl +++ b/tests/IDL_Test/full.idl @@ -1,29 +1,26 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// full.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ + +//============================================================================= +/** + * @file full.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + // This file, along with its companion fwd.idl, test the // handling of forward interface declarations that are // not defined in the same IDL file. The two files have // mutually dependent interfaces. It is no longer necessary -// for such ILD files to include each other, as long as +// for such ILD files to include each other, as long as // they are part of the same build. module scope_test @@ -36,7 +33,7 @@ module mod2 interface fwd; interface full; - interface fwd + interface fwd { attribute string attr; diff --git a/tests/IDL_Test/fwd.idl b/tests/IDL_Test/fwd.idl index ddfb13adde0..888679f83e4 100644 --- a/tests/IDL_Test/fwd.idl +++ b/tests/IDL_Test/fwd.idl @@ -1,29 +1,26 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// fwd.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ + +//============================================================================= +/** + * @file fwd.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + // This file, along with its companion full.idl, test the // handling of forward interface declarations that are // not defined in the same IDL file. The two files have // mutually dependent interfaces. It is no longer necessary -// for such ILD files to include each other, as long as +// for such ILD files to include each other, as long as // they are part of the same build. module scope_test @@ -47,14 +44,14 @@ module mod2 }; interface fwd; - + exception exp { fwd fwd_mem; }; - + typedef fwd td_fwd; - + interface full { fwd op (in fwd inarg, @@ -74,11 +71,11 @@ module mod2 module fwd_mixed_intf { interface mixed_parents; - + interface concrete_parent {}; - + abstract interface abstract_parent {}; - + interface mixed_abs_first : abstract_parent, concrete_parent {}; interface mixed_conc_first : concrete_parent, abstract_parent {}; }; diff --git a/tests/IDL_Test/generic_object.idl b/tests/IDL_Test/generic_object.idl index d0a21cdec0e..e2c4e2ff570 100644 --- a/tests/IDL_Test/generic_object.idl +++ b/tests/IDL_Test/generic_object.idl @@ -1,34 +1,31 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// generic_object.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ +//============================================================================= +/** + * @file generic_object.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + // The IDL compiler deals with these in a completely different way // that it deals with a derived object, i.e., an interface. -enum ObjectType +enum ObjectType { - OT_THIS, + OT_THIS, OT_THAT }; -union Selecter switch (ObjectType) +union Selecter switch (ObjectType) { case OT_THIS: Object this_object; case OT_THAT: Object that_object; @@ -37,8 +34,8 @@ union Selecter switch (ObjectType) // Test stub code for generic object parameters. interface generic { - Object op (in Object inarg, - inout Object inoutarg, + Object op (in Object inarg, + inout Object inoutarg, out Object outarg); }; diff --git a/tests/IDL_Test/gperf.idl b/tests/IDL_Test/gperf.idl index a26cb9f9f33..37bbb075483 100644 --- a/tests/IDL_Test/gperf.idl +++ b/tests/IDL_Test/gperf.idl @@ -1,23 +1,20 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// gperf.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ + +//============================================================================= +/** + * @file gperf.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + // The examples below uncovered some bugs in gperf, // in the form of runtime errors when clients made @@ -67,7 +64,7 @@ interface test attribute testlistitem tltest; testlistitem new_testlistitem (in string name); -}; +}; interface Simple_Server { @@ -94,5 +91,5 @@ interface Simple_Server oneway void transferTriggerDb (); oneway void transferTriggerTdc (); }; - + diff --git a/tests/IDL_Test/included.idl b/tests/IDL_Test/included.idl index dc97512a1f6..bc528c63396 100644 --- a/tests/IDL_Test/included.idl +++ b/tests/IDL_Test/included.idl @@ -1,23 +1,20 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// included.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ +//============================================================================= +/** + * @file included.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + #ifndef IDL_TEST_INCLUDED_IDL #define IDL_TEST_INCLUDED_IDL diff --git a/tests/IDL_Test/including.idl b/tests/IDL_Test/including.idl index 589054410a8..482aebfd071 100644 --- a/tests/IDL_Test/including.idl +++ b/tests/IDL_Test/including.idl @@ -1,23 +1,20 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// including.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ + +//============================================================================= +/** + * @file including.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + #ifndef IDL_TEST_INCLUDING_IDL #define IDL_TEST_INCLUDING_IDL diff --git a/tests/IDL_Test/inherit.idl b/tests/IDL_Test/inherit.idl index ea6d952f47a..26ac5916d49 100644 --- a/tests/IDL_Test/inherit.idl +++ b/tests/IDL_Test/inherit.idl @@ -1,20 +1,17 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// inherit.idl -// -// = DESCRIPTION -// Tests of interface inheritance in IDL constructs -// -// = AUTHORS -// Andy Gokhale <gokhale@dre.vanderbilt.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file inherit.idl + * + * $Id$ + * + * Tests of interface inheritance in IDL constructs + * + * + * @author Andy Gokhale <gokhale@dre.vanderbilt.edu> + */ +//============================================================================= + module OldInherit { diff --git a/tests/IDL_Test/interface.idl b/tests/IDL_Test/interface.idl index d5e713d6e44..b536067de78 100644 --- a/tests/IDL_Test/interface.idl +++ b/tests/IDL_Test/interface.idl @@ -1,23 +1,20 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// interface.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ + +//============================================================================= +/** + * @file interface.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + // Used to be a problem in the get() and set() // generated code. @@ -126,8 +123,10 @@ interface Client // attributes. interface AttributeTester { + typedef string string_1[1]; + attribute string a_su; - attribute string<1> a_sb; + attribute string_1 a_sb; }; // All of the 'recursion' below is legal. @@ -218,12 +217,12 @@ module redefs interface base { const long lconst = -5; - + exception ex { string info; }; - + struct foo { short index; @@ -233,12 +232,12 @@ module redefs interface derived : base { const long lconst = 44; - + exception ex { long serial; }; - + struct foo { string str; diff --git a/tests/IDL_Test/invalid_scoping.idl b/tests/IDL_Test/invalid_scoping1.idl index 37708f6c647..bb3db137549 100644 --- a/tests/IDL_Test/invalid_scoping.idl +++ b/tests/IDL_Test/invalid_scoping1.idl @@ -1,20 +1,19 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// invalid_scoping.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// ============================================================================ +//============================================================================= +/** + * @file invalid_scoping1.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + */ +//============================================================================= + module A { typedef long mylong; diff --git a/tests/IDL_Test/invalid_scoping2.idl b/tests/IDL_Test/invalid_scoping2.idl new file mode 100644 index 00000000000..8d4a0299fc2 --- /dev/null +++ b/tests/IDL_Test/invalid_scoping2.idl @@ -0,0 +1,54 @@ + +//============================================================================= +/** + * @file invalid_scoping2.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + */ +//============================================================================= + + +// Ensure that scope ::A::B::target exists +// but doesn't contain enum numbers2. +// ::A::B::target should hide the ::A::target +// defined later when inside scope ::A::B. +module A { + module B { + module target { + enum numbers1 { + ONE + }; + }; + }; +}; + +// Ensure that enum ::A::target::numbers2 exists +// which should not be found inside scope B due +// to the internal "target" module above. +module A { + module target { + enum numbers2 { + TWO + }; + }; +}; + +// Attempt to access global scope ::A::target::numbers2 +// with a local (non-fully pathed) name target::numbers2 +// from within ::A::B which DOES contain it's own target +// module that does NOT contain numbers2. THIS SHOULD NOT +// COMPILE OR LOCK-UP tao_idl. The two target modules are NOT +// the same module and thus the outer one is hidden by the +// closer local one. +module A { + module B { + typedef target::numbers2 myType; + }; +}; diff --git a/tests/IDL_Test/keywords.idl b/tests/IDL_Test/keywords.idl index f09b93ed87b..97ad967b2a7 100644 --- a/tests/IDL_Test/keywords.idl +++ b/tests/IDL_Test/keywords.idl @@ -1,23 +1,20 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// keywords.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ +//============================================================================= +/** + * @file keywords.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + // All these identifiers should be accepted, but // prepended with _cxx_. diff --git a/tests/IDL_Test/main.cpp b/tests/IDL_Test/main.cpp index 91bebd23bd6..01508dd0dd1 100644 --- a/tests/IDL_Test/main.cpp +++ b/tests/IDL_Test/main.cpp @@ -1,21 +1,18 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// main.cpp -// -// = DESCRIPTION -// We test the pragma prefixes generated in pragma.idl, and -// the values of some generated constants in constants.idl. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file main.cpp + * + * $Id$ + * + * We test the pragma prefixes generated in pragma.idl, and + * the values of some generated constants in constants.idl. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> + */ +//============================================================================= + #include "pragmaS.h" #include "unionC.h" @@ -88,10 +85,10 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { int error_count = 0; - + const ACE_CDR::ULongLong test_ull = ACE_UINT64_LITERAL (122192928000000000); - + if (test_ull != AAA) { ++error_count; @@ -100,7 +97,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_TEXT (" long long AAA in constants.idl") ACE_TEXT (" is incorrect\n"))); } - + const CORBA::LongLong test_nll = ACE_INT64_LITERAL (-122192928000000000); if (test_nll != NAAA) @@ -111,7 +108,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_TEXT (" long long NAAA in constants.idl") ACE_TEXT (" is incorrect\n"))); } - + const CORBA::LongLong test_pll = ACE_INT64_LITERAL (122192928000000000); if (test_pll != PAAA) @@ -122,7 +119,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_TEXT (" long long PAAA in constants.idl") ACE_TEXT (" is incorrect\n"))); } - + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, diff --git a/tests/IDL_Test/module.idl b/tests/IDL_Test/module.idl index bf4d84b5185..95d7efe1566 100644 --- a/tests/IDL_Test/module.idl +++ b/tests/IDL_Test/module.idl @@ -1,20 +1,17 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// module.idl -// -// = DESCRIPTION -// Tests of module IDL constructs -// -// = AUTHORS -// Andy Gokhale <gokhale@dre.vanderbilt.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file module.idl + * + * $Id$ + * + * Tests of module IDL constructs + * + * + * @author Andy Gokhale <gokhale@dre.vanderbilt.edu> + */ +//============================================================================= + module mod1 { diff --git a/tests/IDL_Test/nested_scope.idl b/tests/IDL_Test/nested_scope.idl index 1793bbc1e34..723d444cce3 100644 --- a/tests/IDL_Test/nested_scope.idl +++ b/tests/IDL_Test/nested_scope.idl @@ -1,23 +1,20 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// nested_scope.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ + +//============================================================================= +/** + * @file nested_scope.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + // Tests all the problem datatypes for repeating a scope // name after skipping one nesting level. diff --git a/tests/IDL_Test/old_array.idl b/tests/IDL_Test/old_array.idl index fdd9b264bf7..a8f3d5f3c21 100644 --- a/tests/IDL_Test/old_array.idl +++ b/tests/IDL_Test/old_array.idl @@ -1,20 +1,17 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// old_array.idl -// -// = DESCRIPTION -// Tests of array IDL constructs -// -// = AUTHORS -// Andy Gokhale <gokhale@dre.vanderbilt.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file old_array.idl + * + * $Id$ + * + * Tests of array IDL constructs + * + * + * @author Andy Gokhale <gokhale@dre.vanderbilt.edu> + */ +//============================================================================= + #include "simple.idl" @@ -23,12 +20,14 @@ module OldArray typedef char str22[22][2]; typedef boolean boolarray[3][40]; + typedef char char_17[17]; + typedef char char_10_2[10][2]; struct A { long a1; - char a2[17]; - char a3[10][2]; + char_17 a2; + char_10_2 a3; }; struct B @@ -54,15 +53,15 @@ module OldArray A op (in A a1, inout A a2, out A a3); - + str22 op2 (in str22 a1, inout str22 a2, out str22 a3); - + A_matrix op4 (in A a1, inout A a2, out A a3); - + attribute str22 attribute_array; }; }; diff --git a/tests/IDL_Test/old_constants.idl b/tests/IDL_Test/old_constants.idl index 6c8a8cc8301..f04cf8cf5d4 100644 --- a/tests/IDL_Test/old_constants.idl +++ b/tests/IDL_Test/old_constants.idl @@ -1,20 +1,17 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// old_constants.idl -// -// = DESCRIPTION -// Tests of const IDL constructs -// -// = AUTHORS -// Andy Gokhale <gokhale@dre.vanderbilt.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file old_constants.idl + * + * $Id$ + * + * Tests of const IDL constructs + * + * + * @author Andy Gokhale <gokhale@dre.vanderbilt.edu> + */ +//============================================================================= + module OldConstants { @@ -35,7 +32,7 @@ module OldConstants module M { - const short l = 4; + const short l = 4; enum N { @@ -52,8 +49,8 @@ module OldConstants interface A { - const short l = 4; - + const short l = 4; + enum N { zero, @@ -61,7 +58,7 @@ module OldConstants deux, trois }; - + exception E { short cause ; diff --git a/tests/IDL_Test/old_sequence.idl b/tests/IDL_Test/old_sequence.idl index a1380a49249..cf357e3e86a 100644 --- a/tests/IDL_Test/old_sequence.idl +++ b/tests/IDL_Test/old_sequence.idl @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// old_struct.idl -// -// = DESCRIPTION -// Tests of sequence IDL constructs -// -// = AUTHORS -// Andy Gokhale <gokhale@dre.vanderbilt.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file old_sequence.idl + * + * $Id$ + * + * Tests of sequence IDL constructs + * + * + * @author Andy Gokhale <gokhale@dre.vanderbilt.edu> + */ +//============================================================================= + #include "simple.idl" @@ -23,11 +20,12 @@ typedef sequence<c20,23> cc23; typedef sequence<char,24> c24; typedef sequence< sequence<long,10>, 10> c30; +typedef sequence<string> cstring; struct TProgram { - string path; - sequence<string> argv; - sequence<string> envp; + string path; + cstring argv; + cstring envp; }; struct sfoo diff --git a/tests/IDL_Test/old_struct.idl b/tests/IDL_Test/old_struct.idl index 424c5e5b958..d8076def0fe 100644 --- a/tests/IDL_Test/old_struct.idl +++ b/tests/IDL_Test/old_struct.idl @@ -1,26 +1,25 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// old_struct.idl -// -// = DESCRIPTION -// Tests of struct IDL constructs -// -// = AUTHORS -// Andy Gokhale <gokhale@dre.vanderbilt.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file old_struct.idl + * + * $Id$ + * + * Tests of struct IDL constructs + * + * + * @author Andy Gokhale <gokhale@dre.vanderbilt.edu> + */ +//============================================================================= + + +typedef string string_20[20]; struct bar1 { long b1; long b2; - string<20> b3; + string_20 b3; }; struct bar2 @@ -54,7 +53,7 @@ interface foo1 interface foo2 : foo1 { bar1 op2 (in bar2 a); - + long op3 (in long a, out char b); }; diff --git a/tests/IDL_Test/old_union.idl b/tests/IDL_Test/old_union.idl index 163d3db67ee..e0f74ebca13 100644 --- a/tests/IDL_Test/old_union.idl +++ b/tests/IDL_Test/old_union.idl @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// old_union.idl -// -// = DESCRIPTION -// Tests of union IDL constructs -// -// = AUTHORS -// Andy Gokhale <gokhale@dre.vanderbilt.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file old_union.idl + * + * $Id$ + * + * Tests of union IDL constructs + * + * + * @author Andy Gokhale <gokhale@dre.vanderbilt.edu> + */ +//============================================================================= + module OldUnion { diff --git a/tests/IDL_Test/old_union2.idl b/tests/IDL_Test/old_union2.idl index 9fd2dd2c645..b5054c22961 100644 --- a/tests/IDL_Test/old_union2.idl +++ b/tests/IDL_Test/old_union2.idl @@ -1,20 +1,17 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// old_union2.idl -// -// = DESCRIPTION -// Further tests of union IDL constructs -// -// = AUTHORS -// Andy Gokhale <gokhale@dre.vanderbilt.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file old_union2.idl + * + * $Id$ + * + * Further tests of union IDL constructs + * + * + * @author Andy Gokhale <gokhale@dre.vanderbilt.edu> + */ +//============================================================================= + module OldUnion2 { diff --git a/tests/IDL_Test/params.idl b/tests/IDL_Test/params.idl index 950c5472060..04604bc561f 100644 --- a/tests/IDL_Test/params.idl +++ b/tests/IDL_Test/params.idl @@ -1,46 +1,43 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// params.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ +//============================================================================= +/** + * @file params.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + // Compiling the generated code for the parameters of // getDate taught us to use the ACE_NESTED_CLASS macro // more judiciously in the header file. This file was // also initially a problem for lookups as well. -module foo +module foo { - struct theDate + struct theDate { short year; short month; short day; }; - - module bar + + module bar { - struct theDate + struct theDate { short x; }; - - interface fooBar + + interface fooBar { foo::theDate getDate (in foo::theDate a, inout foo::theDate b, diff --git a/tests/IDL_Test/pragma.idl b/tests/IDL_Test/pragma.idl index 561575695e1..118742c5fc4 100644 --- a/tests/IDL_Test/pragma.idl +++ b/tests/IDL_Test/pragma.idl @@ -1,23 +1,20 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// pragma.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ + +//============================================================================= +/** + * @file pragma.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + #pragma prefix "anvil.com" diff --git a/tests/IDL_Test/primtypes.idl b/tests/IDL_Test/primtypes.idl index 12b2a2c2324..c47f44bf3da 100644 --- a/tests/IDL_Test/primtypes.idl +++ b/tests/IDL_Test/primtypes.idl @@ -1,29 +1,26 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// primtypes.idl -// -// = DESCRIPTION -// Tests of primitive types in IDL -// -// = AUTHORS -// Andy Gokhale <gokhale@dre.vanderbilt.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file primtypes.idl + * + * $Id$ + * + * Tests of primitive types in IDL + * + * + * @author Andy Gokhale <gokhale@dre.vanderbilt.edu> + */ +//============================================================================= + module OldPrimTypes { interface ex1 { attribute long l1; - + long m1 (in long a); - + ex1 mtypes (in long a1, inout long a2, out long a3, @@ -47,7 +44,7 @@ module OldPrimTypes out char g3); }; - interface ex2 : ex1 + interface ex2 : ex1 { readonly attribute long l2; diff --git a/tests/IDL_Test/reopen_include1.idl b/tests/IDL_Test/reopen_include1.idl index a0770bcc4de..6944d33fa04 100644 --- a/tests/IDL_Test/reopen_include1.idl +++ b/tests/IDL_Test/reopen_include1.idl @@ -1,30 +1,27 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// reopen_include1.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ +//============================================================================= +/** + * @file reopen_include1.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + #ifndef IDL_TEST_REOPEN_INCLUDE1_IDL #define IDL_TEST_REOPEN_INCLUDE1_IDL // First opening of a module included by a chain of // inclusions into reopened_modules.idl -module frag +module frag { typedef sequence<double> dub_seq; }; diff --git a/tests/IDL_Test/reopen_include2.idl b/tests/IDL_Test/reopen_include2.idl index 19db6d6ff3a..56562adb264 100644 --- a/tests/IDL_Test/reopen_include2.idl +++ b/tests/IDL_Test/reopen_include2.idl @@ -1,23 +1,20 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// reopen_include2.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ + +//============================================================================= +/** + * @file reopen_include2.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + #ifndef IDL_TEST_REOPEN_INCLUDE2_IDL #define IDL_TEST_REOPEN_INCLUDE2_IDL @@ -32,7 +29,7 @@ module frag }; // These three are reopened in reopened_modules.idl. -module XX +module XX { typedef long whah; }; diff --git a/tests/IDL_Test/reopened_modules.idl b/tests/IDL_Test/reopened_modules.idl index b92d6e8a131..431d2b309f5 100644 --- a/tests/IDL_Test/reopened_modules.idl +++ b/tests/IDL_Test/reopened_modules.idl @@ -1,23 +1,20 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// reopened_modules.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ + +//============================================================================= +/** + * @file reopened_modules.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + // These examples test the lookup abilities of the // TAO IDL compiler, with reopened modules. @@ -40,7 +37,7 @@ module AA { module CC { - interface x2 + interface x2 { // 'AA::BB::' should be implicit void op1 (in x1 obj); @@ -57,19 +54,19 @@ module AA // recognized as being in the same scope as the // previous occurrence(s). -module dot -{ +module dot +{ interface Party; - interface Person + interface Person { attribute Party someParty; }; }; -module dot -{ - interface Party +module dot +{ + interface Party { attribute Person somePerson; }; @@ -102,18 +99,18 @@ interface OpHolder // This particular combination used to cause IDL compiler // to go into an infinite loop looking for return type to -// getInfo(). Partial solution got rid of infinite loop, +// getInfo(). Partial solution got rid of infinite loop, // but erroneously returned ::com from lookup. -module com +module com { - module mr + module mr { typedef short info; }; }; -module com +module com { interface IFace { @@ -124,7 +121,7 @@ module com // Modules X and Y are also included from reopene_include2.idl. // There were problems with the lookup of Y::Z and X::Ex. -module Y +module Y { interface Z {}; }; @@ -133,7 +130,7 @@ module X { exception Ex {}; - interface BI : Y::Z + interface BI : Y::Z { void method () raises (X::Ex); }; @@ -142,16 +139,16 @@ module X // Reopened from reopen_include2.idl inclusion. There // was a problem with the inheritance lookup. -module XX +module XX { interface blah_intfc; - interface blah_intfc + interface blah_intfc { void op1 (); }; - interface blah0 : blah_intfc + interface blah0 : blah_intfc { void op0 (); }; @@ -249,7 +246,7 @@ module mC }; // The example below uncovered errors in the logic of -// AST_Module::fe_add_interface_fwd() and +// AST_Module::fe_add_interface_fwd() and // AST_Module::add_to_previous() that were causing // AST_Module::look_in_previous() (and thus lookup_by_name) // to fail on the last line. @@ -284,7 +281,7 @@ module Schmoik module Thwoik { interface TestType; -}; +}; module Thwoik { @@ -298,7 +295,7 @@ module Thwoik }; // We had a problem with the inheritance list -// in the declaration of A_mod::B_mod::Foo, in +// in the declaration of A_mod::B_mod::Foo, in // both stub and skeleton files. module A_mod { @@ -307,12 +304,12 @@ module A_mod module B_mod { interface Foo : A_mod::Foo {}; - }; + }; }; /// Similar to example at the top of this file, /// but with more openings and deeper nesting. -module m1 +module m1 { module m2 { diff --git a/tests/IDL_Test/repo_id_mod.idl b/tests/IDL_Test/repo_id_mod.idl index 51f50178384..60620865125 100644 --- a/tests/IDL_Test/repo_id_mod.idl +++ b/tests/IDL_Test/repo_id_mod.idl @@ -1,23 +1,20 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// repo_id_mod.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ + +//============================================================================= +/** + * @file repo_id_mod.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + module gleep { @@ -59,7 +56,7 @@ module gleep // This will override the prefix directive for module floop at the end // of the file. typeprefix floop::verklempt "verklempt_prefix"; - }; + }; }; local interface schmegegging {}; diff --git a/tests/IDL_Test/run_test.pl b/tests/IDL_Test/run_test.pl index a74a5079aea..78ea7ea2106 100755 --- a/tests/IDL_Test/run_test.pl +++ b/tests/IDL_Test/run_test.pl @@ -32,18 +32,29 @@ else{ $tao_idl = "../../TAO_IDL/tao_idl"; } -my $server2 = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; -my $input_file1 = $server2->LocalFile ("invalid_scoping.idl"); +my $server2 = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; +my $input_file2 = $server2->LocalFile ("invalid_scoping1.idl"); # Compile the IDL -$SV = $server2->CreateProcess ("$tao_idl", "$input_file1"); -$test = $SV->SpawnWaitKill ($server2->ProcessStartWaitInterval()); +$SV = $server2->CreateProcess ("$tao_idl", "$input_file2"); +$test2 = $SV->SpawnWaitKill ($server2->ProcessStartWaitInterval()); + +my $server3 = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; +my $input_file3 = $server3->LocalFile ("invalid_scoping2.idl"); + +# Compile the IDL +$SV = $server3->CreateProcess ("$tao_idl", "$input_file3"); +$test3 = $SV->SpawnWaitKill ($server2->ProcessStartWaitInterval()); #Redirect the null device output back to the screen open (STDOUT, ">&OLDOUT"); open (STDERR, ">&OLDERR"); -if ($test== 0) { - print STDERR "ERROR: tao_idl returned $test for $input_file1, should have failed!\n"; +if ($test2== 0) { + print STDERR "ERROR: tao_idl returned $test2 for $input_file2, should have failed!\n"; + $status = 1; +} +if ($test3== 0) { + print STDERR "ERROR: tao_idl returned $test3 for $input_file3, should have failed!\n"; $status = 1; } diff --git a/tests/IDL_Test/sequence.idl b/tests/IDL_Test/sequence.idl index 3e5b9415ed9..f8bb18541b6 100644 --- a/tests/IDL_Test/sequence.idl +++ b/tests/IDL_Test/sequence.idl @@ -1,23 +1,20 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// sequence.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ + +//============================================================================= +/** + * @file sequence.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + #include "tao/OctetSeq.pidl" diff --git a/tests/IDL_Test/simple.idl b/tests/IDL_Test/simple.idl index f12b4c92458..de19060f479 100644 --- a/tests/IDL_Test/simple.idl +++ b/tests/IDL_Test/simple.idl @@ -1,20 +1,17 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// simple.idl -// -// = DESCRIPTION -// Tests of simple IDL -// -// = AUTHORS -// Andy Gokhale <gokhale@dre.vanderbilt.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file simple.idl + * + * $Id$ + * + * Tests of simple IDL + * + * + * @author Andy Gokhale <gokhale@dre.vanderbilt.edu> + */ +//============================================================================= + typedef sequence<long,10> vec10; @@ -37,7 +34,7 @@ interface simple2 : simple { long reason2; }; - + long op2 (in long a, in simple b, out simple2 c) diff --git a/tests/IDL_Test/simple2.idl b/tests/IDL_Test/simple2.idl index afad6e2e0e1..339054dd24e 100644 --- a/tests/IDL_Test/simple2.idl +++ b/tests/IDL_Test/simple2.idl @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// simple2.idl -// -// = DESCRIPTION -// Further tests of simple IDL -// -// = AUTHORS -// Andy Gokhale <gokhale@dre.vanderbilt.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file simple2.idl + * + * $Id$ + * + * Further tests of simple IDL + * + * + * @author Andy Gokhale <gokhale@dre.vanderbilt.edu> + */ +//============================================================================= + #include "simple.idl" @@ -38,7 +35,7 @@ interface simple3 : simple2 }; exception UserError - { + { any reason; }; diff --git a/tests/IDL_Test/typecode.idl b/tests/IDL_Test/typecode.idl index c3dee7f5c70..65901444b5e 100644 --- a/tests/IDL_Test/typecode.idl +++ b/tests/IDL_Test/typecode.idl @@ -1,20 +1,17 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// typecode.idl -// -// = DESCRIPTION -// Test a sequence of typecodes -// -// = AUTHORS -// Johnny Willemsen <jwillemsen@remedy.nl> -// -// ============================================================================ +//============================================================================= +/** + * @file typecode.idl + * + * $Id$ + * + * Test a sequence of typecodes + * + * + * @author Johnny Willemsen <jwillemsen@remedy.nl> + */ +//============================================================================= + #include "orb.idl" diff --git a/tests/IDL_Test/typedef.idl b/tests/IDL_Test/typedef.idl index 27248fc3374..5385c5ef936 100644 --- a/tests/IDL_Test/typedef.idl +++ b/tests/IDL_Test/typedef.idl @@ -1,23 +1,20 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// typedef.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ + +//============================================================================= +/** + * @file typedef.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + // Must keep unaliasing until all levels of typedef diff --git a/tests/IDL_Test/union.idl b/tests/IDL_Test/union.idl index 3c9e365e678..8464ae52ef7 100644 --- a/tests/IDL_Test/union.idl +++ b/tests/IDL_Test/union.idl @@ -1,23 +1,20 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// union.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> and TAO users. -// -// ============================================================================ + +//============================================================================= +/** + * @file union.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> and TAO users. + */ +//============================================================================= + // Implicit default case @@ -86,17 +83,6 @@ module UnionDiscTest }; }; -// AnyUnion -enum AnyUnionEnum { - ANYUNIONENUM2 -}; - -union MyAnyUnion switch (AnyUnionEnum) { - case ANYUNIONENUM2: - any my_any; -}; - - // Nested unions enum disc1 @@ -263,6 +249,8 @@ union TestUnion switch (short) // Test for various kinds of declarations inside a union, // similar to the example in enum_in_struct.idl. +typedef long NamedLongArray[10]; + union decl_heavy_union switch (short) { case 1: @@ -291,5 +279,18 @@ union decl_heavy_union switch (short) case 1: long a; case 2: char b; } m_un_arr[10]; + // The following caused compile problems once + // when generating ostream ops + case 5: + NamedLongArray m_named_long_array; + case 6: + long m_anon_long_array[10]; +}; + +// Tests CORBA::LongDouble implementation on platforms +// without a native 16-byte long double. +union ld_test switch (long) +{ + case 1: long double ld_mem; }; diff --git a/tests/IDL_Test/valuetype.idl b/tests/IDL_Test/valuetype.idl index 41ef604cd3c..de7d0f56ea3 100644 --- a/tests/IDL_Test/valuetype.idl +++ b/tests/IDL_Test/valuetype.idl @@ -1,24 +1,20 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/IDL_Test -// -// = FILENAME -// valuetype.idl -// -// = DESCRIPTION -// This file contains examples of IDL code that has -// caused problems in the past for the TAO IDL -// compiler. This test is to make sure the problems -// stay fixed. -// -// = AUTHORS -// Gary Duzan <gduzan@bbn.com> -// Jeff Parsons <j.parsons@vanderbilt.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file valuetype.idl + * + * $Id$ + * + * This file contains examples of IDL code that has + * caused problems in the past for the TAO IDL + * compiler. This test is to make sure the problems + * stay fixed. + * + * + * @author Gary Duzan <gduzan@bbn.com> Jeff Parsons <j.parsons@vanderbilt.edu> + */ +//============================================================================= + #ifndef IDL_TEST_VALUETYPE_IDL #define IDL_TEST_VALUETYPE_IDL @@ -70,7 +66,7 @@ module X Object make_object (); }; - abstract valuetype BXXX : AXXX + abstract valuetype BXXX : AXXX { }; typedef sequence<BXXX> BSeq; diff --git a/tests/IORManipulation/IORTest.cpp b/tests/IORManipulation/IORTest.cpp index abfc992c475..9bd530cdd3f 100644 --- a/tests/IORManipulation/IORTest.cpp +++ b/tests/IORManipulation/IORTest.cpp @@ -11,17 +11,11 @@ */ //========================================================================= - #include "ace/Log_Msg.h" #include "tao/ORB.h" #include "tao/Environment.h" #include "tao/IORManipulation/IORManip_Loader.h" - -ACE_RCSID (IORManipluation, - IORTest, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/tests/IORManipulation/Makefile.am b/tests/IORManipulation/Makefile.am deleted file mode 100644 index b8664b4dd0e..00000000000 --- a/tests/IORManipulation/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) - -SUBDIRS = \ - . \ - filter - - -## Makefile.IORManipulation_IORTest.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = IORTest - -IORTest_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -IORTest_SOURCES = \ - IORTest.cpp - -IORTest_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.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/IORManipulation/filter/Makefile.am b/tests/IORManipulation/filter/Makefile.am deleted file mode 100644 index 6b41a1ec8e4..00000000000 --- a/tests/IORManipulation/filter/Makefile.am +++ /dev/null @@ -1,79 +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) - - -## Makefile.IORManip_Filter_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) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.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/tests/IORManipulation/filter/run_test.pl b/tests/IORManipulation/filter/run_test.pl index 6063a25b8e1..11dff36ee06 100755 --- a/tests/IORManipulation/filter/run_test.pl +++ b/tests/IORManipulation/filter/run_test.pl @@ -26,7 +26,7 @@ $SV = $server->CreateProcess ("server", "-ORBUseSharedProfiles 0 " . "-ORBEndpoint iiop://localhost " . "-ORBEndpoint iiop://$hostname"); - + $server_status = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); if ($server_status != 0) { diff --git a/tests/IORManipulation/filter/server.cpp b/tests/IORManipulation/filter/server.cpp index 7ba5cbed371..49fb18bdf7e 100644 --- a/tests/IORManipulation/filter/server.cpp +++ b/tests/IORManipulation/filter/server.cpp @@ -4,10 +4,6 @@ #include "tao/IORManipulation/IORManip_IIOP_Filter.h" #include "tao/Stub.h" -ACE_RCSID (Hello, - server, - "$Id$") - class Filter_Localhost: public TAO_IORManip_IIOP_Filter { public: diff --git a/tests/IOR_Endpoint_Hostnames/Makefile.am b/tests/IOR_Endpoint_Hostnames/Makefile.am deleted file mode 100644 index 61beaf2a28c..00000000000 --- a/tests/IOR_Endpoint_Hostnames/Makefile.am +++ /dev/null @@ -1,100 +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.generate_ior.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - bogusC.cpp \ - bogusC.h \ - bogusC.inl \ - bogusS.cpp \ - bogusS.h \ - bogusS.inl - -CLEANFILES = \ - bogus-stamp \ - bogusC.cpp \ - bogusC.h \ - bogusC.inl \ - bogusS.cpp \ - bogusS.h \ - bogusS.inl - -bogusC.cpp bogusC.h bogusC.inl bogusS.cpp bogusS.h bogusS.inl: bogus-stamp - -bogus-stamp: $(srcdir)/bogus.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/bogus.idl - @touch $@ - -noinst_PROGRAMS += generate_ior - -generate_ior_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -generate_ior_SOURCES = \ - bogusC.cpp \ - bogusS.cpp \ - bogus_i.cpp \ - generate_ior.cpp \ - bogusC.h \ - bogusC.inl \ - bogusS.h \ - bogusS.inl \ - bogus_i.h - -generate_ior_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.list_interfaces.am - -noinst_PROGRAMS += list_interfaces - -list_interfaces_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -list_interfaces_SOURCES = \ - list_interfaces.cpp - -list_interfaces_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -## 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/IOR_Endpoint_Hostnames/bogus_i.cpp b/tests/IOR_Endpoint_Hostnames/bogus_i.cpp index fc4222d3e30..b4039bb8ddc 100644 --- a/tests/IOR_Endpoint_Hostnames/bogus_i.cpp +++ b/tests/IOR_Endpoint_Hostnames/bogus_i.cpp @@ -2,8 +2,6 @@ #include "bogus_i.h" -ACE_RCSID (IOR_Endpoint_Hostnames, bogus_i, "$Id$") - bogus::bogus() { } diff --git a/tests/IOR_Endpoint_Hostnames/generate_ior.cpp b/tests/IOR_Endpoint_Hostnames/generate_ior.cpp index 8d13e5ff5f2..7bdbfc10987 100644 --- a/tests/IOR_Endpoint_Hostnames/generate_ior.cpp +++ b/tests/IOR_Endpoint_Hostnames/generate_ior.cpp @@ -10,10 +10,6 @@ #include "bogus_i.h" -ACE_RCSID (IOR_Endpoint_Hostnames, - generate_ior, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int @@ -38,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/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp b/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp index 10935773c5c..cd941841865 100644 --- a/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp +++ b/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp @@ -1,3 +1,4 @@ +// $Id$ // // Extract the address for each network interface using EXACTLY // the same algorithm as TAO_IIOP_Acceptor, and then print @@ -12,10 +13,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (IOR_Endpoint_Hostnames, - list_interfaces, - "$Id$") - #if defined (ACE_HAS_IPV6) && !defined (ACE_USES_IPV4_IPV6_MIGRATION) ACE_INET_Addr default_address (static_cast<unsigned short> (0), ACE_IPV6_ANY, AF_INET6); #else @@ -28,7 +25,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); - CORBA::ULong endpoint_count; #if defined (ACE_HAS_IPV6) int def_type = AF_UNSPEC; #endif /* ACE_HAS_IPV6 */ @@ -139,21 +135,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // in a localhost environment. if (!ipv4_only && !ipv6_non_ll) lo_cnt = ipv4_lo_cnt; - - if (!ignore_lo) - endpoint_count = static_cast<CORBA::ULong> (if_ok_cnt - ipv6_ll); - else - endpoint_count = static_cast<CORBA::ULong> (if_ok_cnt - ipv6_ll - lo_cnt); #else /* ACE_HAS_IPV6 */ // If the loopback interface is the only interface then include it // in the list of interfaces to query for a hostname, otherwise // exclude it from the list. bool ignore_lo; ignore_lo = if_cnt != lo_cnt; - if (!ignore_lo) - endpoint_count = static_cast<CORBA::ULong> (if_cnt); - else - endpoint_count = static_cast<CORBA::ULong> (if_cnt - lo_cnt); #endif /* !ACE_HAS_IPV6 */ // The number of hosts/interfaces we want to cache may not be the diff --git a/tests/IPV6/Hello.cpp b/tests/IPV6/Hello.cpp index df5dc90d3d9..0f62f20b906 100644 --- a/tests/IPV6/Hello.cpp +++ b/tests/IPV6/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/IPV6/Makefile.am b/tests/IPV6/Makefile.am deleted file mode 100644 index 899cd19797c..00000000000 --- a/tests/IPV6/Makefile.am +++ /dev/null @@ -1,105 +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.IPV6_Hello_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.IPV6_Hello_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 \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.IPV6_Hello_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_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/IPV6/client.cpp b/tests/IPV6/client.cpp index 20026ad82e6..8ab32ee47c3 100644 --- a/tests/IPV6/client.cpp +++ b/tests/IPV6/client.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/SString.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); bool expect_error = false; @@ -36,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/tests/IPV6/server.cpp b/tests/IPV6/server.cpp index c1d8bd1bb30..ab19d0fb0a7 100644 --- a/tests/IPV6/server.cpp +++ b/tests/IPV6/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +28,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/tests/InterOp-Naming/INS_i.h b/tests/InterOp-Naming/INS_i.h index 6f24fbc2094..5888b059637 100644 --- a/tests/InterOp-Naming/INS_i.h +++ b/tests/InterOp-Naming/INS_i.h @@ -1,21 +1,18 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/InterOp-Naming -// -// = FILENAME -// INS_i.h -// -// = DESCRIPTION -// This class implements the INS interface. -// -// = AUTHOR -// Vishal Kachroo <vishal@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file INS_i.h + * + * $Id$ + * + * This class implements the INS interface. + * + * + * @author Vishal Kachroo <vishal@cs.wustl.edu> + */ +//============================================================================= + #ifndef INS_I_H #define INS_I_H @@ -27,21 +24,21 @@ class INS_i : public POA_INS public: // = Initialization and termination methods. + /// Constructor. INS_i (void); - // Constructor. + /// Destructor. ~INS_i (void); - // Destructor. + /// test the INS. char * test_ins (void); - // test the INS. + /// Set the ORB pointer. void orb (CORBA::ORB_ptr o); - // Set the ORB pointer. private: + /// ORB pointer. CORBA::ORB_var orb_; - // ORB pointer. }; diff --git a/tests/InterOp-Naming/Makefile.am b/tests/InterOp-Naming/Makefile.am deleted file mode 100644 index 4a746e3d312..00000000000 --- a/tests/InterOp-Naming/Makefile.am +++ /dev/null @@ -1,113 +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.InterOp_Naming_Idl.am - -BUILT_SOURCES = \ - INSC.cpp \ - INSC.h \ - INSC.inl \ - INSS.cpp \ - INSS.h \ - INSS.inl - -CLEANFILES = \ - INS-stamp \ - INSC.cpp \ - INSC.h \ - INSC.inl \ - INSS.cpp \ - INSS.h \ - INSS.inl - -INSC.cpp INSC.h INSC.inl INSS.cpp INSS.h INSS.inl: INS-stamp - -INS-stamp: $(srcdir)/INS.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/INS.idl - @touch $@ - -noinst_HEADERS = \ - INS.idl - -## Makefile.InterOp_Naming_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += INS_test_client - -INS_test_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -INS_test_client_SOURCES = \ - INSC.cpp \ - INS_test_client.cpp \ - INS_i.h \ - Server_i.h - -INS_test_client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.InterOp_Naming_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += INS_test_server - -INS_test_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -INS_test_server_SOURCES = \ - INSC.cpp \ - INSS.cpp \ - INS_i.cpp \ - INS_test_server.cpp \ - Server_i.cpp \ - INS_i.h \ - Server_i.h - -INS_test_server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/InterOp-Naming/Server_i.h b/tests/InterOp-Naming/Server_i.h index e833b024a1e..35248fd2acd 100644 --- a/tests/InterOp-Naming/Server_i.h +++ b/tests/InterOp-Naming/Server_i.h @@ -1,20 +1,17 @@ -//$Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/InterOp-Naming -// -// = FILENAME -// Server_i.h -// -// = DESCRIPTION -// The class is the driver for the INS test server. -// -// = AUTHOR -// Vishal Kachroo <vishal@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file Server_i.h + * + * $Id$ + * + * The class is the driver for the INS test server. + * + * + * @author Vishal Kachroo <vishal@cs.wustl.edu> + */ +//============================================================================= + #ifndef SERVER_I_H #define SERVER_I_H @@ -30,45 +27,45 @@ class Server_i public: // = Initialization and termination methods. + /// Constructor. Server_i (void); - // Constructor. + /// Destructor. ~Server_i (void); - // Destructor. + /// Initialize the Server state - parsing arguments and waiting. int init (int argc, ACE_TCHAR *argv[]); - // Initialize the Server state - parsing arguments and waiting. + /// Add an IOR to the ORB-IOR table. int add_IOR_to_table (CORBA::String_var ior); - // Add an IOR to the ORB-IOR table. + /// Run the orb. int run (void); - // Run the orb. protected: + /// Servant class INS_i servant_; - // Servant class + /// Parses the commandline arguments. int parse_args (void); - // Parses the commandline arguments. + /// The ORB manager - a helper class for accessing the POA and + /// registering objects. TAO_ORB_Manager orb_manager_; - // The ORB manager - a helper class for accessing the POA and - // registering objects. + /// File where the IOR of the server object is stored. FILE *ior_output_file_; - // File where the IOR of the server object is stored. + /// Used test the INS. char * ins_; - // Used test the INS. + /// Number of command line arguments. int argc_; - // Number of command line arguments. + /// The command line arguments. ACE_TCHAR **argv_; - // The command line arguments. }; #endif /* SERVER_I_H */ diff --git a/tests/Leader_Followers/Makefile.am b/tests/Leader_Followers/Makefile.am deleted file mode 100644 index 8e6746e9201..00000000000 --- a/tests/Leader_Followers/Makefile.am +++ /dev/null @@ -1,112 +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.Leader_Followers_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.Leader_Followers_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 \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Leader_Followers_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/Leader_Followers/client.cpp b/tests/Leader_Followers/client.cpp index 50085c4d683..a69ca775862 100644 --- a/tests/Leader_Followers/client.cpp +++ b/tests/Leader_Followers/client.cpp @@ -1,17 +1,17 @@ -// $Id$ - -// ================================================================ -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// See README. -// -// = AUTHOR -// Irfan Pyarali -// -// ================================================================ + +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * See README. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" @@ -21,8 +21,6 @@ #include "tao/Strategies/advanced_resource.h" -ACE_RCSID(Leader_Followers, client, "$Id$") - // Name of file contains ior. static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior"); diff --git a/tests/Leader_Followers/select_mt.conf b/tests/Leader_Followers/select_mt.conf index 8d22cd57f68..8c9ba3c2c58 100644 --- a/tests/Leader_Followers/select_mt.conf +++ b/tests/Leader_Followers/select_mt.conf @@ -1 +1,3 @@ +# $Id$ + static Advanced_Resource_Factory "-ORBreactortype select_mt" diff --git a/tests/Leader_Followers/server.cpp b/tests/Leader_Followers/server.cpp index 0154a90b7d0..ccc53a35c99 100644 --- a/tests/Leader_Followers/server.cpp +++ b/tests/Leader_Followers/server.cpp @@ -6,8 +6,6 @@ #include "tao/Strategies/advanced_resource.h" -ACE_RCSID(Leader_Followers, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); int number_of_event_loop_threads = 1; @@ -40,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Leader_Followers/test_i.cpp b/tests/Leader_Followers/test_i.cpp index 1a8c3d88221..b1e87f1c15a 100644 --- a/tests/Leader_Followers/test_i.cpp +++ b/tests/Leader_Followers/test_i.cpp @@ -3,8 +3,6 @@ #include "test_i.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Leader_Followers, test_i, "$Id$") - test_i::test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Leader_Followers/test_i.h b/tests/Leader_Followers/test_i.h index 74db1115a2b..175291ddca8 100644 --- a/tests/Leader_Followers/test_i.h +++ b/tests/Leader_Followers/test_i.h @@ -1,28 +1,27 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Leader_Followers/ -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Irfan Pyarali -// -// ============================================================================ +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "testS.h" +/** + * @class test_i + * + * @brief Simple test implementation. + */ class test_i : public POA_test { - // = TITLE - // Simple test implementation. - // public: + /// ctor. test_i (CORBA::ORB_ptr orb); - // ctor. // = The test interface methods. CORBA::ULong method (CORBA::ULong work); @@ -30,6 +29,6 @@ public: void shutdown (void); private: + /// The ORB. CORBA::ORB_var orb_; - // The ORB. }; diff --git a/tests/Leader_Followers/tp.conf b/tests/Leader_Followers/tp.conf index b996e118b39..b954c2c1707 100644 --- a/tests/Leader_Followers/tp.conf +++ b/tests/Leader_Followers/tp.conf @@ -1 +1,3 @@ +# $Id$ + static Advanced_Resource_Factory "-ORBreactortype tp" diff --git a/tests/LongDouble/LongDoubleTest.cpp b/tests/LongDouble/LongDoubleTest.cpp index 1980e729449..f3da93063ac 100644 --- a/tests/LongDouble/LongDoubleTest.cpp +++ b/tests/LongDouble/LongDoubleTest.cpp @@ -4,8 +4,6 @@ #include "LongDoubleTest.h" #include "Global.h" -ACE_RCSID (LongDoubleTest, LongDoubleTest, "$Id$") - LongDoubleTest::LongDoubleTest (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/LongDouble/Makefile.am b/tests/LongDouble/Makefile.am deleted file mode 100644 index bdc9eefc041..00000000000 --- a/tests/LongDouble/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.LongDoubleTest_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.LongDoubleTest_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Global.cpp \ - TestC.cpp \ - client.cpp \ - Global.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.LongDoubleTest_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Global.cpp \ - LongDoubleTest.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Global.h \ - LongDoubleTest.h - -server_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/LongDouble/client.cpp b/tests/LongDouble/client.cpp index c29a84d6511..02fdbebed49 100644 --- a/tests/LongDouble/client.cpp +++ b/tests/LongDouble/client.cpp @@ -5,9 +5,6 @@ #include "ace/Get_Opt.h" #include "ace/streams.h" - -ACE_RCSID (LongDoubleTest, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://server.ior"); int @@ -32,7 +29,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/tests/LongDouble/server.cpp b/tests/LongDouble/server.cpp index fd1680bd140..078a6750c43 100644 --- a/tests/LongDouble/server.cpp +++ b/tests/LongDouble/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (LongDoubleTest, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int @@ -32,7 +28,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/tests/LongUpcalls/AMI_Manager.cpp b/tests/LongUpcalls/AMI_Manager.cpp index 97bac4aba5b..a8a17609364 100644 --- a/tests/LongUpcalls/AMI_Manager.cpp +++ b/tests/LongUpcalls/AMI_Manager.cpp @@ -5,10 +5,6 @@ #include "AMI_Manager.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (LongUpcalls, - AMI_Manager, - "$Id$") - static void validate_connection (Test::Controller_ptr controller) { diff --git a/tests/LongUpcalls/Controller.cpp b/tests/LongUpcalls/Controller.cpp index cb65f340fcb..81eb5edbc9b 100644 --- a/tests/LongUpcalls/Controller.cpp +++ b/tests/LongUpcalls/Controller.cpp @@ -3,8 +3,6 @@ // #include "Controller.h" -ACE_RCSID(LongUpcalls, Controller, "$Id$") - Controller::Controller (void) : start_count_ (0) , finish_count_ (0) diff --git a/tests/LongUpcalls/Makefile.am b/tests/LongUpcalls/Makefile.am deleted file mode 100644 index 584f04c4fc0..00000000000 --- a/tests/LongUpcalls/Makefile.am +++ /dev/null @@ -1,205 +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.LongUpcalls_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -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) -GC $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.LongUpcalls_AMI_Client.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += ami_client - -ami_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -ami_client_SOURCES = \ - Controller.cpp \ - Manager_Handler.cpp \ - TestC.cpp \ - TestS.cpp \ - ami_client.cpp \ - Controller.h \ - Manager_Handler.h - -ami_client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.LongUpcalls_AMI_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += ami_server - -ami_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -ami_server_SOURCES = \ - AMI_Manager.cpp \ - TestC.cpp \ - TestS.cpp \ - ami_server.cpp \ - AMI_Manager.h - -ami_server_LDADD = \ - $(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_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 -endif BUILD_AMI - -## Makefile.LongUpcalls_Client.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += blocking_client - -blocking_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -blocking_client_SOURCES = \ - Controller.cpp \ - TestC.cpp \ - TestS.cpp \ - blocking_client.cpp \ - Controller.h - -blocking_client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.LongUpcalls_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += blocking_server - -blocking_server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -blocking_server_SOURCES = \ - Manager.cpp \ - TestC.cpp \ - TestS.cpp \ - blocking_server.cpp \ - Manager.h - -blocking_server_LDADD = \ - $(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_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 -endif BUILD_AMI - -## 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/LongUpcalls/Manager.cpp b/tests/LongUpcalls/Manager.cpp index d6fcbbea8cb..8bb3ea0fe05 100644 --- a/tests/LongUpcalls/Manager.cpp +++ b/tests/LongUpcalls/Manager.cpp @@ -5,10 +5,6 @@ #include "Manager.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (LongUpcalls, - Manager, - "$Id$") - static void validate_connection (Test::Controller_ptr controller) { diff --git a/tests/LongUpcalls/Manager_Handler.cpp b/tests/LongUpcalls/Manager_Handler.cpp index a38e2edbc36..3e8ea30e8ea 100644 --- a/tests/LongUpcalls/Manager_Handler.cpp +++ b/tests/LongUpcalls/Manager_Handler.cpp @@ -4,8 +4,6 @@ #include "Manager_Handler.h" -ACE_RCSID(LongUpcalls, Manager_Handler, "$Id$") - Manager_Handler::Manager_Handler (Test::Manager_ptr manager, Test::Controller_ptr controller) : manager_ (Test::Manager::_duplicate (manager)) diff --git a/tests/LongUpcalls/ami_client.cpp b/tests/LongUpcalls/ami_client.cpp index 6a0b42b598a..b5f1efc52a2 100644 --- a/tests/LongUpcalls/ami_client.cpp +++ b/tests/LongUpcalls/ami_client.cpp @@ -4,8 +4,6 @@ #include "Controller.h" #include "Manager_Handler.h" -ACE_RCSID(LongUpcalls, ami_client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -29,7 +27,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/tests/LongUpcalls/ami_server.cpp b/tests/LongUpcalls/ami_server.cpp index 3f0db7273cf..94164a1eb6a 100644 --- a/tests/LongUpcalls/ami_server.cpp +++ b/tests/LongUpcalls/ami_server.cpp @@ -3,8 +3,6 @@ #include "ace/Get_Opt.h" #include "AMI_Manager.h" -ACE_RCSID(LongUpcalls, ami_server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -28,7 +26,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/tests/LongUpcalls/blocking_client.cpp b/tests/LongUpcalls/blocking_client.cpp index aab93fa66ab..ceb750ed3b3 100644 --- a/tests/LongUpcalls/blocking_client.cpp +++ b/tests/LongUpcalls/blocking_client.cpp @@ -3,8 +3,6 @@ #include "ace/Get_Opt.h" #include "Controller.h" -ACE_RCSID(LongUpcalls, blocking_client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -28,7 +26,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/tests/LongUpcalls/blocking_server.cpp b/tests/LongUpcalls/blocking_server.cpp index 142d7fef6a3..128c91f59f1 100644 --- a/tests/LongUpcalls/blocking_server.cpp +++ b/tests/LongUpcalls/blocking_server.cpp @@ -3,8 +3,6 @@ #include "ace/Get_Opt.h" #include "Manager.h" -ACE_RCSID(LongUpcalls, blocking_server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -28,7 +26,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/tests/MProfile/Makefile.am b/tests/MProfile/Makefile.am deleted file mode 100644 index 519fa6b84d9..00000000000 --- a/tests/MProfile/Makefile.am +++ /dev/null @@ -1,112 +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.MProfile_Idl.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_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.MProfile_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 \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.MProfile_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.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/tests/MProfile/client.cpp b/tests/MProfile/client.cpp index e610b16c39a..f3f1dfeb84d 100644 --- a/tests/MProfile/client.cpp +++ b/tests/MProfile/client.cpp @@ -6,8 +6,6 @@ #include "ace/OS_NS_unistd.h" #include "testC.h" -ACE_RCSID(MT_Server, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int do_shutdown = 0; @@ -44,7 +42,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/tests/MProfile/server.cpp b/tests/MProfile/server.cpp index f9991fc9952..fa3c1874c6e 100644 --- a/tests/MProfile/server.cpp +++ b/tests/MProfile/server.cpp @@ -5,8 +5,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(MT_Client, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int @@ -30,7 +28,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/tests/MProfile/test_i.cpp b/tests/MProfile/test_i.cpp index b3f4772e9fa..9c6d464b6ab 100644 --- a/tests/MProfile/test_i.cpp +++ b/tests/MProfile/test_i.cpp @@ -2,8 +2,6 @@ #include "test_i.h" -ACE_RCSID(MT_Client, test_i, "$Id$") - Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)), val_ (1) diff --git a/tests/MProfile/test_i.h b/tests/MProfile/test_i.h index 07f971408ac..58cc6ea1bb9 100644 --- a/tests/MProfile/test_i.h +++ b/tests/MProfile/test_i.h @@ -1,37 +1,35 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Mprofile -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Carlos O'Ryan <coryan@uci.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Carlos O'Ryan <coryan@uci.edu> + */ +//============================================================================= + #ifndef TAO_MPROFILE_TEST_I_H #define TAO_MPROFILE_TEST_I_H #include "testS.h" +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb); - // ctor + /// ctor Simple_Server_i (void); - // ctor // = The Simple_Server methods. CORBA::Long remote_call (void); diff --git a/tests/MProfile_Connection_Timeout/Makefile.am b/tests/MProfile_Connection_Timeout/Makefile.am deleted file mode 100644 index 660cc9718c1..00000000000 --- a/tests/MProfile_Connection_Timeout/Makefile.am +++ /dev/null @@ -1,121 +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.MProfile_Connection_Timeout_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.MProfile_Connection_Timeout_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 \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.MProfile_Connection_Timeout_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.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_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 - -## 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/MProfile_Connection_Timeout/client.cpp b/tests/MProfile_Connection_Timeout/client.cpp index 596ae335751..df2e469c5f1 100644 --- a/tests/MProfile_Connection_Timeout/client.cpp +++ b/tests/MProfile_Connection_Timeout/client.cpp @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ #include "tao/IORManipulation/IORManip_Loader.h" @@ -8,10 +9,6 @@ #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" -ACE_RCSID(MProfile_Connection_Timeout, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int do_shutdown = 0; @@ -49,7 +46,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; } @@ -77,11 +74,11 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->string_to_object (name); // Get an object reference for the ORBs IORManipultion object! - CORBA::Object_ptr IORM = + CORBA::Object_var IORM = orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0); - TAO_IOP::TAO_IOR_Manipulation_ptr iorm = - TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM); + TAO_IOP::TAO_IOR_Manipulation_var iorm = + TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in ()); TAO_IOP::TAO_IOR_Manipulation::IORList iors (2); iors.length(2); diff --git a/tests/MProfile_Connection_Timeout/server.cpp b/tests/MProfile_Connection_Timeout/server.cpp index 7d7dfdb3feb..3fa9c78bea4 100644 --- a/tests/MProfile_Connection_Timeout/server.cpp +++ b/tests/MProfile_Connection_Timeout/server.cpp @@ -1,13 +1,10 @@ +// -*- C++ -*- // $Id$ #include "ace/Get_Opt.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(MProfile_Connection_Timeout, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = 0; int orb_run = 0; int @@ -34,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/tests/MProfile_Connection_Timeout/test_i.cpp b/tests/MProfile_Connection_Timeout/test_i.cpp index 81c92cbb04c..c9666c5d7ab 100644 --- a/tests/MProfile_Connection_Timeout/test_i.cpp +++ b/tests/MProfile_Connection_Timeout/test_i.cpp @@ -1,11 +1,8 @@ +// -*- C++ -*- // $Id$ #include "test_i.h" -ACE_RCSID(MProfile_Connection_Timeout, - test_i, - "$Id$") - // part of the famous caesium 133 atom transition for a // second. Cannot represent the last part since the value gets out of // range. diff --git a/tests/MProfile_Connection_Timeout/test_i.h b/tests/MProfile_Connection_Timeout/test_i.h index cb4554e8655..bd1c4cbe7e8 100644 --- a/tests/MProfile_Connection_Timeout/test_i.h +++ b/tests/MProfile_Connection_Timeout/test_i.h @@ -1,37 +1,35 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/MProfile_Connection_Timeout -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + */ +//============================================================================= + #ifndef TAO_MPROFILE_CONNECTION_TIMEOUT_TEST_I_H #define TAO_MPROFILE_CONNECTION_TIMEOUT_TEST_I_H #include "testS.h" +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb); - // ctor + /// ctor Simple_Server_i (void); - // ctor // = The Simple_Server methods. CORBA::ULongLong remote_call (void); diff --git a/tests/MProfile_Forwarding/Makefile.am b/tests/MProfile_Forwarding/Makefile.am deleted file mode 100644 index 4d80c6acbbb..00000000000 --- a/tests/MProfile_Forwarding/Makefile.am +++ /dev/null @@ -1,139 +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.MProfile_Forwarding_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.MProfile_Forwarding_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 \ - testC.cpp \ - Manager.h \ - Servant_Locator.h \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.MProfile_Forwarding_Manager.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += manager - -manager_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -manager_SOURCES = \ - Manager.cpp \ - Servant_Locator.cpp \ - testC.cpp \ - Manager.h \ - Servant_Locator.h \ - test_i.inl - -manager_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.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.MProfile_Forwarding_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_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/MProfile_Forwarding/Manager.cpp b/tests/MProfile_Forwarding/Manager.cpp index 21880114610..d4981d2deae 100644 --- a/tests/MProfile_Forwarding/Manager.cpp +++ b/tests/MProfile_Forwarding/Manager.cpp @@ -44,7 +44,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/tests/MProfile_Forwarding/Servant_Locator.cpp b/tests/MProfile_Forwarding/Servant_Locator.cpp index 4185fda90f6..5fa43c2d25c 100644 --- a/tests/MProfile_Forwarding/Servant_Locator.cpp +++ b/tests/MProfile_Forwarding/Servant_Locator.cpp @@ -1,31 +1,24 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/POA/Forwarding/Servant_Locator -// -// = FILENAME -// Servant_Locator.cpp -// -// = DESCRIPTION -// Implementation of MyFooServantLocator class , used with a POA -// having a NON_RETAIN policy. -// -// = AUTHOR -// Irfan Pyarali -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file Servant_Locator.cpp + * + * $Id$ + * + * Implementation of MyFooServantLocator class , used with a POA + * having a NON_RETAIN policy. + * + * + * @author Irfan Pyarali Michael Kircher + */ +//============================================================================= + #include "Servant_Locator.h" #include "ace/Log_Msg.h" #include "testC.h" #include "ace/OS_NS_string.h" - -ACE_RCSID(Forwarding, Servant_Locator, "$Id$") - Servant_Locator::Servant_Locator (CORBA::ORB_ptr orb_ptr) : orb_var_ (CORBA::ORB::_duplicate (orb_ptr)) diff --git a/tests/MProfile_Forwarding/Servant_Locator.h b/tests/MProfile_Forwarding/Servant_Locator.h index 112a61c7432..891d8ea1374 100644 --- a/tests/MProfile_Forwarding/Servant_Locator.h +++ b/tests/MProfile_Forwarding/Servant_Locator.h @@ -1,21 +1,18 @@ -// $Id$ -// ================================================================ -// -// = LIBRARY -// TAO/tests/POA/Forwarding/Servant_Locator -// -// = FILENAME -// Servant_Locator.h -// -// = DESCRIPTION -// Defines a MyFooServantLocator class , used with a POA having -// a NON_RETAIN policy -// -// = AUTHOR -// Irfan Pyarali -// -// ================================================================ +//============================================================================= +/** + * @file Servant_Locator.h + * + * $Id$ + * + * Defines a MyFooServantLocator class , used with a POA having + * a NON_RETAIN policy + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #ifndef _SERVANT_LOCATOR_H_ #define _SERVANT_LOCATOR_H_ @@ -24,11 +21,14 @@ #include "tao/PortableServer/ServantLocatorC.h" #include "tao/ORB.h" +/** + * @class Servant_Locator + * + * @brief This class is used by a POA with USE_SERVANT_MANAGER and + * NON_RETAIN policy. + */ class Servant_Locator : public PortableServer::ServantLocator { - // = TITLE - // This class is used by a POA with USE_SERVANT_MANAGER and - // NON_RETAIN policy. public: Servant_Locator (CORBA::ORB_ptr orb_ptr); @@ -36,29 +36,29 @@ public: ~Servant_Locator (); + /// This method is invoked by a POA whenever it receives a request + /// for MyFoo object that is not currently active. virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie); - // This method is invoked by a POA whenever it receives a request - // for MyFoo object that is not currently active. + /// This method is invoked whenever a MyFooServant completes a + /// request. virtual void postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant); - // This method is invoked whenever a MyFooServant completes a - // request. + /// To be removed.. void set (CORBA::Object_var obj); - // To be removed.. private: CORBA::ORB_var orb_var_; + /// To be removed CORBA::Object_var objref_; - // To be removed }; #endif /* _SERVANT_LOCATOR_H */ diff --git a/tests/MProfile_Forwarding/client.cpp b/tests/MProfile_Forwarding/client.cpp index 2864a422a4b..7d255007aa8 100644 --- a/tests/MProfile_Forwarding/client.cpp +++ b/tests/MProfile_Forwarding/client.cpp @@ -5,8 +5,6 @@ #include "ace/OS_NS_unistd.h" #include "testC.h" -ACE_RCSID(MT_Server, client, "$Id$") - const ACE_TCHAR *ior_input_file = 0; int @@ -30,7 +28,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/tests/MProfile_Forwarding/server.cpp b/tests/MProfile_Forwarding/server.cpp index 3b88b668292..405a6eca91a 100644 --- a/tests/MProfile_Forwarding/server.cpp +++ b/tests/MProfile_Forwarding/server.cpp @@ -5,8 +5,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(MT_Client, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int @@ -30,7 +28,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/tests/MProfile_Forwarding/test_i.cpp b/tests/MProfile_Forwarding/test_i.cpp index 4fb6535c3ab..65291139aa8 100644 --- a/tests/MProfile_Forwarding/test_i.cpp +++ b/tests/MProfile_Forwarding/test_i.cpp @@ -6,8 +6,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(MT_Client, test_i, "$Id$") - Simple_Server_i::Simple_Server_i (void) :orb_ (0) { diff --git a/tests/MProfile_Forwarding/test_i.h b/tests/MProfile_Forwarding/test_i.h index 69525a827ec..ba29a0b6941 100644 --- a/tests/MProfile_Forwarding/test_i.h +++ b/tests/MProfile_Forwarding/test_i.h @@ -1,37 +1,36 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Balachandran Natarajan -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Balachandran Natarajan + */ +//============================================================================= + #ifndef MPROFILE_FORWARDING_TEST_I_H #define MPROFILE_FORWARDING_TEST_I_H #include "testS.h" +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: Simple_Server_i (CORBA::ORB_ptr orb); // ctor + /// ctor Simple_Server_i (void); - // ctor // = The Simple_Server methods. void remote_call (void); diff --git a/tests/MT_BiDir/Client_Task.cpp b/tests/MT_BiDir/Client_Task.cpp index f3661e9aa95..24d1baf9ead 100644 --- a/tests/MT_BiDir/Client_Task.cpp +++ b/tests/MT_BiDir/Client_Task.cpp @@ -4,8 +4,6 @@ #include "Client_Task.h" -ACE_RCSID(Muxing, Client_Task, "Client_Task.cpp,v 1.1 2001/03/10 23:37:42 coryan Exp") - Client_Task::Client_Task (CORBA::ORB_ptr orb, ACE_Thread_Manager *thr_mgr) : ACE_Task_Base (thr_mgr) diff --git a/tests/MT_BiDir/Makefile.am b/tests/MT_BiDir/Makefile.am deleted file mode 100644 index 4d95482be7d..00000000000 --- a/tests/MT_BiDir/Makefile.am +++ /dev/null @@ -1,145 +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.MT_BiDir_Idl.am - -BUILT_SOURCES = \ - ReceiverC.cpp \ - ReceiverC.h \ - ReceiverC.inl \ - ReceiverS.cpp \ - ReceiverS.h \ - ReceiverS.inl - -CLEANFILES = \ - Receiver-stamp \ - ReceiverC.cpp \ - ReceiverC.h \ - ReceiverC.inl \ - ReceiverS.cpp \ - ReceiverS.h \ - ReceiverS.inl - -ReceiverC.cpp ReceiverC.h ReceiverC.inl ReceiverS.cpp ReceiverS.h ReceiverS.inl: Receiver-stamp - -Receiver-stamp: $(srcdir)/Receiver.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Receiver.idl - @touch $@ - -BUILT_SOURCES += \ - SenderC.cpp \ - SenderC.h \ - SenderC.inl \ - SenderS.cpp \ - SenderS.h \ - SenderS.inl - -CLEANFILES += \ - Sender-stamp \ - SenderC.cpp \ - SenderC.h \ - SenderC.inl \ - SenderS.cpp \ - SenderS.h \ - SenderS.inl - -SenderC.cpp SenderC.h SenderC.inl SenderS.cpp SenderS.h SenderS.inl: Sender-stamp - -Sender-stamp: $(srcdir)/Sender.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Sender.idl - @touch $@ - -noinst_HEADERS = \ - Receiver.idl \ - Sender.idl - -## Makefile.MT_BiDir_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_Task.cpp \ - ReceiverC.cpp \ - ReceiverS.cpp \ - Receiver_i.cpp \ - SenderC.cpp \ - client.cpp \ - Client_Task.h \ - Receiver_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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.MT_BiDir_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - ReceiverC.cpp \ - SenderC.cpp \ - SenderS.cpp \ - Sender_i.cpp \ - Server_Task.cpp \ - server.cpp \ - Sender_i.h \ - Server_Task.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/MT_BiDir/Receiver_i.cpp b/tests/MT_BiDir/Receiver_i.cpp index cf6b1a2c027..72b6bf4f7aa 100644 --- a/tests/MT_BiDir/Receiver_i.cpp +++ b/tests/MT_BiDir/Receiver_i.cpp @@ -3,10 +3,6 @@ // #include "Receiver_i.h" -ACE_RCSID(MT_BiDir, - Receiver_i, - "$Id$") - Receiver_i::Receiver_i (void) : message_count_ (0) , byte_count_ (0) diff --git a/tests/MT_BiDir/Sender_i.cpp b/tests/MT_BiDir/Sender_i.cpp index 131b21cd59d..35f2360528c 100644 --- a/tests/MT_BiDir/Sender_i.cpp +++ b/tests/MT_BiDir/Sender_i.cpp @@ -1,12 +1,8 @@ +// $Id$ + #include "Sender_i.h" #include "ace/Manual_Event.h" - -ACE_RCSID(MT_BiDir, - Sender_i, - "$Id$") - - Sender_i::Sender_i (CORBA::ULong no_clients, ACE_Manual_Event &event) : event_ (event) diff --git a/tests/MT_BiDir/Server_Task.cpp b/tests/MT_BiDir/Server_Task.cpp index fa16e325137..d095f295801 100644 --- a/tests/MT_BiDir/Server_Task.cpp +++ b/tests/MT_BiDir/Server_Task.cpp @@ -9,12 +9,6 @@ #include "tao/Transport_Cache_Manager.h" #include "ace/Manual_Event.h" - -ACE_RCSID (MT_BiDir, - Server_Task, - "Server_Task.cpp,v 1.1 2001/03/10 23:37:42 coryan Exp") - - Server_Task::Server_Task (Sender_i *sender, ACE_Manual_Event &event, int no_iterations, diff --git a/tests/MT_BiDir/client.cpp b/tests/MT_BiDir/client.cpp index 62b9bd177d6..abf16e115a9 100644 --- a/tests/MT_BiDir/client.cpp +++ b/tests/MT_BiDir/client.cpp @@ -7,8 +7,6 @@ #include "tao/AnyTypeCode/Any.h" #include "Client_Task.h" -ACE_RCSID(BiDirectional, client, "client.cpp,v 1.6 2001/03/30 20:11:05 bala Exp") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -32,7 +30,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/tests/MT_BiDir/server.cpp b/tests/MT_BiDir/server.cpp index f359a0cbb79..043ed95d566 100644 --- a/tests/MT_BiDir/server.cpp +++ b/tests/MT_BiDir/server.cpp @@ -10,12 +10,6 @@ #include "tao/Transport_Cache_Manager.h" #include "ace/Manual_Event.h" - -ACE_RCSID (MT_BirDir, - server, - "$Id$") - - const ACE_TCHAR *ior_output_file = 0; static int no_iterations = 10; static int no_clients = 2; @@ -49,7 +43,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/tests/MT_Client/Makefile.am b/tests/MT_Client/Makefile.am deleted file mode 100644 index 278c404f181..00000000000 --- a/tests/MT_Client/Makefile.am +++ /dev/null @@ -1,107 +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.MT_Client_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.MT_Client_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 \ - testC.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.MT_Client_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_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/MT_Client/client.cpp b/tests/MT_Client/client.cpp index e9326f57905..a717f92b9f7 100644 --- a/tests/MT_Client/client.cpp +++ b/tests/MT_Client/client.cpp @@ -5,8 +5,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(MT_Client, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 5; int niterations = 5; @@ -44,7 +42,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/tests/MT_Client/client_muxed.conf b/tests/MT_Client/client_muxed.conf index 05145bd0896..924b53fcb2a 100644 --- a/tests/MT_Client/client_muxed.conf +++ b/tests/MT_Client/client_muxed.conf @@ -1,3 +1,3 @@ # $Id$ -static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler MT -ORBTransportMuxStrategy MUXED" +static Client_Strategy_Factory "-ORBClientConnectionHandler MT -ORBTransportMuxStrategy MUXED" diff --git a/tests/MT_Client/client_muxed.conf.xml b/tests/MT_Client/client_muxed.conf.xml index ba4727350fc..a03048a0550 100644 --- a/tests/MT_Client/client_muxed.conf.xml +++ b/tests/MT_Client/client_muxed.conf.xml @@ -2,5 +2,5 @@ <!-- Converted from ./tests/MT_Client/client_muxed.conf by svcconf-convert.pl --> <ACE_Svc_Conf> <!-- $Id$ --> - <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler MT -ORBTransportMuxStrategy MUXED"/> + <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler MT -ORBTransportMuxStrategy MUXED"/> </ACE_Svc_Conf> diff --git a/tests/MT_Client/orb_creation.cpp b/tests/MT_Client/orb_creation.cpp index 1aaae1ef783..0c1b9ff0d51 100644 --- a/tests/MT_Client/orb_creation.cpp +++ b/tests/MT_Client/orb_creation.cpp @@ -5,8 +5,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(MT_Client, orb_creation, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 5; int niterations = 5; @@ -40,7 +38,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/tests/MT_Client/server.cpp b/tests/MT_Client/server.cpp index 7250c546583..cc915920a38 100644 --- a/tests/MT_Client/server.cpp +++ b/tests/MT_Client/server.cpp @@ -4,8 +4,6 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(MT_Client, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int @@ -29,7 +27,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/tests/MT_Client/test.idl b/tests/MT_Client/test.idl index cbb8054de28..1c92c90a571 100644 --- a/tests/MT_Client/test.idl +++ b/tests/MT_Client/test.idl @@ -11,7 +11,7 @@ interface Simple_Server /// Shutdown the server /** - * Provide a simple way to cleanup the test when it finishes + * Provide a simple way to cleanup the test when it finishes */ oneway void shutdown (); }; diff --git a/tests/MT_Client/test_i.cpp b/tests/MT_Client/test_i.cpp index ed136fa4fa4..3d7090b6bb2 100644 --- a/tests/MT_Client/test_i.cpp +++ b/tests/MT_Client/test_i.cpp @@ -6,8 +6,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(MT_Client, test_i, "$Id$") - void Simple_Server_i::test_method (void) { diff --git a/tests/MT_Client/test_i.h b/tests/MT_Client/test_i.h index e38a1d70ad0..a752d15c3ea 100644 --- a/tests/MT_Client/test_i.h +++ b/tests/MT_Client/test_i.h @@ -1,34 +1,32 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/MT_Client -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_MT_CLIENT_TEST_I_H #define TAO_MT_CLIENT_TEST_I_H #include "testS.h" +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb); - // ctor // = The Simple_Server methods. void test_method (void); diff --git a/tests/MT_NoUpcall_Client_Leader/MT_NoUpcall.mpc b/tests/MT_NoUpcall_Client_Leader/MT_NoUpcall.mpc new file mode 100644 index 00000000000..a11e11f20a6 --- /dev/null +++ b/tests/MT_NoUpcall_Client_Leader/MT_NoUpcall.mpc @@ -0,0 +1,48 @@ +// -*- MPC -*- +// $Id$ + + +project(*idl): taoidldefaults { + idlflags += -Sp + IDL_Files { + SharedIntf.idl + } + custom_only = 1 +} + +project(*Server): messaging, taoserver, threads { + exename = server + after += *idl + Source_Files { + SharedIntf_i.cpp + server.cpp + worker.cpp + chatter.cpp + police.cpp + } + Source_Files { + SharedIntfC.cpp + SharedIntfS.cpp + } + IDL_Files { + } +} + +project(*Client): messaging, taoserver, threads { + exename = client + after += *idl + Source_Files { + SharedIntf_i.cpp + client.cpp + worker.cpp + chatter.cpp + police.cpp + } + Source_Files { + SharedIntfC.cpp + SharedIntfS.cpp + } + IDL_Files { + } +} + diff --git a/tests/MT_NoUpcall_Client_Leader/README b/tests/MT_NoUpcall_Client_Leader/README new file mode 100644 index 00000000000..f8174c18bc2 --- /dev/null +++ b/tests/MT_NoUpcall_Client_Leader/README @@ -0,0 +1,29 @@ +// $Id$ + +The test simulates a case when an incomming requests is being detected while a +client-leader thread is waiting in the reactor event loop for its own reply. + +The server uses MT_NOUPCALL client connection handling strategy. The defect was +in the fact that while the above described incomming request was correctly not +being handled, the corresponding transport handle remained suspended. This +caused the reactor to exclude that handle from the read mask and it never gave +other followers a chance to read from that handle. Eventually, these requests +remained "ignored" + +The resolution is to resume the handle *and* notify the reactor when an +incomming requests is being detected, while a client-leader thread is waiting +in the reactor event loop for its own reply. Thus, if any follower threads are +available, they can pick it up and process it eventually. + +A rapidly increasing spin prevention back-off delay helps to mitigate the +negative influence of this solution over the processor utilization. + +Run the test by starting the server: + + ./server -ORBSvcConf mt_noupcall.conf + +And the client: + + ./client + +If any requests get "ignored" the server process will hang indefinitely. diff --git a/tests/MT_NoUpcall_Client_Leader/SharedIntf.idl b/tests/MT_NoUpcall_Client_Leader/SharedIntf.idl new file mode 100644 index 00000000000..0081a42b4d0 --- /dev/null +++ b/tests/MT_NoUpcall_Client_Leader/SharedIntf.idl @@ -0,0 +1,8 @@ +// $Id$ + +module Test_Idl { + interface SharedIntf { + void ping(); + oneway void farewell(); + }; +}; diff --git a/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp b/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp new file mode 100644 index 00000000000..4fcaa2aae6c --- /dev/null +++ b/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp @@ -0,0 +1,27 @@ +// $Id$ + +#include "SharedIntf_i.h" +#include "ace/Log_Priority.h" +#include "ace/OS_NS_unistd.h" + +Test_Idl_SharedIntf_i::Test_Idl_SharedIntf_i(CORBA::ORB_ptr orb) + : orb_ (orb) +{ +} + +Test_Idl_SharedIntf_i::~Test_Idl_SharedIntf_i(void) {} + +void Test_Idl_SharedIntf_i::ping () +{ + ACE_DEBUG((LM_DEBUG,"(%P|%t) Test_Idl_SharedIntf::ping - sleeping for 5 seconds\n")); + ACE_OS::sleep(5); + ACE_DEBUG((LM_DEBUG,"(%P|%t) Test_Idl_SharedIntf::ping - waking up\n")); +} + +void Test_Idl_SharedIntf_i::farewell () +{ + ACE_DEBUG((LM_INFO,"(%P|%t) farewell begins\n")); + this->orb_->shutdown (); + ACE_DEBUG((LM_INFO,"(%P|%t) farewell completes\n")); +} + diff --git a/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h b/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h new file mode 100644 index 00000000000..3926689bcd1 --- /dev/null +++ b/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h @@ -0,0 +1,25 @@ +// $Id$ + +#ifndef SHAREDINTF_I_H_ +#define SHAREDINTF_I_H_ + +#include "SharedIntfS.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +#pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +class Test_Idl_SharedIntf_i : public virtual POA_Test_Idl::SharedIntf +{ + public: + + Test_Idl_SharedIntf_i (CORBA::ORB_ptr orb); + virtual ~Test_Idl_SharedIntf_i (void); + + virtual void ping (); + virtual void farewell (); + private: + CORBA::ORB_ptr orb_; +}; + +#endif /* SHAREDINTF_I_H_ */ diff --git a/tests/MT_NoUpcall_Client_Leader/chatter.cpp b/tests/MT_NoUpcall_Client_Leader/chatter.cpp new file mode 100644 index 00000000000..6a9248bda6f --- /dev/null +++ b/tests/MT_NoUpcall_Client_Leader/chatter.cpp @@ -0,0 +1,93 @@ +// $Id$ + +#include "SharedIntf_i.h" +#include "worker.h" +#include "chatter.h" + +Chatter::Chatter (CORBA::ORB_ptr orb, const ACE_TCHAR *ior, ACE_Condition<ACE_Mutex>& cond) + : Worker (orb), + nrequests_ (0), + nreplies_ (0), + ior_ (ior), + cond_ (cond) +{ +} + +long +Chatter::nreplies (void) +{ + return this->nreplies_; +} + +long +Chatter::nrequests (void) +{ + return this->nrequests_; +} + +int +Chatter::svc (void) +{ + long nrq = nrequests (); + try + { + //sleep(1); + + // get server ior from file + CORBA::Object_var rawObject = orb_->string_to_object(ior_); + + Test_Idl::SharedIntf_var intf_var = + Test_Idl::SharedIntf::_narrow(rawObject.in()); + + if (CORBA::is_nil (intf_var.in ())) + ACE_ERROR_RETURN ((LM_ERROR, "Nil reference <%s>\n", ior_), -1); + + // make call on server + ACE_DEBUG((LM_INFO,"(%P|%t) Chatter[%d] started for %s\n", nrq, ior_)); + nrequests_++; + intf_var->ping(); + nreplies_++; + + ACE_DEBUG((LM_INFO,"(%P|%t) Chatter[%d] completed for %s\n", nrq, ior_)); + cond_.signal(); + return 0; + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + ACE_DEBUG((LM_INFO,"(%P|%t) Chatter[%d] %p for %s\n", nrq, "failed", ior_)); + } + return -1; +} + +int +Chatter::farewell () +{ + try + { + ACE_DEBUG((LM_INFO,"(%P|%t) Farewell requested for %s\n", ior_)); + + // get server ior from file + CORBA::Object_var rawObject = orb_->string_to_object( ior_); + + Test_Idl::SharedIntf_var intf_var = + Test_Idl::SharedIntf::_narrow(rawObject.in()); + + if (CORBA::is_nil (intf_var.in ())) + ACE_ERROR_RETURN ((LM_ERROR, "Nil reference <%s>\n", ior_), -1); + + // make call on server + ACE_DEBUG((LM_INFO,"(%P|%t) farewell START for %s\n", ior_)); + intf_var->farewell(); + + ACE_DEBUG((LM_INFO,"(%P|%t) farewell COMPLETE for %s\n", ior_)); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + ACE_DEBUG((LM_INFO,"(%P|%t) %p for %s\n", "farewell FAILED", ior_)); + } + return 0; +} + + diff --git a/tests/MT_NoUpcall_Client_Leader/chatter.h b/tests/MT_NoUpcall_Client_Leader/chatter.h new file mode 100644 index 00000000000..8e5a313a0fa --- /dev/null +++ b/tests/MT_NoUpcall_Client_Leader/chatter.h @@ -0,0 +1,26 @@ +// $Id$ + +#if !defined( CHATTER_H) +#define CHATTER_H + +#include "worker.h" + +#include "ace/Condition_T.h" +#include "ace/Mutex.h" + +class Chatter : public Worker +{ +public: + Chatter (CORBA::ORB_ptr orb, const ACE_TCHAR *ior, ACE_Condition<ACE_Mutex>& cond); + virtual int svc (void); + int farewell (); + long nrequests (void); + long nreplies (void); +public: + long nrequests_; + long nreplies_; +private: + const ACE_TCHAR* ior_; + ACE_Condition<ACE_Mutex>& cond_; +}; +#endif /* CHATTER_H */ diff --git a/tests/MT_NoUpcall_Client_Leader/client.cpp b/tests/MT_NoUpcall_Client_Leader/client.cpp new file mode 100644 index 00000000000..fafa60c74d1 --- /dev/null +++ b/tests/MT_NoUpcall_Client_Leader/client.cpp @@ -0,0 +1,167 @@ +// $Id$ + +#include "SharedIntf_i.h" +#include "worker.h" +#include "chatter.h" +#include "police.h" + +#include "ace/SString.h" +#include "ace/Get_Opt.h" + +const ACE_TCHAR *ior_output_file = ACE_TEXT ("client.ior"); +int nr_threads = 1; + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("t:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 't': + nr_threads = ACE_OS::atoi(get_opts.opt_arg ()); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-t threads " + "\n", + argv [0]), + -1); + } + // Indicates successful parsing of the command line + return 0; +} + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + CORBA::ORB_var orb_; + int result = 0; + + try + { + ACE_DEBUG((LM_INFO,"(%P|%t) START OF CLIENT TEST\n")); + + orb_ = CORBA::ORB_init (argc, argv, "myorb-client"); + + if (parse_args (argc, argv) != 0) + return 1; + + CORBA::Object_var poa_object = + orb_->resolve_initial_references ("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in()); + + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (); + PortableServer::POA_var poa = root_poa; + + poa_manager->activate (); + + // Creating the monitorable servant and activating it + // + Test_Idl_SharedIntf_i* intf_i = new Test_Idl_SharedIntf_i (orb_.in()); + + PortableServer::ServantBase_var base_var = intf_i; + PortableServer::ObjectId_var intfId_var = + poa->activate_object (base_var.in()); + + CORBA::Object_var obj_var = + poa->id_to_reference (intfId_var.in()); + + Test_Idl::SharedIntf_var intf_var = + Test_Idl::SharedIntf::_narrow (obj_var.in()); + + // Creating stringified IOR of the servant and writing it to a file. + // + CORBA::String_var intfString_var = + orb_->object_to_string (intf_var.in()); + + // Output the IOR to the <ior_output_file> + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s\n", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", intfString_var.in ()); + ACE_OS::fclose (output_file); + + ACE_DEBUG ((LM_INFO,"(%P|%t) client IOR to %s\n", ior_output_file)); + + // Running ORB in separate thread + Worker worker (orb_.in ()); + if (worker.activate (THR_NEW_LWP | THR_JOINABLE, nr_threads) != 0) + ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", + "Cannot activate client threads"), -1); + + ACE_DEBUG((LM_INFO,"(%P|%t) Await server initialization\n")); + poll ("./server.ior"); + ACE_DEBUG((LM_INFO,"(%P|%t) Server IOR file was detected\n")); + + ACE_Mutex mutex; + ACE_Condition<ACE_Mutex> stop_condition (mutex); + + const ACE_TCHAR* serverior = ACE_TEXT("file://server.ior"); + Chatter worker2 (orb_.in (), serverior, stop_condition); + + if (worker2.activate (THR_NEW_LWP | THR_JOINABLE, 2) != 0) + ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", + "Cannot activate chatty client threads"), -1); + + + do { + stop_condition.wait (); + ACE_DEBUG((LM_INFO,"(%P|%t) So far, %d/%d requests/replies have been processed\n", + worker2.nrequests (), worker2.nreplies ())); + } + while (worker2.nreplies () < 2); + + // Kill the peer + { + CORBA::Object_var rawObject = orb_->string_to_object( serverior); + + Test_Idl::SharedIntf_var intf_var = + Test_Idl::SharedIntf::_narrow(rawObject.in()); + + if (CORBA::is_nil (intf_var.in ())) + ACE_ERROR_RETURN ((LM_ERROR, "Nil reference <%s>\n", serverior), -1); + + // make call on server + ACE_DEBUG((LM_INFO,"(%P|%t) farewell START for %s\n", serverior)); + + intf_var->farewell(); + + ACE_DEBUG((LM_INFO,"(%P|%t) farewell COMPLETE for %s\n", serverior)); + } + + ACE_DEBUG((LM_INFO,"(%P|%t) END OF CLIENT TEST\n")); + + orb_.in()->shutdown (); + + worker.thr_mgr()->wait (); + + root_poa->destroy(1,1); + + orb_->destroy(); + + ACE_DEBUG((LM_INFO,"(%P|%t) Client Test %C\n", + (worker2.nrequests() == worker2.nreplies())?"succeeded":"failed")); + + result = (worker2.nrequests_ == worker2.nreplies_)? 0 : -1; + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Error: Exception caught:"); + } + + ACE_OS::unlink ("client.ior"); + return result; +} + diff --git a/tests/MT_NoUpcall_Client_Leader/mt_noupcall.conf b/tests/MT_NoUpcall_Client_Leader/mt_noupcall.conf new file mode 100644 index 00000000000..f503eb428e8 --- /dev/null +++ b/tests/MT_NoUpcall_Client_Leader/mt_noupcall.conf @@ -0,0 +1,3 @@ +# $Id$ + +static Client_Strategy_Factory "-ORBClientconnectionHandler mt_noupcall" diff --git a/tests/MT_NoUpcall_Client_Leader/police.cpp b/tests/MT_NoUpcall_Client_Leader/police.cpp new file mode 100644 index 00000000000..17eb4ea649e --- /dev/null +++ b/tests/MT_NoUpcall_Client_Leader/police.cpp @@ -0,0 +1,13 @@ +// $Id$ + +#include "ace/OS_NS_sys_stat.h" +#include "ace/OS_NS_unistd.h" + +void poll (const char* filename) +{ + ACE_stat st; + for (int r=1; r != 0; r = ACE_OS::stat (filename, &st)) + { + ACE_OS::sleep (1); + } +} diff --git a/tests/MT_NoUpcall_Client_Leader/police.h b/tests/MT_NoUpcall_Client_Leader/police.h new file mode 100644 index 00000000000..af3144b1292 --- /dev/null +++ b/tests/MT_NoUpcall_Client_Leader/police.h @@ -0,0 +1,3 @@ +// $Id$ + +void poll (const char* filename); diff --git a/tests/MT_NoUpcall_Client_Leader/run_test.pl b/tests/MT_NoUpcall_Client_Leader/run_test.pl new file mode 100755 index 00000000000..d64c2393165 --- /dev/null +++ b/tests/MT_NoUpcall_Client_Leader/run_test.pl @@ -0,0 +1,91 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +my $client_conf = $server->LocalFile ("mt_noupcall$PerlACE::svcconf_ext"); +my $server_conf = $server->LocalFile ("mt_noupcall$PerlACE::svcconf_ext"); + +$debug_level = '0'; + +foreach $i (@ARGV) { + if ($i eq '-d') { + $debug_level = '10'; + } +} + +my $server_iorbase = "server.ior"; +my $client_iorbase = "client.ior"; +my $server_iorfile = $server->LocalFile ($server_iorbase); +my $client_iorfile = $client->LocalFile ($client_iorbase); + +$server->DeleteFile($server_iorbase); +$client->DeleteFile($client_iorbase); + +$SV = $server->CreateProcess ("server", + "-ORBDebugLevel $debug_level -ORBSvcConf $server_conf " . + "-t 1"); + +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; +} + +if ($server->WaitForFileTimed ($server_iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$CL = $client->CreateProcess ("client", "-t 1"); + +$client_status = $CL->Spawn (); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +if ($client->WaitForFileTimed ($client_iorbase, + $client->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +print "INFO: Awaiting server ...\n"; + +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval() + 30); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + $status = 1; +} + +print "INFO: Awaiting client ...\n"; + +$client_status = $CL->WaitKill ($client->ProcessStartWaitInterval()); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; + $status = 1; +} + +$server->DeleteFile($server_iorfile); +$client->DeleteFile($client_iorfile); + +print "INFO: Test succeeded\n"; +exit 0; + diff --git a/tests/MT_NoUpcall_Client_Leader/server.cpp b/tests/MT_NoUpcall_Client_Leader/server.cpp new file mode 100644 index 00000000000..b8e2e942dbc --- /dev/null +++ b/tests/MT_NoUpcall_Client_Leader/server.cpp @@ -0,0 +1,144 @@ +// $Id$ + +#include "SharedIntf_i.h" +#include "worker.h" +#include "chatter.h" +#include "police.h" + +#include "ace/SString.h" +#include "ace/Get_Opt.h" + +const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior"); +int nr_threads = 1; + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("t:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 't': + nr_threads = ACE_OS::atoi(get_opts.opt_arg ()); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-t threads " + "\n", + argv [0]), + -1); + } + // Indicates successful parsing of the command line + return 0; +} + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + CORBA::ORB_var orb_; + int result = 0; + + try + { + ACE_DEBUG((LM_INFO,"(%P|%t) START OF SERVER TEST\n")); + + orb_ = CORBA::ORB_init (argc, argv, "myorb-server"); + + if (parse_args (argc, argv) != 0) + return 1; + + CORBA::Object_var poa_object = + orb_->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in()); + + PortableServer::POAManager_var poa_manager = + root_poa->the_POAManager (); + PortableServer::POA_var poa = root_poa; + + poa_manager->activate (); + + ACE_DEBUG((LM_INFO,"(%P|%t) ORB initialized\n")); + + // Creating the servant and activating it + // + Test_Idl_SharedIntf_i* intf_i = new Test_Idl_SharedIntf_i(orb_.in()); + + PortableServer::ServantBase_var base_var = intf_i; + PortableServer::ObjectId_var intfId_var = + poa->activate_object(base_var.in()); + + CORBA::Object_var obj_var = + poa->id_to_reference(intfId_var.in()); + + Test_Idl::SharedIntf_var intf_var = + Test_Idl::SharedIntf::_narrow(obj_var.in()); + + // Creating stringified IOR of the servant and writing it to a file. + // + CORBA::String_var intfString_var = + orb_->object_to_string(intf_var.in()); + + // Output the IOR to the <ior_output_file> + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s\n", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", intfString_var.in ()); + ACE_OS::fclose (output_file); + + ACE_DEBUG((LM_INFO,"(%P|%t) server IOR to %s\n", + ior_output_file)); + + // Running ORB in separate thread + Worker worker (orb_.in ()); + if (worker.activate (THR_NEW_LWP | THR_JOINABLE, nr_threads) != 0) + ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "Cannot activate server thread(s)"), -1); + + ACE_DEBUG((LM_INFO,"(%P|%t) Await client initialization\n")); + poll ("./client.ior"); + ACE_DEBUG((LM_INFO,"(%P|%t) Client IOR file was detected\n")); + + ACE_Mutex mutex; + ACE_Condition<ACE_Mutex> stop_condition (mutex); + + Chatter worker2 (orb_.in (), ACE_TEXT("file://client.ior"), stop_condition); + if (worker2.activate (THR_NEW_LWP | THR_JOINABLE, 1) != 0) + { + ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "Cannot activate chatty client threads"), -1); + } + + do { + stop_condition.wait (); + ACE_DEBUG((LM_INFO,"(%P|%t) So far, %d/%d requests/replies have been processed\n", + worker2.nrequests (), worker2.nreplies ())); + } + while (worker2.nrequests () < 1); + + worker.thr_mgr()->wait (); + + root_poa->destroy(1, 1); + + orb_->destroy(); + + ACE_DEBUG((LM_INFO,"(%P|%t) Server Test %C\n", + (worker2.nrequests() == worker2.nreplies())?"succeeded":"failed")); + result = (worker2.nrequests() == worker2.nreplies())? 0 : -1; + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Error: Exception caught:"); + } + + ACE_OS::unlink ("server.ior"); + return result; +} + diff --git a/tests/MT_NoUpcall_Client_Leader/worker.cpp b/tests/MT_NoUpcall_Client_Leader/worker.cpp new file mode 100644 index 00000000000..5c5041b6418 --- /dev/null +++ b/tests/MT_NoUpcall_Client_Leader/worker.cpp @@ -0,0 +1,23 @@ +// $Id$ + +#include "worker.h" + +Worker::Worker (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + +int +Worker::svc (void) +{ + ACE_DEBUG((LM_INFO,"(%P|%t) Running ORB in a separate thread\n")); + try + { + this->orb_->run (); + } + catch (const CORBA::Exception&) + { + } + return 0; +} + diff --git a/tests/MT_NoUpcall_Client_Leader/worker.h b/tests/MT_NoUpcall_Client_Leader/worker.h new file mode 100644 index 00000000000..55146024151 --- /dev/null +++ b/tests/MT_NoUpcall_Client_Leader/worker.h @@ -0,0 +1,32 @@ +// $Id$ + +#if !defined( WORKER_H) +#define WORKER_H + +#include /**/ "ace/pre.h" +#include "tao/corba.h" +#include "ace/Task.h" + +class Worker : public ACE_Task_Base +{ + // = TITLE + // Run a server thread + // + // = DESCRIPTION + // Use the ACE_Task_Base class to run server threads + // +public: + Worker (CORBA::ORB_ptr orb); + // ctor + + virtual int svc (void); + // The thread entry point. + +public: + // The orb + CORBA::ORB_var orb_; +}; + +#include /**/ "ace/post.h" + +#endif /* WORKER_H */ diff --git a/tests/MT_Server/Makefile.am b/tests/MT_Server/Makefile.am deleted file mode 100644 index 92ee4bc5eca..00000000000 --- a/tests/MT_Server/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.MT_Server_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.MT_Server_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 \ - testC.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.MT_Server_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_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/MT_Server/client.cpp b/tests/MT_Server/client.cpp index bbd7c0fbf61..e95c34b2f64 100644 --- a/tests/MT_Server/client.cpp +++ b/tests/MT_Server/client.cpp @@ -4,8 +4,6 @@ #include "ace/Task.h" #include "testC.h" -ACE_RCSID(MT_Server, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 5; int do_shutdown = 0; @@ -41,7 +39,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/tests/MT_Server/server.cpp b/tests/MT_Server/server.cpp index ffb6c640744..ea6351e2bdf 100644 --- a/tests/MT_Server/server.cpp +++ b/tests/MT_Server/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(MT_Server, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int nthreads = 4; @@ -36,18 +34,17 @@ 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; } +/** + * Run a server thread + * + * Use the ACE_Task_Base class to run server threads + */ class Worker : public ACE_Task_Base { - // = TITLE - // Run a server thread - // - // = DESCRIPTION - // Use the ACE_Task_Base class to run server threads - // public: Worker (CORBA::ORB_ptr orb); // ctor diff --git a/tests/MT_Server/test_i.cpp b/tests/MT_Server/test_i.cpp index 80aa987cc4a..c42d5905cc6 100644 --- a/tests/MT_Server/test_i.cpp +++ b/tests/MT_Server/test_i.cpp @@ -8,8 +8,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(MT_Server, test_i, "$Id$") - CORBA::Long Simple_Server_i::test_method (CORBA::Long x) { diff --git a/tests/MT_Server/test_i.h b/tests/MT_Server/test_i.h index d1113ac50d7..aa98bce6909 100644 --- a/tests/MT_Server/test_i.h +++ b/tests/MT_Server/test_i.h @@ -1,34 +1,32 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/MT_Server -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_MT_SERVER_TEST_I_H #define TAO_MT_SERVER_TEST_I_H #include "testS.h" +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb); - // ctor // = The Simple_Server methods. CORBA::Long test_method (CORBA::Long x); @@ -36,8 +34,8 @@ public: void shutdown (void); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB }; #if defined(__ACE_INLINE__) diff --git a/tests/MT_Timeout/Client_Task.cpp b/tests/MT_Timeout/Client_Task.cpp index a90d57ecc50..34ab2dbfc26 100644 --- a/tests/MT_Timeout/Client_Task.cpp +++ b/tests/MT_Timeout/Client_Task.cpp @@ -8,8 +8,6 @@ #include "tao/Messaging/Messaging.h" #include "tao/AnyTypeCode/Any.h" -ACE_RCSID(MT_Timeout, Client_Task, "$Id$") - Client_Task::Client_Task (CORBA::ORB_ptr orb, Test::Sleep_Service_ptr sleep_service, int iterations, diff --git a/tests/MT_Timeout/Client_Task.h b/tests/MT_Timeout/Client_Task.h index 62d419c2ba1..d5ba569ca0d 100644 --- a/tests/MT_Timeout/Client_Task.h +++ b/tests/MT_Timeout/Client_Task.h @@ -40,7 +40,7 @@ public: CORBA::ULong sleep_time, CORBA::ULong timeout); - /// Return the total number of sucessful calls + /// Return the total number of successful calls int successful_calls (void) const; /// Return the total number of timed out calls diff --git a/tests/MT_Timeout/Makefile.am b/tests/MT_Timeout/Makefile.am deleted file mode 100644 index 395c93826e9..00000000000 --- a/tests/MT_Timeout/Makefile.am +++ /dev/null @@ -1,122 +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.MT_Timeout_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.MT_Timeout_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_Task.cpp \ - TestC.cpp \ - client.cpp \ - Client_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.MT_Timeout_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Server_Task.cpp \ - Sleep_Service.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Server_Task.h \ - Sleep_Service.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## 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/MT_Timeout/Server_Task.cpp b/tests/MT_Timeout/Server_Task.cpp index 3bd6359ebc3..a7a022e9e91 100644 --- a/tests/MT_Timeout/Server_Task.cpp +++ b/tests/MT_Timeout/Server_Task.cpp @@ -4,8 +4,6 @@ #include "Server_Task.h" -ACE_RCSID(MT_Timeout, Server_Task, "$Id$") - Server_Task::Server_Task (ACE_Thread_Manager *thr_mgr, CORBA::ORB_ptr orb, const ACE_Time_Value &running_time) diff --git a/tests/MT_Timeout/Sleep_Service.cpp b/tests/MT_Timeout/Sleep_Service.cpp index 4af378547bc..fa61211d0f2 100644 --- a/tests/MT_Timeout/Sleep_Service.cpp +++ b/tests/MT_Timeout/Sleep_Service.cpp @@ -4,8 +4,6 @@ #include "Sleep_Service.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(MT_Timeout, Sleep_Service, "$Id$") - Sleep_Service::Sleep_Service (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/MT_Timeout/client.cpp b/tests/MT_Timeout/client.cpp index 846b887b646..f6ef9ebbff2 100644 --- a/tests/MT_Timeout/client.cpp +++ b/tests/MT_Timeout/client.cpp @@ -3,8 +3,6 @@ #include "Client_Task.h" #include "ace/Get_Opt.h" -ACE_RCSID(Client_Leaks, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int iterations = 500; int threads = 4; @@ -41,7 +39,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/tests/MT_Timeout/server.cpp b/tests/MT_Timeout/server.cpp index da675d78db1..07af58ea28d 100644 --- a/tests/MT_Timeout/server.cpp +++ b/tests/MT_Timeout/server.cpp @@ -4,8 +4,6 @@ #include "Server_Task.h" #include "ace/Get_Opt.h" -ACE_RCSID(MT_Timeout, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -29,7 +27,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/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index c302a10bcef..00000000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,241 +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 = \ - AMH_Exceptions \ - AMH_Oneway \ - AMI \ - AMI_Buffering \ - AMI_Timeouts \ - Abstract_Interface \ - Any \ - BiDirectional \ - BiDirectional_DelayedUpcall \ - BiDirectional_MultipleORB \ - BiDirectional_NestedUpcall \ - Big_AMI \ - Big_Oneways \ - Big_Reply \ - Big_Request_Muxing \ - Big_Twoways \ - Blocking_Sync_None \ - Bug_1020_Basic_Regression \ - Bug_1020_Regression \ - Bug_1254_Regression \ - Bug_1269_Regression \ - Bug_1270_Regression \ - Bug_1330_Regression \ - Bug_1361_Regression \ - Bug_1383_Regression \ - Bug_1476_Regression \ - Bug_1476_Test \ - Bug_1482_Regression \ - Bug_1495_Regression \ - Bug_1535_Regression \ - Bug_1551_Regression \ - Bug_1568_Regression \ - Bug_1627_Regression \ - Bug_1635_Regression \ - Bug_1636_Regression \ - Bug_1639_Regression \ - Bug_1670_Regression \ - Bug_1676_Regression \ - Bug_1693_Test \ - Bug_1812_Regression \ - Bug_1813_Regression \ - Bug_1869_Regression \ - Bug_1904_Regression \ - Bug_2084_Regression \ - Bug_2085_Regression \ - Bug_2119_Regression \ - Bug_2122_Regression \ - Bug_2124_Regression \ - Bug_2126_Regression \ - Bug_2134_Regression \ - Bug_2144_Regression \ - Bug_2174_Regression \ - Bug_2183_Regression \ - Bug_2186_Regression \ - Bug_2188_Regression \ - Bug_2201_Regression \ - Bug_2222_Regression \ - Bug_2234_Regression \ - Bug_2243_Regression \ - Bug_2289_Regression \ - Bug_2319_Regression \ - Bug_2328_Regression \ - Bug_2345_Regression \ - Bug_2349_Regression \ - Bug_2356_Regression \ - Bug_2375_Regression \ - Bug_2399_Regression \ - Bug_2417_Regression \ - Bug_2419_Regression \ - Bug_2424_Regression \ - Bug_2429_Regression \ - Bug_2494_Regression \ - Bug_2503_Regression \ - Bug_2542_Regression \ - Bug_2543_Regression \ - Bug_2549_Regression \ - Bug_2560_Regression \ - Bug_2593_Regression \ - Bug_2595_Regression \ - Bug_2654_Regression \ - Bug_2669_Regression \ - Bug_2677_Regression \ - Bug_2678_Regression \ - Bug_2683_Regression \ - Bug_2702_Regression \ - Bug_2734_Regression \ - Bug_2735_Regression \ - Bug_2768_Regression \ - Bug_2791_Regression \ - Bug_2792_Regression \ - Bug_2795_Regression \ - Bug_2804_Regression \ - Bug_2805_Regression \ - Bug_2809_Regression \ - Bug_2826_Regression \ - Bug_2844_Regression \ - Bug_2869_Regression \ - Bug_2909_Regression \ - Bug_2918_Regression \ - Bug_2935_Regression \ - Bug_2936_Regression \ - Bug_2953_Regression \ - Bug_2966_Regression \ - Bug_3000_Regression \ - Bug_3042_Regression \ - Bug_3108_Regression \ - Bug_3163_Regression \ - Bug_3171_Regression \ - Bug_3198_Regression \ - Bug_3251_Regression \ - Bug_3276_Regression \ - Bug_3299_Regression \ - Bug_3311_Regression \ - Bug_3315_Regression \ - Bug_3321_Regression \ - Bug_933_Regression \ - CDR \ - COIOP \ - CORBA_e_Implicit_Activation \ - CSD_Collocation \ - CSD_Strategy_Tests \ - Cache_Growth_Test \ - CallbackTest \ - Client_Leaks \ - CodeSets \ - Codec \ - Collocated_Forwarding \ - Collocation \ - CollocationLockup \ - Collocation_Exception_Test \ - Collocation_Oneway_Tests \ - Collocation_Opportunities \ - Collocation_Tests \ - Compression \ - Connect_Strategy_Test \ - Connection_Failure \ - Connection_Purging \ - Connection_Timeout \ - Crash_On_Write \ - Crashed_Callback \ - DII_AMI_Forward \ - DII_Collocation_Tests \ - DIOP \ - DLL_ORB \ - DSI_AMH \ - DSI_AMI_Gateway \ - DSI_Gateway \ - DiffServ \ - DynAny_Test \ - DynUnion_Test \ - Explicit_Event_Loop \ - Exposed_Policies \ - FL_Cube \ - Faults \ - File_IO \ - Forwarding \ - GIOP_Fragments \ - HandleExhaustion \ - Hang_Shutdown \ - Hello \ - ICMG_Any_Bug \ - IDL_Test \ - IORManipulation \ - IOR_Endpoint_Hostnames \ - IPV6 \ - InterOp-Naming \ - Leader_Followers \ - LongDouble \ - LongUpcalls \ - MProfile \ - MProfile_Connection_Timeout \ - MProfile_Forwarding \ - MT_BiDir \ - MT_Client \ - MT_Server \ - MT_Timeout \ - Monitor \ - Multiple \ - Multiple_Inheritance \ - Muxed_GIOP_Versions \ - Muxing \ - Native_Exceptions \ - NestedUpcall \ - Nested_Event_Loop \ - Nested_Upcall_Crash \ - No_Server_MT_Connect_Test \ - OBV \ - ORB_Local_Config \ - ORB_destroy \ - ORB_init \ - ORB_shutdown \ - ORT \ - Object_Loader \ - Objref_Sequence_Test \ - OctetSeq \ - Ondemand_Write \ - Oneway_Buffering \ - Oneway_Send_Timeouts \ - Oneway_Timeouts \ - Oneways_Invoking_Twoways \ - Optimized_Connection \ - POA \ - Parallel_Connect_Strategy \ - Param_Test \ - Permanent_Forward \ - Policies \ - Portable_Interceptors \ - QtTests \ - Queued_Message_Test \ - RTCORBA \ - RTScheduling \ - Reliable_Oneways \ - Sequence_Unit_Tests \ - Servant_To_Reference_Test \ - Server_Connection_Purging \ - Server_Leaks \ - Server_Port_Zero \ - Single_Read \ - Smart_Proxies \ - Stack_Recursion \ - Strategies \ - Timed_Buffered_Oneways \ - Timeout \ - TransportCurrent \ - Two_Objects \ - Typedef_String_Array \ - UNKNOWN_Exception \ - Xt_Stopwatch \ - objref_comparison_test - diff --git a/tests/Monitor/Makefile.am b/tests/Monitor/Makefile.am deleted file mode 100644 index 7c75b0fba7f..00000000000 --- a/tests/Monitor/Makefile.am +++ /dev/null @@ -1,13 +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 = \ - Marshal_Buffer - diff --git a/tests/Monitor/Marshal_Buffer/Makefile.am b/tests/Monitor/Marshal_Buffer/Makefile.am deleted file mode 100644 index c51cdce2d00..00000000000 --- a/tests/Monitor/Marshal_Buffer/Makefile.am +++ /dev/null @@ -1,119 +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.marshal_buffer_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.marshal_buffer_client.am - -if BUILD_EXCEPTIONS -if !BUILD_WINCE - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - testC.h \ - testC.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Monitor.la \ - $(ACE_BUILDDIR)/ace/Monitor_Control/libACE_Monitor_Control.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL_Parser.la \ - $(TAO_BUILDDIR)/tao/ETCL/libTAO_ETCL.la \ - $(ACE_BUILDDIR)/ace/ETCL/libACE_ETCL.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_WINCE -endif BUILD_EXCEPTIONS - -## Makefile.marshal_buffer_server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -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)/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/Multiple/Collocation_Tester.cpp b/tests/Multiple/Collocation_Tester.cpp index 4e75b286b50..55a5b85d921 100644 --- a/tests/Multiple/Collocation_Tester.cpp +++ b/tests/Multiple/Collocation_Tester.cpp @@ -3,8 +3,6 @@ #include "Collocation_Tester.h" #include "ace/OS_NS_string.h" -ACE_RCSID (tests, Collocation_Tester, "$Id$") - const char *Quote::top = "Ciao"; const char *Quote::left = "Hola"; const char *Quote::right = "Hello"; diff --git a/tests/Multiple/Collocation_Tester.h b/tests/Multiple/Collocation_Tester.h index e220b07b466..64c3a0c0dad 100644 --- a/tests/Multiple/Collocation_Tester.h +++ b/tests/Multiple/Collocation_Tester.h @@ -1,21 +1,17 @@ -//$Id$ -// -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Multiple -// -// = FILENAME -// Collocation_Tester.h -// -// = DESCRIPTION -// This file contains the class that tests the TAO's collocation -// mechanism. -// -// = AUTHOR -// Angelo Corsaro <corsaro@cs.wustl.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file Collocation_Tester.h + * + * $Id$ + * + * This file contains the class that tests the TAO's collocation + * mechanism. + * + * + * @author Angelo Corsaro <corsaro@cs.wustl.edu> + */ +//============================================================================= + // -- Custom App. Include -- #include "MultipleC.h" @@ -41,38 +37,40 @@ public: ~Collocation_Tester (); // -- Command -- + /// Runs the test. void run (void); - // Runs the test. private: // -- Helper Methods -- + /// Tests the method accessible thru the + /// Top interface. int test_top (void); - // Tests the method accessible thru the - // Top interface. + /// Tests the method accessible thru the + /// Right interface. int test_right (void); - // Tests the method accessible thru the - // Right interface. + /// Tests the method accessible thru the + /// Left interface. int test_left (void); - // Tests the method accessible thru the - // Left interface. + /// Tests the method accessible thru the + /// Bottom interface. int test_bottom (void); - // Tests the method accessible thru the - // Bottom interface. + /** + * This method tests wether the answer obtained + * is the one expected. As strcmp, it returns zero + * if a match occurs and a non-zero value if there + * is no match (actually 1 is returned if there is + * no match. + */ int match_answer (const char *actual_answer, const char *right_answer, const char *method_name); - // This method tests wether the answer obtained - // is the one expected. As strcmp, it returns zero - // if a match occurs and a non-zero value if there - // is no match (actually 1 is returned if there is - // no match. void shutdown (void); private: diff --git a/tests/Multiple/Makefile.am b/tests/Multiple/Makefile.am deleted file mode 100644 index a792d23de7a..00000000000 --- a/tests/Multiple/Makefile.am +++ /dev/null @@ -1,113 +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.Multiple_Idl.am - -BUILT_SOURCES = \ - MultipleC.cpp \ - MultipleC.h \ - MultipleC.inl \ - MultipleS.cpp \ - MultipleS.h \ - MultipleS.inl - -CLEANFILES = \ - Multiple-stamp \ - MultipleC.cpp \ - MultipleC.h \ - MultipleC.inl \ - MultipleS.cpp \ - MultipleS.h \ - MultipleS.inl - -MultipleC.cpp MultipleC.h MultipleC.inl MultipleS.cpp MultipleS.h MultipleS.inl: Multiple-stamp - -Multiple-stamp: $(srcdir)/Multiple.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gd $(srcdir)/Multiple.idl - @touch $@ - -noinst_HEADERS = \ - Multiple.idl - -## Makefile.Multiple_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Collocation_Tester.cpp \ - MultipleC.cpp \ - MultipleS.cpp \ - Multiple_Impl.cpp \ - client.cpp \ - Collocation_Tester.h \ - Multiple_Impl.h - -client_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.Multiple_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Collocation_Tester.cpp \ - MultipleC.cpp \ - MultipleS.cpp \ - Multiple_Impl.cpp \ - server.cpp \ - Collocation_Tester.h \ - Multiple_Impl.h - -server_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/Multiple/Multiple.idl b/tests/Multiple/Multiple.idl index e669d7f0345..2739c5a79b2 100644 --- a/tests/Multiple/Multiple.idl +++ b/tests/Multiple/Multiple.idl @@ -1,32 +1,26 @@ -//$Id$ - -/* ============================================================================ -// -// = LIBRARY -// TAO/tests/Multiple -// -// = FILENAME -// Multiple.idl -// -// = DESCRIPTION -// IDL definition of a Diamond shaped hierarchy -// of IDL interfaces. This Diamond shaped hierarchy -// is used for testing the collocation. -// The hierarchy used is decipted in the following -// figure. -// -// Top -// / \ -// Left Right -// \ / -// Bottom -// -// = AUTHOR -// Angelo Corsaro <corsaro@cs.wustl.edu> -// -// ============================================================================ -*/ +//============================================================================= +/** + * @file Multiple.idl + * + * $Id$ + * + * IDL definition of a Diamond shaped hierarchy + * of IDL interfaces. This Diamond shaped hierarchy + * is used for testing the collocation. + * The hierarchy used is decipted in the following + * figure. + * + * Top + * / \ + * Left Right + * \ / + * Bottom + * + * + * @author Angelo Corsaro <corsaro@cs.wustl.edu> + */ +//============================================================================= module _Multiple { @@ -52,5 +46,4 @@ module _Multiple { string bottom_quote (); }; - }; diff --git a/tests/Multiple/Multiple_Impl.cpp b/tests/Multiple/Multiple_Impl.cpp index 06ba1e71ca6..46f6fbd0c1e 100644 --- a/tests/Multiple/Multiple_Impl.cpp +++ b/tests/Multiple/Multiple_Impl.cpp @@ -3,8 +3,6 @@ #include "Multiple_Impl.h" #include "Collocation_Tester.h" -ACE_RCSID (tests, Multiple_Impl, "$Id$") - /////////////////////////////////////////////////////////// // Bottom_Impl Implementation // diff --git a/tests/Multiple/Multiple_Impl.h b/tests/Multiple/Multiple_Impl.h index 97b507ea1b2..e53381aef39 100644 --- a/tests/Multiple/Multiple_Impl.h +++ b/tests/Multiple/Multiple_Impl.h @@ -1,21 +1,17 @@ -//$Id$ -// -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Multiple -// -// = FILENAME -// Multiple_Impl.h -// -// = DESCRIPTION -// This file contains the servant implementation used to test the -// new collocation collocation scheme. -// -// = AUTHOR -// Angelo Corsaro <corsaro@cs.wustl.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file Multiple_Impl.h + * + * $Id$ + * + * This file contains the servant implementation used to test the + * new collocation collocation scheme. + * + * + * @author Angelo Corsaro <corsaro@cs.wustl.edu> + */ +//============================================================================= + #ifndef TAO_MULTIPLE_IMPL_H_ @@ -24,14 +20,16 @@ // -- App. Specific Include -- #include "MultipleS.h" +/** + * @class Bottom_Impl + * + * @brief Bottom_Impl + * + * This class implements the servant for the Bottom interface + * defined in the IDL file. + */ class Bottom_Impl : public virtual POA_Multiple::Bottom { -// = TITLE -// Bottom_Impl -// -// = DESCRIPTION -// This class implements the servant for the Bottom interface -// defined in the IDL file. public: @@ -56,16 +54,18 @@ private: +/** + * @class Delegated_Bottom_Impl + * + * @brief Delegated_Bottom_Impl + * + * This class implements the servant for the Bottom interface + * which delegates all the request to another Bottom corba object. + * This call forwarding is made using different strategy depending + * on the option set for the ORB. + */ class Delegated_Bottom_Impl : public virtual POA_Multiple::Bottom { -// = TITLE -// Delegated_Bottom_Impl -// -// = DESCRIPTION -// This class implements the servant for the Bottom interface -// which delegates all the request to another Bottom corba object. -// This call forwarding is made using different strategy depending -// on the option set for the ORB. public: diff --git a/tests/Multiple/client.cpp b/tests/Multiple/client.cpp index 1b1d7a9d8f5..96788e8b1b8 100644 --- a/tests/Multiple/client.cpp +++ b/tests/Multiple/client.cpp @@ -3,8 +3,6 @@ # include "Collocation_Tester.h" #include "ace/Get_Opt.h" -ACE_RCSID (tests, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int @@ -29,7 +27,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/tests/Multiple/server.cpp b/tests/Multiple/server.cpp index b36c578233c..a3ee10f8edd 100644 --- a/tests/Multiple/server.cpp +++ b/tests/Multiple/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (tests, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -30,7 +28,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/tests/Multiple_Inheritance/Makefile.am b/tests/Multiple_Inheritance/Makefile.am deleted file mode 100644 index 5fea80abc5e..00000000000 --- a/tests/Multiple_Inheritance/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.Multiple_Inheritance_Idl.am - -BUILT_SOURCES = \ - Multiple_InheritanceC.cpp \ - Multiple_InheritanceC.h \ - Multiple_InheritanceC.inl \ - Multiple_InheritanceS.cpp \ - Multiple_InheritanceS.h \ - Multiple_InheritanceS.inl - -CLEANFILES = \ - Multiple_Inheritance-stamp \ - Multiple_InheritanceC.cpp \ - Multiple_InheritanceC.h \ - Multiple_InheritanceC.inl \ - Multiple_InheritanceS.cpp \ - Multiple_InheritanceS.h \ - Multiple_InheritanceS.inl - -Multiple_InheritanceC.cpp Multiple_InheritanceC.h Multiple_InheritanceC.inl Multiple_InheritanceS.cpp Multiple_InheritanceS.h Multiple_InheritanceS.inl: Multiple_Inheritance-stamp - -Multiple_Inheritance-stamp: $(srcdir)/Multiple_Inheritance.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Multiple_Inheritance.idl - @touch $@ - -noinst_HEADERS = \ - Multiple_Inheritance.idl - -## Makefile.Multiple_Inheritance_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Multiple_InheritanceC.cpp \ - client.cpp \ - Multiple_Inheritance_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Multiple_Inheritance_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Multiple_InheritanceC.cpp \ - Multiple_InheritanceS.cpp \ - server.cpp \ - Multiple_Inheritance_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/tests/Multiple_Inheritance/Multiple_Inheritance_i.h index f8a3e188bfe..ae87b53f82a 100644 --- a/tests/Multiple_Inheritance/Multiple_Inheritance_i.h +++ b/tests/Multiple_Inheritance/Multiple_Inheritance_i.h @@ -2,8 +2,6 @@ #include "Multiple_InheritanceS.h" -ACE_RCSID(Multiple_Inheritance, Multiple_Inheritance_i, "$Id$") - class Multiple_Inheritance_i : public POA_D { public: diff --git a/tests/Multiple_Inheritance/client.cpp b/tests/Multiple_Inheritance/client.cpp index 6eb79d73d47..b49b16472c0 100644 --- a/tests/Multiple_Inheritance/client.cpp +++ b/tests/Multiple_Inheritance/client.cpp @@ -1,19 +1,16 @@ -// $Id$ -// -//=================================================================== -// = LIBRARY -// TAO/tests/Multiple_Inheritance -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// A client program for the Multiple Inheritance module -// -// = AUTHOR -// Irfan Pyarali -// -//==================================================================== +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * A client program for the Multiple Inheritance module + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" @@ -22,8 +19,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_string.h" -ACE_RCSID(Multiple_Inheritance, client, "$Id$") - static ACE_TCHAR *ior = 0; static ACE_TCHAR *ior_input_file = 0; diff --git a/tests/Multiple_Inheritance/server.cpp b/tests/Multiple_Inheritance/server.cpp index d8bfb2b812d..2cf2385d16f 100644 --- a/tests/Multiple_Inheritance/server.cpp +++ b/tests/Multiple_Inheritance/server.cpp @@ -6,8 +6,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" -ACE_RCSID(Multiple_Inheritance, server, "$Id$") - static ACE_TCHAR *ior_output_file = 0; Multiple_Inheritance_i::Multiple_Inheritance_i (void) @@ -38,7 +36,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/tests/Muxed_GIOP_Versions/Makefile.am b/tests/Muxed_GIOP_Versions/Makefile.am deleted file mode 100644 index 4f392d4ad98..00000000000 --- a/tests/Muxed_GIOP_Versions/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.Muxed_GIOP_Versions_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.Muxed_GIOP_Versions_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 \ - testC.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Muxed_GIOP_Versions_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_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/Muxed_GIOP_Versions/client.cpp b/tests/Muxed_GIOP_Versions/client.cpp index 630a944d033..07c2d7d5a75 100644 --- a/tests/Muxed_GIOP_Versions/client.cpp +++ b/tests/Muxed_GIOP_Versions/client.cpp @@ -5,8 +5,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(MT_Client, client, "client.cpp,v 1.16 2002/01/29 20:21:08 okellogg Exp") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); const ACE_TCHAR *corbaloc_arg = ACE_TEXT("corbaloc:iiop:1.0@localhost:12000/ObjectName"); int nthreads = 5; @@ -48,7 +46,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/tests/Muxed_GIOP_Versions/server.cpp b/tests/Muxed_GIOP_Versions/server.cpp index 2ed67f53282..9573acfcedc 100644 --- a/tests/Muxed_GIOP_Versions/server.cpp +++ b/tests/Muxed_GIOP_Versions/server.cpp @@ -3,9 +3,6 @@ #include "test_i.h" #include "ace/Get_Opt.h" #include "ace/Task.h" -#include "ace/Synch_T.h" - -ACE_RCSID(MT_Server, server, "server.cpp,v 1.7 2002/01/29 20:21:08 okellogg Exp") const ACE_TCHAR *ior_output_file = 0; const ACE_TCHAR *corbaloc_arg = ACE_TEXT("corbaloc:iiop:1.0@localhost:12000/ObjectName"); @@ -56,20 +53,19 @@ 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; } /*****************************************************/ +/** + * Run a server thread + * + * Use the ACE_Task_Base class to run server threads + */ class Worker : public ACE_Task_Base { - // = TITLE - // Run a server thread - // - // = DESCRIPTION - // Use the ACE_Task_Base class to run server threads - // public: /// ctor Worker (CORBA::ORB_ptr orb); @@ -85,14 +81,13 @@ private: /*****************************************************/ +/** + * Run a client thread + * + * Use the ACE_Task_Base class to run client threads + */ class SelfClient : public ACE_Task_Base { - // = TITLE - // Run the client thread - // - // = DESCRIPTION - // Use the ACE_Task_Base class to run the client threads. - // public: SelfClient (CORBA::ORB_ptr orb, Simple_Server_ptr server, int niterations); // ctor diff --git a/tests/Muxed_GIOP_Versions/test_i.cpp b/tests/Muxed_GIOP_Versions/test_i.cpp index 7090526b738..7314f7555fe 100644 --- a/tests/Muxed_GIOP_Versions/test_i.cpp +++ b/tests/Muxed_GIOP_Versions/test_i.cpp @@ -9,8 +9,6 @@ #include "ace/OS_NS_unistd.h" -ACE_RCSID(MT_Server, test_i, "test_i.cpp,v 1.6 2002/01/29 20:21:08 okellogg Exp") - CORBA::Long Simple_Server_i::test_method (CORBA::Long x) { diff --git a/tests/Muxed_GIOP_Versions/test_i.h b/tests/Muxed_GIOP_Versions/test_i.h index d1113ac50d7..aa98bce6909 100644 --- a/tests/Muxed_GIOP_Versions/test_i.h +++ b/tests/Muxed_GIOP_Versions/test_i.h @@ -1,34 +1,32 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/MT_Server -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_MT_SERVER_TEST_I_H #define TAO_MT_SERVER_TEST_I_H #include "testS.h" +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb); - // ctor // = The Simple_Server methods. CORBA::Long test_method (CORBA::Long x); @@ -36,8 +34,8 @@ public: void shutdown (void); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB }; #if defined(__ACE_INLINE__) diff --git a/tests/Muxing/Client_Task.cpp b/tests/Muxing/Client_Task.cpp index 2002768040c..0ba1e8728fa 100644 --- a/tests/Muxing/Client_Task.cpp +++ b/tests/Muxing/Client_Task.cpp @@ -4,8 +4,6 @@ #include "Client_Task.h" -ACE_RCSID(Muxing, Client_Task, "$Id$") - Client_Task::Client_Task (Test::Receiver_ptr receiver, CORBA::Long event_count, CORBA::ULong event_size, diff --git a/tests/Muxing/Makefile.am b/tests/Muxing/Makefile.am deleted file mode 100644 index 8ba422d54bf..00000000000 --- a/tests/Muxing/Makefile.am +++ /dev/null @@ -1,109 +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.Muxing_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.Muxing_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_Task.cpp \ - TestC.cpp \ - client.cpp \ - Client_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Muxing_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Receiver.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Receiver.h \ - Server_Task.h - -server_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/Muxing/Receiver.cpp b/tests/Muxing/Receiver.cpp index 1ad5ab31565..b8953970bdb 100644 --- a/tests/Muxing/Receiver.cpp +++ b/tests/Muxing/Receiver.cpp @@ -3,8 +3,6 @@ // #include "Receiver.h" -ACE_RCSID(Muxing, Receiver, "$Id$") - Receiver::Receiver (CORBA::ORB_ptr orb) : message_count_ (0) , byte_count_ (0) diff --git a/tests/Muxing/Server_Task.cpp b/tests/Muxing/Server_Task.cpp index 34e6f5e9edb..e51cb2f7168 100644 --- a/tests/Muxing/Server_Task.cpp +++ b/tests/Muxing/Server_Task.cpp @@ -4,8 +4,6 @@ #include "Server_Task.h" -ACE_RCSID(Muxing, Server_Task, "$Id$") - Server_Task::Server_Task (CORBA::ORB_ptr orb, ACE_Thread_Manager *thr_mgr) : ACE_Task_Base (thr_mgr) diff --git a/tests/Muxing/client.cpp b/tests/Muxing/client.cpp index b839fca5b4c..e5d0bc88b04 100644 --- a/tests/Muxing/client.cpp +++ b/tests/Muxing/client.cpp @@ -3,8 +3,6 @@ #include "Client_Task.h" #include "ace/Get_Opt.h" -ACE_RCSID(Muxing, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); bool shutdown_srv = false; @@ -33,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/tests/Muxing/server.cpp b/tests/Muxing/server.cpp index 185470abca0..dc8a4887b11 100644 --- a/tests/Muxing/server.cpp +++ b/tests/Muxing/server.cpp @@ -4,8 +4,6 @@ #include "Server_Task.h" #include "ace/Get_Opt.h" -ACE_RCSID(Muxing, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -29,7 +27,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/tests/Native_Exceptions/Makefile.am b/tests/Native_Exceptions/Makefile.am deleted file mode 100644 index 5e168763a6d..00000000000 --- a/tests/Native_Exceptions/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.Native_Exceptions_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.Native_Exceptions_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 \ - testC.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Native_Exceptions_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_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/Native_Exceptions/client.cpp b/tests/Native_Exceptions/client.cpp index f5f1f82d65e..67d1c39ae4d 100644 --- a/tests/Native_Exceptions/client.cpp +++ b/tests/Native_Exceptions/client.cpp @@ -3,8 +3,6 @@ #include "ace/Get_Opt.h" #include "testC.h" -ACE_RCSID(Native_Exceptions, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 100; @@ -35,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/tests/Native_Exceptions/server.cpp b/tests/Native_Exceptions/server.cpp index 7a79dd13fb2..99722ee799d 100644 --- a/tests/Native_Exceptions/server.cpp +++ b/tests/Native_Exceptions/server.cpp @@ -4,8 +4,6 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Native_Exceptions, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int @@ -30,7 +28,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/tests/Native_Exceptions/test_i.cpp b/tests/Native_Exceptions/test_i.cpp index 62e6003f6ea..43643b16f0d 100644 --- a/tests/Native_Exceptions/test_i.cpp +++ b/tests/Native_Exceptions/test_i.cpp @@ -6,8 +6,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(Native_Exceptions, test_i, "$Id$") - CORBA::Long Simple_Server_i::test_method (CORBA::Long x) { diff --git a/tests/Native_Exceptions/test_i.h b/tests/Native_Exceptions/test_i.h index 5bbb20d51b1..7d91d2db577 100644 --- a/tests/Native_Exceptions/test_i.h +++ b/tests/Native_Exceptions/test_i.h @@ -1,34 +1,32 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Native_Exceptions -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_NATIVE_EXCEPTIONS_TEST_I_H #define TAO_NATIVE_EXCEPTIONS_TEST_I_H #include "testS.h" +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb); - // ctor // = The Simple_Server methods. CORBA::Long test_method (CORBA::Long x); diff --git a/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.idl b/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.idl index f93b53177b9..4eafae95875 100644 --- a/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.idl +++ b/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.idl @@ -1,32 +1,22 @@ -// $Id$ -// -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpcall/Triangle_Test -// -// = FILENAME -// Triangle_Test.idl -// -// = DESCRIPTION -// An example of how nested upcalls work/fail? -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ - - +//============================================================================= +/** + * @file MT_Client_Test.idl + * + * $Id$ + * + * An example of how nested upcalls work/fail? + * + * @author Michael Kircher + */ +//============================================================================= interface Object_A { - long foo (in long time); - }; interface MT_Object; -interface MT_Object +interface MT_Object { long yadda (in long hop_count, in MT_Object partner); }; diff --git a/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp b/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp index c017c639d69..26419d62263 100644 --- a/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp +++ b/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp @@ -1,28 +1,22 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/MT_Client_Test -// -// = FILENAME -// MT_Object_i.cpp -// -// = DESCRIPTION -// This class implements the Object A of the -// Nested Upcalls - MT Client test. -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file MT_Object_i.cpp + * + * $Id$ + * + * This class implements the Object A of the + * Nested Upcalls - MT Client test. + * + * + * @author Michael Kircher + */ +//============================================================================= #include "MT_Object_i.h" #include "tao/Exception.h" -ACE_RCSID(MT_Client_Test, MT_Object_i, "$Id$") - #define MAX_HOP_COUNT 20 // CTOR diff --git a/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h index bfddb076334..e75f44a01ec 100644 --- a/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h +++ b/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h @@ -1,22 +1,16 @@ -// -*- c++ -*- -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/MT_Client test -// -// = FILENAME -// MT_Object_A_i.h -// -// = DESCRIPTION -// This class implements the Object A of the -// Nested Upcalls - MT Client test -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ +//============================================================================= +/** + * @file MT_Object_i.h + * + * $Id$ + * + * This class implements the Object A of the + * Nested Upcalls - MT Client test + * + * @author Michael Kircher + */ +//============================================================================= #ifndef MT_OBJECT_IMPL_H # define MT_OBJECT_IMPL_H @@ -24,20 +18,22 @@ #include "MT_Client_TestS.h" #include "MT_Client_TestC.h" +/** + * @class MT_Object_i + * + * @brief Implement the <MT_Object> IDL interface. + */ class MT_Object_i : public POA_MT_Object { - // = TITLE - // Implement the <MT_Object> IDL interface. public: + /// Constructor. MT_Object_i (void); - // Constructor. + /// Destructor. virtual ~MT_Object_i (void); - // Destructor. virtual CORBA::Long yadda (CORBA::Long hop_count, MT_Object_ptr partner); - }; #endif /* MT_OBJECT_IMPL_H */ diff --git a/tests/NestedUpcall/MT_Client_Test/Makefile.am b/tests/NestedUpcall/MT_Client_Test/Makefile.am deleted file mode 100644 index ddbd154fcff..00000000000 --- a/tests/NestedUpcall/MT_Client_Test/Makefile.am +++ /dev/null @@ -1,119 +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.MT_Client_Test_Nested_Upcall_Idl.am - -BUILT_SOURCES = \ - MT_Client_TestC.cpp \ - MT_Client_TestC.h \ - MT_Client_TestC.inl \ - MT_Client_TestS.cpp \ - MT_Client_TestS.h \ - MT_Client_TestS.inl - -CLEANFILES = \ - MT_Client_Test-stamp \ - MT_Client_TestC.cpp \ - MT_Client_TestC.h \ - MT_Client_TestC.inl \ - MT_Client_TestS.cpp \ - MT_Client_TestS.h \ - MT_Client_TestS.inl - -MT_Client_TestC.cpp MT_Client_TestC.h MT_Client_TestC.inl MT_Client_TestS.cpp MT_Client_TestS.h MT_Client_TestS.inl: MT_Client_Test-stamp - -MT_Client_Test-stamp: $(srcdir)/MT_Client_Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/MT_Client_Test.idl - @touch $@ - -noinst_HEADERS = \ - MT_Client_Test.idl - -## Makefile.MT_Client_Test_Nested_Upcall_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - MT_Client_TestC.cpp \ - MT_Client_TestS.cpp \ - MT_Object_i.cpp \ - client.cpp \ - local_server.cpp \ - MT_Object_i.h \ - client.h \ - local_server.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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.MT_Client_Test_Nested_Upcall_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - MT_Client_TestC.cpp \ - MT_Client_TestS.cpp \ - MT_Object_i.cpp \ - server.cpp \ - MT_Object_i.h \ - server.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/NestedUpcall/MT_Client_Test/client.cpp b/tests/NestedUpcall/MT_Client_Test/client.cpp index 2935b601b93..b1d3f5db780 100644 --- a/tests/NestedUpcall/MT_Client_Test/client.cpp +++ b/tests/NestedUpcall/MT_Client_Test/client.cpp @@ -1,22 +1,19 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/MT_Client_Test -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// Start one server thread calling a distant MT Object serveral times, -// also starting serveral client threads which call the MT Object too. -// The server does nested upcalls. -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * Start one server thread calling a distant MT Object serveral times, + * also starting serveral client threads which call the MT Object too. + * The server does nested upcalls. + * + * + * @author Michael Kircher + */ +//============================================================================= + #include "client.h" #include "local_server.h" @@ -27,8 +24,6 @@ #include "ace/OS_NS_fcntl.h" #include "ace/Malloc_Base.h" -ACE_RCSID(MT_Client_Test, client, "$Id$") - MT_Client_Task::MT_Client_Task (int argc, ACE_TCHAR **argv, int client_number) : argc_ (argc), diff --git a/tests/NestedUpcall/MT_Client_Test/client.h b/tests/NestedUpcall/MT_Client_Test/client.h index 6d25e8c355e..5226fe9aca8 100644 --- a/tests/NestedUpcall/MT_Client_Test/client.h +++ b/tests/NestedUpcall/MT_Client_Test/client.h @@ -1,21 +1,16 @@ -// -*- c++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/MT_Client_Test -// -// = FILENAME -// client.h -// -// = DESCRIPTION -// Test for multithreaded client using one global ORB (and Reactor) -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file client.h + * + * $Id$ + * + * Test for multithreaded client using one global ORB (and Reactor) + * + * + * @author Michael Kircher + */ +//============================================================================= #ifndef MT_CLIENT_H #define MT_CLIENT_H @@ -31,68 +26,72 @@ #include "tao/ORB.h" #include "MT_Client_TestC.h" +/** + * @class MT_Client + * + * @brief A simple client talking to one server + * + * It is connecting to a server which holds the Object_A + * or using the "-m" switch to a server holding the MT_Object + */ class MT_Client { - // = TITLE - // A simple client talking to one server - // - // = DESCRIPTION - // It is connecting to a server which holds the Object_A - // or using the "-m" switch to a server holding the MT_Object public: + /// = Constructor and destructor. MT_Client (void); ~MT_Client (void); - // = Constructor and destructor. + /// Execute client example code. int run (void); - // Execute client example code. + /// Initialize the client communication endpoint with server. int init (int argc, ACE_TCHAR **argv, int client_number); - // Initialize the client communication endpoint with server. private: + /// reading the IOR of object A in int read_ior (ACE_TCHAR *filename); - // reading the IOR of object A in + /// Parses the arguments passed on the command line. int parse_args (void); - // Parses the arguments passed on the command line. + /// # of arguments on the command line. int argc_; - // # of arguments on the command line. + /// arguments from command line. ACE_TCHAR **argv_; - // arguments from command line. + /// Key of the object char *object_key_; - // Key of the object + /// Flag to tell server to shutdown. int shutdown_; - // Flag to tell server to shutdown. + /// Remember our orb. CORBA::ORB_var orb_var_; - // Remember our orb. + /// pointer to the mt Object MT_Object_var mT_Object_var_; - // pointer to the mt Object + /// This is used to choose the server... int client_number_; - // This is used to choose the server... + /// number of loops unsigned long iterations_; - // number of loops }; +/** + * @class MT_Client_Task + * + * @brief Wrapper for the MT_Client to be an extra thread + * + * No big purpose, just wrapping + */ class MT_Client_Task : public ACE_Task<ACE_SYNCH> { - // = TITLE - // Wrapper for the MT_Client to be an extra thread - // - // = DESCRIPTION - // No big purpose, just wrapping public: MT_Client_Task (int argc, ACE_TCHAR **argv, int client_number); @@ -103,8 +102,8 @@ private: int argc_; ACE_TCHAR **argv_; + /// To determine if we use the first or the second server. int client_number_; - // To determine if we use the first or the second server. }; #endif /* MT_CLIENT_H */ diff --git a/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/tests/NestedUpcall/MT_Client_Test/local_server.cpp index dd2d64f0aad..94aeb20f8ca 100644 --- a/tests/NestedUpcall/MT_Client_Test/local_server.cpp +++ b/tests/NestedUpcall/MT_Client_Test/local_server.cpp @@ -1,21 +1,18 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/MT_Client_Test -// -// = FILENAME -// local_server.cpp -// -// = DESCRIPTION -// This server will run the ORB briefly and then make -// several calls on the distant MT Object. -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file local_server.cpp + * + * $Id$ + * + * This server will run the ORB briefly and then make + * several calls on the distant MT Object. + * + * + * @author Michael Kircher + */ +//============================================================================= + #include "local_server.h" #include "tao/debug.h" @@ -24,8 +21,6 @@ #include "ace/OS_NS_fcntl.h" #include "tao/Utils/ORB_Manager.h" -ACE_RCSID(MT_Client_Test, local_server, "$Id$") - MT_Server_Task::MT_Server_Task (ACE_Thread_Manager* thr_mgr_ptr, int argc, ACE_TCHAR **argv, diff --git a/tests/NestedUpcall/MT_Client_Test/local_server.h b/tests/NestedUpcall/MT_Client_Test/local_server.h index b486c2f443e..731fd936d21 100644 --- a/tests/NestedUpcall/MT_Client_Test/local_server.h +++ b/tests/NestedUpcall/MT_Client_Test/local_server.h @@ -1,22 +1,17 @@ -// -*- c++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/MT_Client_Test -// -// = FILENAME -// local_server.h -// -// = DESCRIPTION -// This class implements a simple server for the -// Nested Upcalls - MT Client test -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file local_server.h + * + * $Id$ + * + * This class implements a simple server for the + * Nested Upcalls - MT Client test + * + * + * @author Michael Kircher + */ +//============================================================================= #ifndef MT_CLIENT_TEST_MT_SERVER_H #define MT_CLIENT_TEST_MT_SERVER_H @@ -35,76 +30,80 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ORB_Manager; TAO_END_VERSIONED_NAMESPACE_DECL +/** + * @class MT_Server + * + * @brief This is the server for the mt_object + * + * See the README file for more information. + */ class MT_Server { - // = TITLE - // This is the server for the mt_object - // - // = DESCRIPTION - // See the README file for more information. public: + /// Default constructor MT_Server (); - // Default constructor + /// Destructor ~MT_Server (void); - // Destructor + /// Initialize the MT_Server state - parsing arguments and ... int init (int argc, ACE_TCHAR **argv, TAO_ORB_Manager* orb_manager_ptr); - // Initialize the MT_Server state - parsing arguments and ... + /// Run the orb int run (void); - // Run the orb + /// Just run it briefly int run_ORB_briefly (void); - // Just run it briefly private: + /// reading the IOR of mt object in int read_ior (ACE_TCHAR *filename); - // reading the IOR of mt object in + /// Parses the commandline arguments. int parse_args (void); - // Parses the commandline arguments. + /// Key of the object char *object_key_; - // Key of the object + /// File to output the IOR of the object A. FILE* ior_output_file_; - // File to output the IOR of the object A. + /// The ORB manager TAO_ORB_Manager* orb_manager_ptr_; - // The ORB manager + /// Implementation object MT_Object_i mT_Object_i_; - // Implementation object + /// reference for the distant MT Object MT_Object_var mT_Object_var_; - // reference for the distant MT Object + /// Number of commandline arguments. int argc_; - // Number of commandline arguments. + /// commandline arguments. ACE_TCHAR **argv_; - // commandline arguments. + /// number of times the server should call to the disted MT OBject unsigned int iterations_; - // number of times the server should call to the disted MT OBject + /// IOR of our servant. CORBA::String_var str_; - // IOR of our servant. }; +/** + * @class MT_Server_Task + * + * @brief Wrapper for the MT_Server to be an extra thread + * + * No big purpose, just wrapping + */ class MT_Server_Task : public ACE_Task<ACE_SYNCH> { - // = TITLE - // Wrapper for the MT_Server to be an extra thread - // - // = DESCRIPTION - // No big purpose, just wrapping public: MT_Server_Task (ACE_Thread_Manager* thr_mgr_ptr, int argc, diff --git a/tests/NestedUpcall/MT_Client_Test/server.cpp b/tests/NestedUpcall/MT_Client_Test/server.cpp index cc902da6345..5c9ae335c6f 100644 --- a/tests/NestedUpcall/MT_Client_Test/server.cpp +++ b/tests/NestedUpcall/MT_Client_Test/server.cpp @@ -1,21 +1,18 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/MT_Client_Test -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// This class implements a simple server for the -// Nested Upcalls - MT_Client test. -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * This class implements a simple server for the + * Nested Upcalls - MT_Client test. + * + * + * @author Michael Kircher + */ +//============================================================================= + #include "server.h" #include "tao/debug.h" @@ -24,8 +21,6 @@ #include "ace/Event_Handler.h" #include "ace/Sig_Handler.h" -ACE_RCSID(MT_Client_Test, server, "$Id$") - class TestShutdown : public ACE_Event_Handler { public: diff --git a/tests/NestedUpcall/MT_Client_Test/server.h b/tests/NestedUpcall/MT_Client_Test/server.h index 8d0e237514e..549c5a30830 100644 --- a/tests/NestedUpcall/MT_Client_Test/server.h +++ b/tests/NestedUpcall/MT_Client_Test/server.h @@ -1,22 +1,18 @@ -// -*- c++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/MT_Client_Test -// -// = FILENAME -// server_A.h -// -// = DESCRIPTION -// This class implements a simple server for the -// Nested Upcalls - MT Client test -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file server.h + * + * $Id$ + * + * This class implements a simple server for the + * Nested Upcalls - MT Client test + * + * + * @author Michael Kircher + */ +//============================================================================= + #ifndef MT_CLIENT_TEST_MT_OBJECT_SERVER_H #define MT_CLIENT_TEST_MT_OBJECT_SERVER_H @@ -31,47 +27,49 @@ #include "tao/Utils/ORB_Manager.h" #include "MT_Object_i.h" +/** + * @class MT_Object_Server + * + * @brief This is the server for the object A in the test. + * + * See the README file for more information. + */ class MT_Object_Server { - // = TITLE - // This is the server for the object A in the test. - // - // = DESCRIPTION - // See the README file for more information. public: + /// Default constructor MT_Object_Server (void); - // Default constructor + /// Destructor ~MT_Object_Server (void); - // Destructor + /// Initialize the NestedUpCalls_Server state - parsing arguments and ... int init (int argc, ACE_TCHAR **argv); - // Initialize the NestedUpCalls_Server state - parsing arguments and ... + /// Run the orb int run (void); - // Run the orb private: + /// Parses the commandline arguments. int parse_args (void); - // Parses the commandline arguments. + /// File to output the IOR of the object A. FILE* ior_output_file_; - // File to output the IOR of the object A. + /// The ORB manager TAO_ORB_Manager orb_manager_; - // The ORB manager + /// Implementation object MT_OBject MT_Object_i mT_Object_i_; - // Implementation object MT_OBject + /// Number of commandline arguments. int argc_; - // Number of commandline arguments. + /// commandline arguments. ACE_TCHAR **argv_; - // commandline arguments. u_char use_mt_object_; }; diff --git a/tests/NestedUpcall/Makefile.am b/tests/NestedUpcall/Makefile.am deleted file mode 100644 index 5cd4e889a89..00000000000 --- a/tests/NestedUpcall/Makefile.am +++ /dev/null @@ -1,15 +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 = \ - MT_Client_Test \ - Simple \ - Triangle_Test - diff --git a/tests/NestedUpcall/Simple/Makefile.am b/tests/NestedUpcall/Simple/Makefile.am deleted file mode 100644 index 2f3397a15a8..00000000000 --- a/tests/NestedUpcall/Simple/Makefile.am +++ /dev/null @@ -1,109 +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.Simple_Nested_Upcall_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.Simple_Nested_Upcall_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_i.cpp \ - testC.cpp \ - testS.cpp \ - client_i.h - -client_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.Simple_Nested_Upcall_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - server_i.cpp \ - testC.cpp \ - testS.cpp \ - server_i.h - -server_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/NestedUpcall/Simple/client.cpp b/tests/NestedUpcall/Simple/client.cpp index 39912c97638..555e40df214 100644 --- a/tests/NestedUpcall/Simple/client.cpp +++ b/tests/NestedUpcall/Simple/client.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(Simple, client, "$Id$") - static const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); // Server IOR. diff --git a/tests/NestedUpcall/Simple/server.cpp b/tests/NestedUpcall/Simple/server.cpp index 2fceb937b1f..8121c3a19b5 100644 --- a/tests/NestedUpcall/Simple/server.cpp +++ b/tests/NestedUpcall/Simple/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(Simple, server, "$Id$") - static int quiet = 0; // The test is quiet... diff --git a/tests/NestedUpcall/Simple/simple-client.cpp b/tests/NestedUpcall/Simple/simple-client.cpp index 53fd7dc44a9..7a979bec324 100644 --- a/tests/NestedUpcall/Simple/simple-client.cpp +++ b/tests/NestedUpcall/Simple/simple-client.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(Simple, client, "$Id$") - static const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); // Server IOR. diff --git a/tests/NestedUpcall/Simple/test.idl b/tests/NestedUpcall/Simple/test.idl index 45664cfb035..c31e438e6e5 100644 --- a/tests/NestedUpcall/Simple/test.idl +++ b/tests/NestedUpcall/Simple/test.idl @@ -1,20 +1,16 @@ -// $Id$ -// -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpcall -// -// = FILENAME -// test.idl -// -// = DESCRIPTION -// A simple test of nested upcalls. -// -// = AUTHOR -// Irfan Pyarali -// -// ============================================================================ +//============================================================================= +/** + * @file test.idl + * + * $Id$ + * + * A simple test of nested upcalls. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + interface client { diff --git a/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp index c2ecfcc8498..49d08edf026 100644 --- a/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp +++ b/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp @@ -1,27 +1,21 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/Triangle_Test -// -// = FILENAME -// Object_A_i.cpp -// -// = DESCRIPTION -// This class implements the Object A of the -// Nested Upcalls - Triangle test. -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ +//============================================================================= +/** + * @file Initiator_i.cpp + * + * $Id$ + * + * This class implements the Object A of the + * Nested Upcalls - Triangle test. + * + * + * @author Michael Kircher + */ +//============================================================================= #include "tao/Exception.h" #include "Initiator_i.h" -ACE_RCSID(Triangle_Test, Initiator_i, "$Id$") - // CTOR Initiator_i::Initiator_i (Object_A_ptr object_A_ptr, Object_B_ptr object_B_ptr) diff --git a/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/tests/NestedUpcall/Triangle_Test/Initiator_i.h index 2d9e9fa1cac..2d4ba8b9c37 100644 --- a/tests/NestedUpcall/Triangle_Test/Initiator_i.h +++ b/tests/NestedUpcall/Triangle_Test/Initiator_i.h @@ -1,48 +1,47 @@ -// -*- c++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/Triangle_Test -// -// = FILENAME -// Initiator_i.h -// -// = DESCRIPTION -// This class implements the Initiator of the -// Nested Upcalls - Triangle test. -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file Initiator_i.h + * + * $Id$ + * + * This class implements the Initiator of the + * Nested Upcalls - Triangle test. + * + * + * @author Michael Kircher + */ +//============================================================================= + #ifndef INITIATOR_IMPL_H # define INITIATOR_IMPL_H #include "Triangle_TestS.h" +/** + * @class Initiator_i + * + * @brief Implement the <Initiator> IDL interface. + */ class Initiator_i : public POA_Initiator { - // = TITLE - // Implement the <Initiator> IDL interface. public: + /// Constructor. Initiator_i (Object_A_ptr object_A_ptr, Object_B_ptr object_B_ptr); - // Constructor. + /// Destructor. virtual ~Initiator_i (void); - // Destructor. virtual void foo_object_B (void); private: + /// reference to object A Object_A_var object_A_var_; - // reference to object A + /// reference to object B Object_B_var object_B_var_; - // reference to object B }; #endif /* INITIATOR_IMPL_H */ diff --git a/tests/NestedUpcall/Triangle_Test/Makefile.am b/tests/NestedUpcall/Triangle_Test/Makefile.am deleted file mode 100644 index 96374a10b97..00000000000 --- a/tests/NestedUpcall/Triangle_Test/Makefile.am +++ /dev/null @@ -1,148 +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.TT_Nested_Upcall_Server_Idl.am - -BUILT_SOURCES = \ - Triangle_TestC.cpp \ - Triangle_TestC.h \ - Triangle_TestC.inl \ - Triangle_TestS.cpp \ - Triangle_TestS.h \ - Triangle_TestS.inl - -CLEANFILES = \ - Triangle_Test-stamp \ - Triangle_TestC.cpp \ - Triangle_TestC.h \ - Triangle_TestC.inl \ - Triangle_TestS.cpp \ - Triangle_TestS.h \ - Triangle_TestS.inl - -Triangle_TestC.cpp Triangle_TestC.h Triangle_TestC.inl Triangle_TestS.cpp Triangle_TestS.h Triangle_TestS.inl: Triangle_Test-stamp - -Triangle_Test-stamp: $(srcdir)/Triangle_Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Triangle_Test.idl - @touch $@ - -noinst_HEADERS = \ - Triangle_Test.idl - -## Makefile.TT_Nested_Upcall_Initiator.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += initiator - -initiator_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -initiator_SOURCES = \ - Initiator_i.cpp \ - Triangle_TestC.cpp \ - Triangle_TestS.cpp \ - initiator.cpp \ - Initiator_i.h \ - initiator.h - -initiator_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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.TT_Nested_Upcall_Server_A.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server_A - -server_A_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_A_SOURCES = \ - Object_A_i.cpp \ - Triangle_TestC.cpp \ - Triangle_TestS.cpp \ - server_A.cpp \ - Object_A_i.h \ - server_A.h - -server_A_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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.TT_Nested_Upcall_Server_B.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server_B - -server_B_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_B_SOURCES = \ - Object_B_i.cpp \ - Triangle_TestC.cpp \ - Triangle_TestS.cpp \ - server_B.cpp \ - Object_B_i.h \ - server_B.h - -server_B_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp index 66764ee0b3c..0946f3c3ce7 100644 --- a/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp +++ b/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp @@ -1,28 +1,23 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/Triangle_Test -// -// = FILENAME -// Object_A_i.cpp -// -// = DESCRIPTION -// This class implements the Object A of the -// Nested Upcalls - Triangle test. -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file Object_A_i.cpp + * + * $Id$ + * + * This class implements the Object A of the + * Nested Upcalls - Triangle test. + * + * + * @author Michael Kircher + */ +//============================================================================= + #include "Object_A_i.h" #include "tao/ORB_Core.h" #include "ace/Reactor.h" -ACE_RCSID(Triangle_Test, Object_A_i, "$Id$") - // CTOR Object_A_i::Object_A_i (void) : finish_two_way_call_ (0) @@ -59,3 +54,13 @@ Object_A_i::finish (void) this->finish_two_way_call_ = 1; } + +void +Object_A_i::shutdown (void) +{ + int argc = 0; + ACE_TCHAR **argv = 0; + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + + orb->shutdown (); +} diff --git a/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/tests/NestedUpcall/Triangle_Test/Object_A_i.h index 567412b6d83..71e604800f7 100644 --- a/tests/NestedUpcall/Triangle_Test/Object_A_i.h +++ b/tests/NestedUpcall/Triangle_Test/Object_A_i.h @@ -1,43 +1,44 @@ -// -*- c++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/Triangle_Test -// -// = FILENAME -// Object_A_i.h -// -// = DESCRIPTION -// This class implements the Object A of the -// Nested Upcalls - Triangle test. -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file Object_A_i.h + * + * $Id$ + * + * This class implements the Object A of the + * Nested Upcalls - Triangle test. + * + * + * @author Michael Kircher + */ +//============================================================================= + #ifndef OBJECT_B_IMPL_H # define OBJECT_B_IMPL_H #include "Triangle_TestS.h" +/** + * @class Object_A_i + * + * @brief Implement the <Object_A> IDL interface. + */ class Object_A_i : public POA_Object_A { - // = TITLE - // Implement the <Object_A> IDL interface. public: + /// Constructor. Object_A_i (void); - // Constructor. + /// Destructor. virtual ~Object_A_i (void); - // Destructor. virtual void foo (Initiator_ptr theInitiator_ptr); virtual void finish (void); + virtual void shutdown (void); + unsigned long finish_two_way_call_; }; diff --git a/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp index 3428fd18159..70cc0810439 100644 --- a/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp +++ b/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp @@ -1,28 +1,23 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/Triangle_Test -// -// = FILENAME -// Object_B_i.cpp -// -// = DESCRIPTION -// This class implements the Object B of the -// Nested Upcalls - Triangle test. -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file Object_B_i.cpp + * + * $Id$ + * + * This class implements the Object B of the + * Nested Upcalls - Triangle test. + * + * + * @author Michael Kircher + */ +//============================================================================= + #include "tao/Exception.h" #include "Object_B_i.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Triangle_Test, Object_B_i, "$Id$") - // CTOR Object_B_i::Object_B_i (void) { @@ -60,3 +55,13 @@ Object_B_i::foo (Object_A_ptr theObject_A_ptr) } } + +void +Object_B_i::shutdown (void) +{ + int argc = 0; + ACE_TCHAR **argv = 0; + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + + orb->shutdown (); +} diff --git a/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/tests/NestedUpcall/Triangle_Test/Object_B_i.h index 2eed4c74f4b..1fd5f66bb5e 100644 --- a/tests/NestedUpcall/Triangle_Test/Object_B_i.h +++ b/tests/NestedUpcall/Triangle_Test/Object_B_i.h @@ -1,40 +1,41 @@ -// -*- c++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/Triangle_Test -// -// = FILENAME -// Object_B_i.h -// -// = DESCRIPTION -// This class implements the Object B of the -// Nested Upcalls - Triangle test. -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file Object_B_i.h + * + * $Id$ + * + * This class implements the Object B of the + * Nested Upcalls - Triangle test. + * + * + * @author Michael Kircher + */ +//============================================================================= + #ifndef OBJECT_B_IMPL_H # define OBJECT_B_IMPL_H #include "Triangle_TestS.h" +/** + * @class Object_B_i + * + * @brief Implement the <Object_B> IDL interface. + */ class Object_B_i : public POA_Object_B { - // = TITLE - // Implement the <Object_B> IDL interface. public: + /// Constructor. Object_B_i (void); - // Constructor. + /// Destructor. virtual ~Object_B_i (void); - // Destructor. virtual void foo(Object_A_ptr theObject_A_ptr); + + virtual void shutdown (void); }; #endif /* OBJECT_B_IMPL_H */ diff --git a/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl b/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl index 485d1f0edc5..87b83f1661c 100644 --- a/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl +++ b/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl @@ -1,20 +1,16 @@ -// $Id$ -// -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpcall/Triangle_Test -// -// = FILENAME -// Triangle_Test.idl -// -// = DESCRIPTION -// An example of how nested upcalls work/fail? -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ +//============================================================================= +/** + * @file Triangle_Test.idl + * + * $Id$ + * + * An example of how nested upcalls work/fail? + * + * + * @author Michael Kircher + */ +//============================================================================= + interface Initiator { @@ -26,13 +22,17 @@ interface Initiator { interface Object_A { void foo (in Initiator theInitiator); - + oneway void finish (); + oneway void shutdown (); + }; interface Object_B { void foo (in Object_A theObject_A); + oneway void shutdown (); + }; diff --git a/tests/NestedUpcall/Triangle_Test/initiator.cpp b/tests/NestedUpcall/Triangle_Test/initiator.cpp index 3433e5fea2a..3b7500c822c 100644 --- a/tests/NestedUpcall/Triangle_Test/initiator.cpp +++ b/tests/NestedUpcall/Triangle_Test/initiator.cpp @@ -1,21 +1,18 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/Triangle_Test -// -// = FILENAME -// initiator.cpp -// -// = DESCRIPTION -// This class implements a simple server for the -// Nested Upcalls - Triangle test. -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file initiator.cpp + * + * $Id$ + * + * This class implements a simple server for the + * Nested Upcalls - Triangle test. + * + * + * @author Michael Kircher + */ +//============================================================================= + #include "initiator.h" #include "tao/debug.h" @@ -23,8 +20,6 @@ #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Triangle_Test, initiator, "$Id$") - Initiator_Server::Initiator_Server (void) : object_A_key_ (0), object_B_key_ (0), @@ -143,10 +138,11 @@ Initiator_Server::init (int argc, try { + CORBA::ORB_var orb = this->orb_manager_.orb(); // Get Object A CORBA::Object_var object_A_obj_var = - this->orb_manager_.orb()->string_to_object (this->object_A_key_); + orb->string_to_object (this->object_A_key_); this->object_A_var_ = Object_A::_narrow (object_A_obj_var.in()); @@ -168,7 +164,7 @@ Initiator_Server::init (int argc, // Get Object B CORBA::Object_var object_B_obj_var = - this->orb_manager_.orb()->string_to_object (this->object_B_key_); + orb->string_to_object (this->object_B_key_); this->object_B_var_ = Object_B::_narrow (object_B_obj_var.in()); @@ -255,6 +251,9 @@ Initiator_Server::~Initiator_Server (void) if (this->object_B_key_ != 0) ACE_Allocator::instance ()->free (this->object_B_key_); + this->object_A_var_->shutdown (); + this->object_B_var_->shutdown (); + try { this->orb_manager_.deactivate (this->str_.in ()); diff --git a/tests/NestedUpcall/Triangle_Test/initiator.h b/tests/NestedUpcall/Triangle_Test/initiator.h index 36be7ab5da6..d1c4c5f6848 100644 --- a/tests/NestedUpcall/Triangle_Test/initiator.h +++ b/tests/NestedUpcall/Triangle_Test/initiator.h @@ -1,22 +1,18 @@ -// -*- c++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/Triangle_Test -// -// = FILENAME -// initiator.h -// -// = DESCRIPTION -// This class implements a simple server for the -// Nested Upcalls - Triangle test -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file initiator.h + * + * $Id$ + * + * This class implements a simple server for the + * Nested Upcalls - Triangle test + * + * + * @author Michael Kircher + */ +//============================================================================= + #ifndef _TRIANGLE_TEST_INITITATOR_SERVER_H #define _TRIANGLE_TEST_INITITATOR_SERVER_H @@ -31,62 +27,64 @@ #include "tao/Utils/ORB_Manager.h" #include "Initiator_i.h" +/** + * @class Initiator_Server + * + * @brief This is the server for the Initiator in the test. + * + * See the README file for more information. + */ class Initiator_Server { - // = TITLE - // This is the server for the Initiator in the test. - // - // = DESCRIPTION - // See the README file for more information. public: + /// Default constructor Initiator_Server (void); - // Default constructor + /// Destructor ~Initiator_Server (void); - // Destructor + /// read in the IOR's for the two objects A and B int read_ior (ACE_TCHAR *filename, unsigned int A_B); - // read in the IOR's for the two objects A and B + /// Initialize the Initiator_Server state - parsing arguments and ... int init (int argc, ACE_TCHAR **argv); - // Initialize the Initiator_Server state - parsing arguments and ... + /// Run the orb int run (void); - // Run the orb private: + /// Parses the commandline arguments. int parse_args (void); - // Parses the commandline arguments. + /// The IOR of object A char * object_A_key_; - // The IOR of object A + /// The IOR of object B char * object_B_key_; - // The IOR of object B + /// reference to object A Object_A_var object_A_var_; - // reference to object A + /// reference to object B Object_B_var object_B_var_; - // reference to object B + /// The ORB manager TAO_ORB_Manager orb_manager_; - // The ORB manager + /// Implementation object of the Initiator Initiator_i *initiator_i_ptr_; - // Implementation object of the Initiator + /// Number of commandline arguments. int argc_; - // Number of commandline arguments. + /// commandline arguments. ACE_TCHAR **argv_; - // commandline arguments. + /// IOR of my servant. CORBA::String_var str_; - // IOR of my servant. }; #endif /* _TRIANGLE_TEST_INITITATOR_SERVER_H */ diff --git a/tests/NestedUpcall/Triangle_Test/run_test.pl b/tests/NestedUpcall/Triangle_Test/run_test.pl index d84559551a2..2e9c16d2cba 100755 --- a/tests/NestedUpcall/Triangle_Test/run_test.pl +++ b/tests/NestedUpcall/Triangle_Test/run_test.pl @@ -114,14 +114,14 @@ if ($client_status != 0) { $status = 1; } -$server_status = $SV1->TerminateWaitKill ($server_a->ProcessStopWaitInterval()); +$server_status = $SV1->WaitKill ($server_a->ProcessStopWaitInterval()); if ($server_status != 0) { print STDERR "ERROR: server returned $server_status\n"; $status = 1; } -$server_status = $SV2->TerminateWaitKill ($server_b->ProcessStopWaitInterval()); +$server_status = $SV2->WaitKill ($server_b->ProcessStopWaitInterval()); if ($server_status != 0) { print STDERR "ERROR: server returned $server_status\n"; diff --git a/tests/NestedUpcall/Triangle_Test/server_A.cpp b/tests/NestedUpcall/Triangle_Test/server_A.cpp index dd47d9447c5..f651030f77c 100644 --- a/tests/NestedUpcall/Triangle_Test/server_A.cpp +++ b/tests/NestedUpcall/Triangle_Test/server_A.cpp @@ -1,28 +1,23 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/Triangle_Test -// -// = FILENAME -// server_A.cpp -// -// = DESCRIPTION -// This class implements a simple server for the -// Nested Upcalls - Triangle test. -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file server_A.cpp + * + * $Id$ + * + * This class implements a simple server for the + * Nested Upcalls - Triangle test. + * + * + * @author Michael Kircher + */ +//============================================================================= + #include "server_A.h" #include "tao/debug.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Triangle_Test, server_A, "$Id$") - Object_A_Server::Object_A_Server (void) : ior_output_file_ (0) { diff --git a/tests/NestedUpcall/Triangle_Test/server_A.h b/tests/NestedUpcall/Triangle_Test/server_A.h index 095d1122d51..efb5257f293 100644 --- a/tests/NestedUpcall/Triangle_Test/server_A.h +++ b/tests/NestedUpcall/Triangle_Test/server_A.h @@ -1,22 +1,18 @@ -// -*- c++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/Triangle_Test -// -// = FILENAME -// server_A.h -// -// = DESCRIPTION -// This class implements a simple server for the -// Nested Upcalls - Triangle test -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file server_A.h + * + * $Id$ + * + * This class implements a simple server for the + * Nested Upcalls - Triangle test + * + * + * @author Michael Kircher + */ +//============================================================================= + #ifndef _TRIANGLE_TEST_OBJECT_A_SERVER_H #define _TRIANGLE_TEST_OBJECT_A_SERVER_H @@ -31,47 +27,49 @@ #include "tao/Utils/ORB_Manager.h" #include "Object_A_i.h" +/** + * @class Object_A_Server + * + * @brief This is the server for the object A in the test. + * + * See the README file for more information. + */ class Object_A_Server { - // = TITLE - // This is the server for the object A in the test. - // - // = DESCRIPTION - // See the README file for more information. public: + /// Default constructor Object_A_Server (void); - // Default constructor + /// Destructor ~Object_A_Server (void); - // Destructor + /// Initialize the NestedUpCalls_Server state - parsing arguments and ... int init (int argc, ACE_TCHAR **argv); - // Initialize the NestedUpCalls_Server state - parsing arguments and ... + /// Run the orb int run (void); - // Run the orb private: + /// Parses the commandline arguments. int parse_args (void); - // Parses the commandline arguments. + /// File to output the IOR of the object A. FILE* ior_output_file_; - // File to output the IOR of the object A. + /// The ORB manager TAO_ORB_Manager orb_manager_; - // The ORB manager + /// Implementation object of the NestedUpCalls reactor. Object_A_i object_A_i_; - // Implementation object of the NestedUpCalls reactor. + /// Number of commandline arguments. int argc_; - // Number of commandline arguments. + /// commandline arguments. ACE_TCHAR **argv_; - // commandline arguments. }; #endif /* _TRIANGLE_TEST_OBJECT_A_SERVER_H */ diff --git a/tests/NestedUpcall/Triangle_Test/server_B.cpp b/tests/NestedUpcall/Triangle_Test/server_B.cpp index bee7d17754c..e37c51b3819 100644 --- a/tests/NestedUpcall/Triangle_Test/server_B.cpp +++ b/tests/NestedUpcall/Triangle_Test/server_B.cpp @@ -1,28 +1,23 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/Triangle_Test -// -// = FILENAME -// server_B.cpp -// -// = DESCRIPTION -// This class implements a simple server for the -// Nested Upcalls - Triangle test. -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file server_B.cpp + * + * $Id$ + * + * This class implements a simple server for the + * Nested Upcalls - Triangle test. + * + * + * @author Michael Kircher + */ +//============================================================================= + #include "server_B.h" #include "tao/debug.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Triangle_Test, server_B, "$Id$") - Object_B_Server::Object_B_Server (void) : ior_output_file_ (0) { diff --git a/tests/NestedUpcall/Triangle_Test/server_B.h b/tests/NestedUpcall/Triangle_Test/server_B.h index ec252a201a0..2eb4faaf39d 100644 --- a/tests/NestedUpcall/Triangle_Test/server_B.h +++ b/tests/NestedUpcall/Triangle_Test/server_B.h @@ -1,22 +1,18 @@ -// -*- c++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/NestedUpCalls/Triangle_Test -// -// = FILENAME -// server_B.h -// -// = DESCRIPTION -// This class implements a simple server for the -// Nested Upcalls - Triangle test -// -// = AUTHORS -// Michael Kircher -// -// ============================================================================ + +//============================================================================= +/** + * @file server_B.h + * + * $Id$ + * + * This class implements a simple server for the + * Nested Upcalls - Triangle test + * + * + * @author Michael Kircher + */ +//============================================================================= + #ifndef _TRIANGLE_TEST_OBJECT_B_SERVER_H #define _TRIANGLE_TEST_OBJECT_B_SERVER_H @@ -31,47 +27,49 @@ #include "tao/Utils/ORB_Manager.h" #include "Object_B_i.h" +/** + * @class Object_B_Server + * + * @brief This is the server for the object A in the test. + * + * See the README file for more information. + */ class Object_B_Server { - // = TITLE - // This is the server for the object A in the test. - // - // = DESCRIPTION - // See the README file for more information. public: + /// Default constructor Object_B_Server (void); - // Default constructor + /// Destructor ~Object_B_Server (void); - // Destructor + /// Initialize the NestedUpCalls_Server state - parsing arguments and ... int init (int argc, ACE_TCHAR **argv); - // Initialize the NestedUpCalls_Server state - parsing arguments and ... + /// Run the orb int run (void); - // Run the orb private: + /// Parses the commandline arguments. int parse_args (void); - // Parses the commandline arguments. + /// File to output the IOR of the object A. FILE* ior_output_file_; - // File to output the IOR of the object A. + /// The ORB manager TAO_ORB_Manager orb_manager_; - // The ORB manager + /// Implementation object of the NestedUpCalls reactor. Object_B_i object_B_i_; - // Implementation object of the NestedUpCalls reactor. + /// Number of commandline arguments. int argc_; - // Number of commandline arguments. + /// commandline arguments. ACE_TCHAR **argv_; - // commandline arguments. }; #endif /* _TRIANGLE_TEST_OBJECT_B_SERVER_H */ diff --git a/tests/Nested_Event_Loop/Makefile.am b/tests/Nested_Event_Loop/Makefile.am deleted file mode 100644 index 82890659246..00000000000 --- a/tests/Nested_Event_Loop/Makefile.am +++ /dev/null @@ -1,115 +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.Nested_Event_Loop_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.Nested_Event_Loop_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 \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Nested_Event_Loop_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/Nested_Event_Loop/client.cpp b/tests/Nested_Event_Loop/client.cpp index cda926dccea..4f1a972f14f 100644 --- a/tests/Nested_Event_Loop/client.cpp +++ b/tests/Nested_Event_Loop/client.cpp @@ -2,13 +2,10 @@ #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" -#include "ace/OS.h" #include "test_i.h" #include "tao/Strategies/advanced_resource.h" -ACE_RCSID(Nested_Event_Loop, client, "$Id$") - // Name of file contains ior. static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior"); diff --git a/tests/Nested_Event_Loop/server.cpp b/tests/Nested_Event_Loop/server.cpp index baa544c7042..2dbfed5c6fc 100644 --- a/tests/Nested_Event_Loop/server.cpp +++ b/tests/Nested_Event_Loop/server.cpp @@ -5,8 +5,6 @@ #include "tao/Strategies/advanced_resource.h" -ACE_RCSID(Nested_Event_Loop, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); int @@ -31,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Nested_Event_Loop/test_i.cpp b/tests/Nested_Event_Loop/test_i.cpp index 3703b96ad4e..607f87b5ee1 100644 --- a/tests/Nested_Event_Loop/test_i.cpp +++ b/tests/Nested_Event_Loop/test_i.cpp @@ -3,8 +3,6 @@ #include "test_i.h" #include "ace/OS_NS_string.h" -ACE_RCSID(Nested_Event_Loop, test_i, "$Id$") - server_i::server_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Nested_Upcall_Crash/Client_Peer.cpp b/tests/Nested_Upcall_Crash/Client_Peer.cpp index 7cb44068e63..19e2cb8f1a4 100644 --- a/tests/Nested_Upcall_Crash/Client_Peer.cpp +++ b/tests/Nested_Upcall_Crash/Client_Peer.cpp @@ -11,8 +11,6 @@ #include "tao/ORB_Core.h" #include "ace/Reactor.h" -ACE_RCSID(Nested_Upcall_Crash, Client_Peer, "$Id$") - class Crasher : public ACE_Event_Handler { public: diff --git a/tests/Nested_Upcall_Crash/Clock_Ticks.cpp b/tests/Nested_Upcall_Crash/Clock_Ticks.cpp index 2d1c7cbbb59..f91cc2b1705 100644 --- a/tests/Nested_Upcall_Crash/Clock_Ticks.cpp +++ b/tests/Nested_Upcall_Crash/Clock_Ticks.cpp @@ -8,8 +8,6 @@ */ #include "Clock_Ticks.h" -ACE_RCSID(Nested_Upcall_Crash, Clock_Ticks, "$Id$") - long Clock_Ticks::get_hz (void) { diff --git a/tests/Nested_Upcall_Crash/Clock_Ticks.h b/tests/Nested_Upcall_Crash/Clock_Ticks.h index 162dec87a9f..ea090bb72e8 100644 --- a/tests/Nested_Upcall_Crash/Clock_Ticks.h +++ b/tests/Nested_Upcall_Crash/Clock_Ticks.h @@ -9,8 +9,6 @@ * */ -#include "ace/OS.h" - namespace Clock_Ticks { /// Return the number of clock ticks per second diff --git a/tests/Nested_Upcall_Crash/Makefile.am b/tests/Nested_Upcall_Crash/Makefile.am deleted file mode 100644 index 8b5f7ab96e0..00000000000 --- a/tests/Nested_Upcall_Crash/Makefile.am +++ /dev/null @@ -1,159 +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.Nested_Upcall_Crash_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.Nested_Upcall_Crash_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_Peer.cpp \ - Clock_Ticks.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Client_Peer.h \ - Clock_Ticks.h - -client_LDADD = \ - $(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_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.Nested_Upcall_Crash_Scavenger.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += scavenger - -scavenger_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -scavenger_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - scavenger.cpp \ - Client_Peer.h \ - Clock_Ticks.h \ - Server_Peer.h - -scavenger_LDADD = \ - $(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_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.Nested_Upcall_Crash_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Clock_Ticks.cpp \ - Server_Peer.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Clock_Ticks.h \ - Server_Peer.h - -server_LDADD = \ - $(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_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 - -## 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/Nested_Upcall_Crash/Server_Peer.cpp b/tests/Nested_Upcall_Crash/Server_Peer.cpp index 294c3acfa60..7c95f5779e0 100644 --- a/tests/Nested_Upcall_Crash/Server_Peer.cpp +++ b/tests/Nested_Upcall_Crash/Server_Peer.cpp @@ -9,9 +9,7 @@ #include "Server_Peer.h" #include "tao/debug.h" -ACE_RCSID(Nested_Upcall_Crash, Server_Peer, "$Id$") - -Server_Peer::Server_Peer (ACE_RANDR_TYPE seed, +Server_Peer::Server_Peer (unsigned int seed, CORBA::ORB_ptr orb, CORBA::ULong payload_size) : seed_ (seed) @@ -25,7 +23,7 @@ Server_Peer::callme(Test::Peer_ptr callback, CORBA::ULong max_depth, Test::Payload const &) { - int r = ACE_OS::rand_r(this->seed_) % 50; + int r = ACE_OS::rand_r(&this->seed_) % 50; if(TAO_debug_level) { diff --git a/tests/Nested_Upcall_Crash/Server_Peer.h b/tests/Nested_Upcall_Crash/Server_Peer.h index 0840e86c995..e1db55b5ef3 100644 --- a/tests/Nested_Upcall_Crash/Server_Peer.h +++ b/tests/Nested_Upcall_Crash/Server_Peer.h @@ -15,7 +15,7 @@ class Server_Peer : public POA_Test::Peer { public: - Server_Peer (ACE_RANDR_TYPE seed, + Server_Peer (unsigned int seed, CORBA::ORB_ptr orb, CORBA::ULong payload_size); @@ -26,7 +26,7 @@ public: void noop(void); private: - ACE_RANDR_TYPE seed_; + unsigned int seed_; CORBA::ORB_var orb_; diff --git a/tests/Nested_Upcall_Crash/client.cpp b/tests/Nested_Upcall_Crash/client.cpp index 6dfa76d62de..4f87edd2180 100644 --- a/tests/Nested_Upcall_Crash/client.cpp +++ b/tests/Nested_Upcall_Crash/client.cpp @@ -8,8 +8,6 @@ #include "ace/Get_Opt.h" #include "ace/Reactor.h" -ACE_RCSID(Nested_Upcall_Crash, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -153,7 +151,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/tests/Nested_Upcall_Crash/scavenger.cpp b/tests/Nested_Upcall_Crash/scavenger.cpp index 5636a204d2e..16801621f7b 100644 --- a/tests/Nested_Upcall_Crash/scavenger.cpp +++ b/tests/Nested_Upcall_Crash/scavenger.cpp @@ -6,8 +6,6 @@ #include "tao/ORB_Core.h" #include "ace/Get_Opt.h" -ACE_RCSID(Nested_Upcall_Crash, scavenger, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); #if defined (ACE_OPENVMS) @@ -113,6 +111,6 @@ 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/tests/Nested_Upcall_Crash/server.cpp b/tests/Nested_Upcall_Crash/server.cpp index 87c06081f53..5abc07a54f5 100644 --- a/tests/Nested_Upcall_Crash/server.cpp +++ b/tests/Nested_Upcall_Crash/server.cpp @@ -9,12 +9,8 @@ #include "ace/Reactor.h" #include "ace/OS_NS_time.h" -ACE_RCSID (Nested_Upcall_Crash, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); -ACE_RANDR_TYPE seed; +unsigned int seed; int payload_size = 4; int @@ -78,7 +74,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) policies[0]->destroy (); - seed = (ACE_RANDR_TYPE) ACE_OS::gethrtime (); + seed = (unsigned int) ACE_OS::gethrtime (); if (parse_args (argc, argv) != 0) return 1; @@ -171,7 +167,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/tests/No_Server_MT_Connect_Test/Makefile.am b/tests/No_Server_MT_Connect_Test/Makefile.am deleted file mode 100644 index 539bb917d34..00000000000 --- a/tests/No_Server_MT_Connect_Test/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.No_Server_Connect_Test_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.No_Server_Connect_Test_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 \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.No_Server_Connect_Test_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_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/No_Server_MT_Connect_Test/client.cpp b/tests/No_Server_MT_Connect_Test/client.cpp index 6dddbd46c07..ee461bf6f73 100644 --- a/tests/No_Server_MT_Connect_Test/client.cpp +++ b/tests/No_Server_MT_Connect_Test/client.cpp @@ -5,8 +5,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(MT_Client, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 5; int niterations = 5; @@ -44,7 +42,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; } @@ -112,8 +110,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "threads finished\n")); - - orb->destroy (); } catch (const CORBA::Exception& ex) diff --git a/tests/No_Server_MT_Connect_Test/server.cpp b/tests/No_Server_MT_Connect_Test/server.cpp index 7250c546583..cc915920a38 100644 --- a/tests/No_Server_MT_Connect_Test/server.cpp +++ b/tests/No_Server_MT_Connect_Test/server.cpp @@ -4,8 +4,6 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(MT_Client, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int @@ -29,7 +27,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/tests/No_Server_MT_Connect_Test/test.idl b/tests/No_Server_MT_Connect_Test/test.idl index cbb8054de28..1c92c90a571 100644 --- a/tests/No_Server_MT_Connect_Test/test.idl +++ b/tests/No_Server_MT_Connect_Test/test.idl @@ -11,7 +11,7 @@ interface Simple_Server /// Shutdown the server /** - * Provide a simple way to cleanup the test when it finishes + * Provide a simple way to cleanup the test when it finishes */ oneway void shutdown (); }; diff --git a/tests/No_Server_MT_Connect_Test/test_i.cpp b/tests/No_Server_MT_Connect_Test/test_i.cpp index 12636da24aa..f2601f6c371 100644 --- a/tests/No_Server_MT_Connect_Test/test_i.cpp +++ b/tests/No_Server_MT_Connect_Test/test_i.cpp @@ -2,8 +2,6 @@ #include "test_i.h" -ACE_RCSID(MT_Client, test_i, "$Id$") - Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/OBV/Any/AnyS_impl.cpp b/tests/OBV/Any/AnyS_impl.cpp index 20d38507d16..361111eb191 100644 --- a/tests/OBV/Any/AnyS_impl.cpp +++ b/tests/OBV/Any/AnyS_impl.cpp @@ -2,9 +2,6 @@ #include "AnyS_impl.h" - -ACE_RCSID(Any, AnyS_impl, "$Id$") - Test_impl::Test_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/OBV/Any/AnyS_impl.h b/tests/OBV/Any/AnyS_impl.h index 44540f31ac8..7bdb376b825 100644 --- a/tests/OBV/Any/AnyS_impl.h +++ b/tests/OBV/Any/AnyS_impl.h @@ -1,35 +1,33 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/OBV/Any -// -// = FILENAME -// AnyS_impl.h -// -// = AUTHOR -// Boris Kolpackov <bosk@ipmce.ru> -// -// ============================================================================ + +//============================================================================= +/** + * @file AnyS_impl.h + * + * $Id$ + * + * @author Boris Kolpackov <bosk@ipmce.ru> + */ +//============================================================================= + #ifndef TAO_ANY_S_IMPL_H #define TAO_ANY_S_IMPL_H #include "AnyS.h" +/** + * @class Test_impl + * + * @brief Implementation of Test interface + * + * This interface is provided to produce valuetypes and test + * marshaling + */ class Test_impl : public POA_OBV_AnyTest::Test { - // = TITLE - // Implementation of Test interface - // - // = DESCRIPTION - // This interface is provided to produce valuetypes and test - // marshaling - // public: + /// ctor Test_impl (CORBA::ORB_ptr orb); - // ctor virtual CORBA::Any * get_something ( CORBA::Boolean need_vb); @@ -39,9 +37,9 @@ public: virtual void shutdown (void); private: + /// The ORB CORBA::ORB_var orb_; CORBA::Boolean even_; - // The ORB }; #endif /* TAO_ANY_S_IMPL_H */ diff --git a/tests/OBV/Any/Makefile.am b/tests/OBV/Any/Makefile.am deleted file mode 100644 index abd75cf96f9..00000000000 --- a/tests/OBV/Any/Makefile.am +++ /dev/null @@ -1,112 +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.OBV_Any_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - AnyC.cpp \ - AnyC.h \ - AnyC.inl \ - AnyS.cpp \ - AnyS.h \ - AnyS.inl - -CLEANFILES = \ - Any-stamp \ - AnyC.cpp \ - AnyC.h \ - AnyC.inl \ - AnyS.cpp \ - AnyS.h \ - AnyS.inl - -AnyC.cpp AnyC.h AnyC.inl AnyS.cpp AnyS.h AnyS.inl: Any-stamp - -Any-stamp: $(srcdir)/Any.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Any.idl - @touch $@ - -noinst_HEADERS = \ - Any.idl - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_Any_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - AnyC.cpp \ - client.cpp \ - AnyS_impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_Any_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - AnyC.cpp \ - AnyS.cpp \ - AnyS_impl.cpp \ - server.cpp \ - AnyS_impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/tests/OBV/Any/client.cpp b/tests/OBV/Any/client.cpp index 80a7b272826..834c8aee7f7 100644 --- a/tests/OBV/Any/client.cpp +++ b/tests/OBV/Any/client.cpp @@ -3,8 +3,6 @@ #include "AnyC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Any, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -29,7 +27,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/tests/OBV/Any/server.cpp b/tests/OBV/Any/server.cpp index 0dec3a4796d..cc4bf4b55a1 100644 --- a/tests/OBV/Any/server.cpp +++ b/tests/OBV/Any/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Any, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -30,7 +28,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/tests/OBV/Collocated/Forward/Collocated_Test.cpp b/tests/OBV/Collocated/Forward/Collocated_Test.cpp index b0900f52ba8..b0532b8e688 100644 --- a/tests/OBV/Collocated/Forward/Collocated_Test.cpp +++ b/tests/OBV/Collocated/Forward/Collocated_Test.cpp @@ -36,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) // This is a hack but that is okay! return 0; } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/OBV/Collocated/Forward/Makefile.am b/tests/OBV/Collocated/Forward/Makefile.am deleted file mode 100644 index b5206b8c925..00000000000 --- a/tests/OBV/Collocated/Forward/Makefile.am +++ /dev/null @@ -1,145 +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) - -CLEANFILES = -BUILT_SOURCES = - -## Makefile.OBV_Forward_Collocated.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - TreeBaseC.cpp \ - TreeBaseC.h \ - TreeBaseC.inl \ - TreeBaseS.cpp \ - TreeBaseS.h \ - TreeBaseS.inl - -CLEANFILES += \ - TreeBase-stamp \ - TreeBaseC.cpp \ - TreeBaseC.h \ - TreeBaseC.inl \ - TreeBaseS.cpp \ - TreeBaseS.h \ - TreeBaseS.inl - -TreeBaseC.cpp TreeBaseC.h TreeBaseC.inl TreeBaseS.cpp TreeBaseS.h TreeBaseS.inl: TreeBase-stamp - -TreeBase-stamp: $(srcdir)/TreeBase.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeBase.idl - @touch $@ - -BUILT_SOURCES += \ - TreeControllerC.cpp \ - TreeControllerC.h \ - TreeControllerC.inl \ - TreeControllerS.cpp \ - TreeControllerS.h \ - TreeControllerS.inl - -CLEANFILES += \ - TreeController-stamp \ - TreeControllerC.cpp \ - TreeControllerC.h \ - TreeControllerC.inl \ - TreeControllerS.cpp \ - TreeControllerS.h \ - TreeControllerS.inl - -TreeControllerC.cpp TreeControllerC.h TreeControllerC.inl TreeControllerS.cpp TreeControllerS.h TreeControllerS.inl: TreeController-stamp - -TreeController-stamp: $(srcdir)/TreeController.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeController.idl - @touch $@ - -BUILT_SOURCES += \ - TreeNodeC.cpp \ - TreeNodeC.h \ - TreeNodeC.inl \ - TreeNodeS.cpp \ - TreeNodeS.h \ - TreeNodeS.inl - -CLEANFILES += \ - TreeNode-stamp \ - TreeNodeC.cpp \ - TreeNodeC.h \ - TreeNodeC.inl \ - TreeNodeS.cpp \ - TreeNodeS.h \ - TreeNodeS.inl - -TreeNodeC.cpp TreeNodeC.h TreeNodeC.inl TreeNodeS.cpp TreeNodeS.h TreeNodeS.inl: TreeNode-stamp - -TreeNode-stamp: $(srcdir)/TreeNode.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeNode.idl - @touch $@ - -noinst_PROGRAMS = collocated - -collocated_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -collocated_SOURCES = \ - Client_Task.cpp \ - Collocated_Test.cpp \ - Server_Task.cpp \ - Test_impl.cpp \ - TreeBaseC.cpp \ - TreeBaseS.cpp \ - TreeControllerC.cpp \ - TreeControllerS.cpp \ - TreeNodeC.cpp \ - TreeNodeS.cpp \ - Client_Task.h \ - Server_Task.h \ - Test_impl.h \ - TreeBaseC.h \ - TreeBaseC.inl \ - TreeBaseS.h \ - TreeBaseS.inl \ - TreeControllerC.h \ - TreeControllerC.inl \ - TreeControllerS.h \ - TreeControllerS.inl \ - TreeNodeC.h \ - TreeNodeC.inl \ - TreeNodeS.h \ - TreeNodeS.inl - -collocated_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/tests/OBV/Collocated/Forward/Test_impl.h b/tests/OBV/Collocated/Forward/Test_impl.h index 56bfb18a128..491368adb23 100644 --- a/tests/OBV/Collocated/Forward/Test_impl.h +++ b/tests/OBV/Collocated/Forward/Test_impl.h @@ -1,17 +1,14 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/OBV/Collocated/Forward -// -// = FILENAME -// Test_impl.h -// -// = AUTHOR -// Boris Kolpackov <bosk@ipmce.ru> -// -// ============================================================================ + +//============================================================================= +/** + * @file Test_impl.h + * + * $Id$ + * + * @author Boris Kolpackov <bosk@ipmce.ru> + */ +//============================================================================= + #ifndef TAO_TEST_IMPL_H #define TAO_TEST_IMPL_H @@ -20,18 +17,19 @@ #include "TreeBaseS.h" #include "TreeNodeS.h" +/** + * @class Test_impl + * + * @brief Implementation of Test interface + * + * This interface is provided to produce valuetypes and test + * marshaling + */ class Test_impl : public POA_Test { - // = TITLE - // Implementation of Test interface - // - // = DESCRIPTION - // This interface is provided to produce valuetypes and test - // marshaling - // public: + /// ctor Test_impl (CORBA::ORB_ptr orb); - // ctor virtual TreeController * reflect ( TreeController * tc); @@ -39,8 +37,8 @@ public: virtual void shutdown (void); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB }; #endif /* TAO_TEST_IMPL_H */ diff --git a/tests/OBV/Collocated/Forward/TreeBase.idl b/tests/OBV/Collocated/Forward/TreeBase.idl index 662c919aea5..b350133f8ea 100644 --- a/tests/OBV/Collocated/Forward/TreeBase.idl +++ b/tests/OBV/Collocated/Forward/TreeBase.idl @@ -6,8 +6,8 @@ valuetype BaseNode; //@@ Dosn't work for now //typedef sequence<BaseNode> BaseNodeSeq; -// Performance test: One may try to pass -// over the wire a cyclic graph and measure +// Performance test: One may try to pass +// over the wire a cyclic graph and measure // how quickly TAO evaporates memory ;-) valuetype BaseNode diff --git a/tests/OBV/Collocated/Forward/TreeController.idl b/tests/OBV/Collocated/Forward/TreeController.idl index 4a9705db918..11665da53fe 100644 --- a/tests/OBV/Collocated/Forward/TreeController.idl +++ b/tests/OBV/Collocated/Forward/TreeController.idl @@ -2,8 +2,8 @@ valuetype BaseNode; -// This TreeController is probably a silly idea. -// All I want from it is a valutype forward declared +// This TreeController is probably a silly idea. +// All I want from it is a valutype forward declared // in one file and fully defined in another. valuetype TreeController @@ -15,7 +15,7 @@ interface Test { // Returnes the reflected copy of its argument. TreeController reflect (in TreeController tc); - + // Shutdown the romote ORB oneway void shutdown (); }; diff --git a/tests/OBV/Collocated/Forward/TreeNode.idl b/tests/OBV/Collocated/Forward/TreeNode.idl index 06010fd7b18..f37c1639395 100644 --- a/tests/OBV/Collocated/Forward/TreeNode.idl +++ b/tests/OBV/Collocated/Forward/TreeNode.idl @@ -5,7 +5,7 @@ // // A concrete node type // -valuetype StringNode : BaseNode +valuetype StringNode : BaseNode { public string name; }; diff --git a/tests/OBV/Collocated/Makefile.am b/tests/OBV/Collocated/Makefile.am deleted file mode 100644 index b00fc1a19f3..00000000000 --- a/tests/OBV/Collocated/Makefile.am +++ /dev/null @@ -1,13 +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 = \ - Forward - diff --git a/tests/OBV/Factory/Factory.idl b/tests/OBV/Factory/Factory.idl index f6fd41a6ab7..43ce343697a 100644 --- a/tests/OBV/Factory/Factory.idl +++ b/tests/OBV/Factory/Factory.idl @@ -10,7 +10,7 @@ module OBV_FactoryTest // // Base valuetype without any ops or factories. Result should be - // concrete BaseConcreteValue_init class ready to use. + // concrete BaseConcreteValue_init class ready to use. // valuetype BaseValue { @@ -19,13 +19,13 @@ module OBV_FactoryTest { unsigned long value; }; - + public unsigned long some_data; }; - + // // Another valuetype w/o ops, etc. Just to check proper inheritance - // of OBV_ classes and RefCounter's. Value1_init should be + // of OBV_ classes and RefCounter's. Value1_init should be // concrete as well. // valuetype Value1 : BaseValue @@ -40,7 +40,7 @@ module OBV_FactoryTest { public unsigned long id; public BV_Data data; - + factory create_default (in unsigned long id); factory create (in unsigned long id, in BV_Data data); @@ -53,7 +53,7 @@ module OBV_FactoryTest { BaseValue get_base_value (); Value1 get_value1 (); - Value2 get_value2 (); + Value2 get_value2 (); // Shutdown the romote ORB oneway void shutdown (); diff --git a/tests/OBV/Factory/FactoryC_impl.cpp b/tests/OBV/Factory/FactoryC_impl.cpp index 7bd2c91de8d..ceeec488401 100644 --- a/tests/OBV/Factory/FactoryC_impl.cpp +++ b/tests/OBV/Factory/FactoryC_impl.cpp @@ -1,8 +1,6 @@ -#include "FactoryC_impl.h" +// $Id$ -ACE_RCSID (Factory, - FactoryC_impl, - "$Id$") +#include "FactoryC_impl.h" OBV_FactoryTest::Value2* Value2_init_impl::create_default (CORBA::ULong id) diff --git a/tests/OBV/Factory/FactoryS_impl.cpp b/tests/OBV/Factory/FactoryS_impl.cpp index 57551f9d9ef..a1bd5c28db1 100644 --- a/tests/OBV/Factory/FactoryS_impl.cpp +++ b/tests/OBV/Factory/FactoryS_impl.cpp @@ -3,9 +3,6 @@ #include "FactoryC_impl.h" #include "FactoryS_impl.h" - -ACE_RCSID(Factory, FactoryS_impl, "$Id$") - Test_impl::Test_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/OBV/Factory/FactoryS_impl.h b/tests/OBV/Factory/FactoryS_impl.h index 24dfdf771d3..5dd7138e2ad 100644 --- a/tests/OBV/Factory/FactoryS_impl.h +++ b/tests/OBV/Factory/FactoryS_impl.h @@ -1,35 +1,33 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/OBV/Factory -// -// = FILENAME -// FactoryS_impl.h -// -// = AUTHOR -// Boris Kolpackov <bosk@ipmce.ru> -// -// ============================================================================ + +//============================================================================= +/** + * @file FactoryS_impl.h + * + * $Id$ + * + * @author Boris Kolpackov <bosk@ipmce.ru> + */ +//============================================================================= + #ifndef TAO_FACTORY_S_IMPL_H #define TAO_FACTORY_S_IMPL_H #include "FactoryS.h" +/** + * @class Test_impl + * + * @brief Implementation of Test interface + * + * This interface is provided to produce valuetypes and test + * marshaling + */ class Test_impl : public POA_OBV_FactoryTest::Test { - // = TITLE - // Implementation of Test interface - // - // = DESCRIPTION - // This interface is provided to produce valuetypes and test - // marshaling - // public: + /// ctor Test_impl (CORBA::ORB_ptr orb); - // ctor virtual OBV_FactoryTest::BaseValue * get_base_value (void); @@ -40,8 +38,8 @@ public: virtual void shutdown (void); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB }; #endif /* TAO_FACTORY_S_IMPL_H */ diff --git a/tests/OBV/Factory/Makefile.am b/tests/OBV/Factory/Makefile.am deleted file mode 100644 index decffcc6769..00000000000 --- a/tests/OBV/Factory/Makefile.am +++ /dev/null @@ -1,115 +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.OBV_Factory_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - FactoryC.cpp \ - FactoryC.h \ - FactoryC.inl \ - FactoryS.cpp \ - FactoryS.h \ - FactoryS.inl - -CLEANFILES = \ - Factory-stamp \ - FactoryC.cpp \ - FactoryC.h \ - FactoryC.inl \ - FactoryS.cpp \ - FactoryS.h \ - FactoryS.inl - -FactoryC.cpp FactoryC.h FactoryC.inl FactoryS.cpp FactoryS.h FactoryS.inl: Factory-stamp - -Factory-stamp: $(srcdir)/Factory.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Factory.idl - @touch $@ - -noinst_HEADERS = \ - Factory.idl - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_Factory_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - FactoryC.cpp \ - FactoryC_impl.cpp \ - client.cpp \ - FactoryC_impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_Factory_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - FactoryC.cpp \ - FactoryC_impl.cpp \ - FactoryS.cpp \ - FactoryS_impl.cpp \ - server.cpp \ - FactoryC_impl.h \ - FactoryS_impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/tests/OBV/Factory/client.cpp b/tests/OBV/Factory/client.cpp index b8e19d18d56..902fb5dd29d 100644 --- a/tests/OBV/Factory/client.cpp +++ b/tests/OBV/Factory/client.cpp @@ -4,8 +4,6 @@ #include "FactoryC_impl.h" #include "ace/Get_Opt.h" -ACE_RCSID(Factory, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -30,7 +28,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/tests/OBV/Factory/server.cpp b/tests/OBV/Factory/server.cpp index 0cae1904804..528d1516f73 100644 --- a/tests/OBV/Factory/server.cpp +++ b/tests/OBV/Factory/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Factory, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -30,7 +28,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/tests/OBV/Forward/Makefile.am b/tests/OBV/Forward/Makefile.am deleted file mode 100644 index 49e12b6b43f..00000000000 --- a/tests/OBV/Forward/Makefile.am +++ /dev/null @@ -1,168 +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 = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.OBV_Forward_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - TreeBaseC.cpp \ - TreeBaseC.h \ - TreeBaseC.inl \ - TreeBaseS.cpp \ - TreeBaseS.h \ - TreeBaseS.inl - -CLEANFILES += \ - TreeBase-stamp \ - TreeBaseC.cpp \ - TreeBaseC.h \ - TreeBaseC.inl \ - TreeBaseS.cpp \ - TreeBaseS.h \ - TreeBaseS.inl - -TreeBaseC.cpp TreeBaseC.h TreeBaseC.inl TreeBaseS.cpp TreeBaseS.h TreeBaseS.inl: TreeBase-stamp - -TreeBase-stamp: $(srcdir)/TreeBase.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeBase.idl - @touch $@ - -BUILT_SOURCES += \ - TreeControllerC.cpp \ - TreeControllerC.h \ - TreeControllerC.inl \ - TreeControllerS.cpp \ - TreeControllerS.h \ - TreeControllerS.inl - -CLEANFILES += \ - TreeController-stamp \ - TreeControllerC.cpp \ - TreeControllerC.h \ - TreeControllerC.inl \ - TreeControllerS.cpp \ - TreeControllerS.h \ - TreeControllerS.inl - -TreeControllerC.cpp TreeControllerC.h TreeControllerC.inl TreeControllerS.cpp TreeControllerS.h TreeControllerS.inl: TreeController-stamp - -TreeController-stamp: $(srcdir)/TreeController.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeController.idl - @touch $@ - -BUILT_SOURCES += \ - TreeNodeC.cpp \ - TreeNodeC.h \ - TreeNodeC.inl \ - TreeNodeS.cpp \ - TreeNodeS.h \ - TreeNodeS.inl - -CLEANFILES += \ - TreeNode-stamp \ - TreeNodeC.cpp \ - TreeNodeC.h \ - TreeNodeC.inl \ - TreeNodeS.cpp \ - TreeNodeS.h \ - TreeNodeS.inl - -TreeNodeC.cpp TreeNodeC.h TreeNodeC.inl TreeNodeS.cpp TreeNodeS.h TreeNodeS.inl: TreeNode-stamp - -TreeNode-stamp: $(srcdir)/TreeNode.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/TreeNode.idl - @touch $@ - -noinst_HEADERS = \ - TreeBase.idl \ - TreeController.idl \ - TreeNode.idl - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_Forward_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - TreeBaseC.cpp \ - TreeControllerC.cpp \ - TreeNodeC.cpp \ - client.cpp \ - Test_impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_Forward_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Test_impl.cpp \ - TreeBaseC.cpp \ - TreeBaseS.cpp \ - TreeControllerC.cpp \ - TreeControllerS.cpp \ - TreeNodeC.cpp \ - TreeNodeS.cpp \ - server.cpp \ - Test_impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/tests/OBV/Forward/Test_impl.cpp b/tests/OBV/Forward/Test_impl.cpp index c3a7d239330..78d97b39cf7 100644 --- a/tests/OBV/Forward/Test_impl.cpp +++ b/tests/OBV/Forward/Test_impl.cpp @@ -3,8 +3,6 @@ #include "Test_impl.h" #include "TreeBaseC.h" -ACE_RCSID(Forward, Test_impl, "$Id$") - Test_impl::Test_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/OBV/Forward/Test_impl.h b/tests/OBV/Forward/Test_impl.h index 9092f1576e4..99d7d47f66d 100644 --- a/tests/OBV/Forward/Test_impl.h +++ b/tests/OBV/Forward/Test_impl.h @@ -1,35 +1,33 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/OBV/Forward -// -// = FILENAME -// Test_impl.h -// -// = AUTHOR -// Boris Kolpackov <bosk@ipmce.ru> -// -// ============================================================================ + +//============================================================================= +/** + * @file Test_impl.h + * + * $Id$ + * + * @author Boris Kolpackov <bosk@ipmce.ru> + */ +//============================================================================= + #ifndef TAO_TEST_IMPL_H #define TAO_TEST_IMPL_H #include "TreeControllerS.h" +/** + * @class Test_impl + * + * @brief Implementation of Test interface + * + * This interface is provided to produce valuetypes and test + * marshaling + */ class Test_impl : public POA_Test { - // = TITLE - // Implementation of Test interface - // - // = DESCRIPTION - // This interface is provided to produce valuetypes and test - // marshaling - // public: + /// ctor Test_impl (CORBA::ORB_ptr orb); - // ctor virtual TreeController * reflect ( TreeController * tc); @@ -37,8 +35,8 @@ public: virtual void shutdown (void); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB }; #endif /* TAO_TEST_IMPL_H */ diff --git a/tests/OBV/Forward/TreeBase.idl b/tests/OBV/Forward/TreeBase.idl index 662c919aea5..b350133f8ea 100644 --- a/tests/OBV/Forward/TreeBase.idl +++ b/tests/OBV/Forward/TreeBase.idl @@ -6,8 +6,8 @@ valuetype BaseNode; //@@ Dosn't work for now //typedef sequence<BaseNode> BaseNodeSeq; -// Performance test: One may try to pass -// over the wire a cyclic graph and measure +// Performance test: One may try to pass +// over the wire a cyclic graph and measure // how quickly TAO evaporates memory ;-) valuetype BaseNode diff --git a/tests/OBV/Forward/TreeController.idl b/tests/OBV/Forward/TreeController.idl index 4a9705db918..11665da53fe 100644 --- a/tests/OBV/Forward/TreeController.idl +++ b/tests/OBV/Forward/TreeController.idl @@ -2,8 +2,8 @@ valuetype BaseNode; -// This TreeController is probably a silly idea. -// All I want from it is a valutype forward declared +// This TreeController is probably a silly idea. +// All I want from it is a valutype forward declared // in one file and fully defined in another. valuetype TreeController @@ -15,7 +15,7 @@ interface Test { // Returnes the reflected copy of its argument. TreeController reflect (in TreeController tc); - + // Shutdown the romote ORB oneway void shutdown (); }; diff --git a/tests/OBV/Forward/TreeNode.idl b/tests/OBV/Forward/TreeNode.idl index 06010fd7b18..f37c1639395 100644 --- a/tests/OBV/Forward/TreeNode.idl +++ b/tests/OBV/Forward/TreeNode.idl @@ -5,7 +5,7 @@ // // A concrete node type // -valuetype StringNode : BaseNode +valuetype StringNode : BaseNode { public string name; }; diff --git a/tests/OBV/Forward/client.cpp b/tests/OBV/Forward/client.cpp index dabff3e82c4..9055a264a94 100644 --- a/tests/OBV/Forward/client.cpp +++ b/tests/OBV/Forward/client.cpp @@ -1,14 +1,11 @@ // $Id$ - #include "TreeBaseC.h" #include "TreeControllerC.h" #include "TreeNodeC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Forward, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -33,7 +30,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/tests/OBV/Forward/server.cpp b/tests/OBV/Forward/server.cpp index 178555e3dd2..9ed20a28341 100644 --- a/tests/OBV/Forward/server.cpp +++ b/tests/OBV/Forward/server.cpp @@ -8,8 +8,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Forward, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -34,7 +32,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/tests/OBV/Indirection/MessengerClient.cpp b/tests/OBV/Indirection/MessengerClient.cpp index 68112813009..2269964b8b4 100644 --- a/tests/OBV/Indirection/MessengerClient.cpp +++ b/tests/OBV/Indirection/MessengerClient.cpp @@ -37,11 +37,11 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { bb->b1 (p1); bb->b2 (p1); - ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing two boxed values in one valuetype: %s\n", + ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing two boxed values in one valuetype: %s\n", tst->receive_boxedvalue (b))); - ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing one boxed values twice in one valuetype: %s\n", + ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing one boxed values twice in one valuetype: %s\n", tst->receive_boxedvalue (bb))); - ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing two integers: %s\n", + ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing two integers: %s\n", tst->receive_long (p1, p2))); ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing one integer twice: %s\n", tst->receive_long (p1, p1))); diff --git a/tests/OBV/Indirection/MessengerServer.cpp b/tests/OBV/Indirection/MessengerServer.cpp index 3bbb89b1966..f6797e1a980 100644 --- a/tests/OBV/Indirection/MessengerServer.cpp +++ b/tests/OBV/Indirection/MessengerServer.cpp @@ -15,36 +15,44 @@ void write_ior(const char* ior) { out << ior; } -int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { +int ACE_TMAIN (int ac, ACE_TCHAR* av[]) +{ + try + { + CORBA::ORB_var orb = CORBA::ORB_init(ac, av); - CORBA::ORB_var orb = CORBA::ORB_init(ac, av); + NodeFactory::register_new_factory(* orb.in()); + BoxedValueFactory::register_new_factory(* orb.in()); + BaseValueFactory::register_new_factory(* orb.in()); + TValueFactory::register_new_factory(* orb.in()); + ConfigValueFactory::register_new_factory(* orb.in()); - NodeFactory::register_new_factory(* orb.in()); - BoxedValueFactory::register_new_factory(* orb.in()); - BaseValueFactory::register_new_factory(* orb.in()); - TValueFactory::register_new_factory(* orb.in()); - ConfigValueFactory::register_new_factory(* orb.in()); + CORBA::Object_var obj = orb->resolve_initial_references("RootPOA"); + PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in()); - CORBA::Object_var obj = orb->resolve_initial_references("RootPOA"); - PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in()); + PortableServer::POAManager_var poaman = poa->the_POAManager(); - PortableServer::POAManager_var poaman = poa->the_POAManager(); + PortableServer::Servant_var<Messenger_i> svt = new Messenger_i; - PortableServer::Servant_var<Messenger_i> svt = new Messenger_i; + PortableServer::ObjectId_var id = poa->activate_object(svt.in()); + obj = poa->id_to_reference(id.in()); + CORBA::String_var ior = orb->object_to_string(obj.in()); + write_ior(ior.in()); - PortableServer::ObjectId_var id = poa->activate_object(svt.in()); - obj = poa->id_to_reference(id.in()); - CORBA::String_var ior = orb->object_to_string(obj.in()); - write_ior(ior.in()); + std::cout << "Starting server." << std::endl; - std::cout << "Starting server." << std::endl; + poaman->activate(); - poaman->activate(); + orb->run(); - orb->run(); - - poa->destroy(true, true); - orb->destroy(); + poa->destroy(true, true); + orb->destroy(); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + return 1; + } return 0; } diff --git a/tests/OBV/Indirection/Messenger_i.cpp b/tests/OBV/Indirection/Messenger_i.cpp index eccd01852bd..bd845b32e07 100644 --- a/tests/OBV/Indirection/Messenger_i.cpp +++ b/tests/OBV/Indirection/Messenger_i.cpp @@ -19,9 +19,9 @@ char * Messenger_i::receive_boxedvalue (::demo::value::idl::boxedValue * b) std::ostringstream os; if (b == 0) os << "null boxed values"; - else + else os << "boxed values: " << b->b1 ()->_value() << ", " << b->b2 ()->_value(); - + return CORBA::string_dup (os.str().c_str()); } @@ -36,7 +36,7 @@ char * Messenger_i::receive_long ( os << "shared long: " << p1->_value (); else os << "two longs: " << p1->_value () << ", " << p2->_value (); - + return CORBA::string_dup (os.str().c_str()); } @@ -71,7 +71,7 @@ char * Messenger_i::receive_list (::demo::value::idl::Node * node) if (l[i] == x) break; } - + if (l[i] == x) break; @@ -92,18 +92,18 @@ char * Messenger_i::receive_list (::demo::value::idl::Node * node) return CORBA::string_dup (os.str().c_str()); } -char * +char * Messenger_i::receive_truncatable (::demo::value::idl::TValue *& v) { - v->data (v->data () + 1); - v->basic_data (v->basic_data () + 1); + v->data (v->data () + 1); + v->basic_data (v->basic_data () + 1); std::ostringstream os; os << "truncatable basic_data " << v->basic_data () << " data " << v->data (); return CORBA::string_dup (os.str().c_str()); } -char * +char * Messenger_i::receive_sequence (const ::demo::value::idl::ConfigValues & v) { std::ostringstream os; diff --git a/tests/OBV/Indirection/Messenger_i.h b/tests/OBV/Indirection/Messenger_i.h index 34cbeb3ff95..dc8f061cb07 100644 --- a/tests/OBV/Indirection/Messenger_i.h +++ b/tests/OBV/Indirection/Messenger_i.h @@ -11,7 +11,7 @@ class Messenger_i : public virtual POA_demo::value::idl::ValueServer { public: Messenger_i(); - + virtual char * receive_boxedvalue ( ::demo::value::idl::boxedValue * b); diff --git a/tests/OBV/Indirection/run_test.pl b/tests/OBV/Indirection/run_test.pl index 0808ee9c8d4..8c4a7e550b4 100755 --- a/tests/OBV/Indirection/run_test.pl +++ b/tests/OBV/Indirection/run_test.pl @@ -22,24 +22,24 @@ $S->Spawn(); if ($server->WaitForFileTimed ($iorfile, $server->ProcessStartWaitInterval()) == -1) { print STDERR "ERROR: cannot find file <$server_iorfile>\n"; - $S->Kill(); + $S->Kill(); exit 1; } -$C = $client->CreateProcess("MessengerClient"); +$C = $client->CreateProcess("MessengerClient"); $C->Spawn(); $CRET = $C->WaitKill($client->ProcessStartWaitInterval()); $S->Kill(); -# clean-up +# clean-up $server->DeleteFile($iorfile); if ($CRET != 0) { print STDERR "ERROR: Client returned <$CRET>\n"; exit 1 ; -} +} exit 0; diff --git a/tests/OBV/Makefile.am b/tests/OBV/Makefile.am deleted file mode 100644 index 4e18d90f362..00000000000 --- a/tests/OBV/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 = \ - Any \ - Collocated \ - Factory \ - Forward \ - Simple \ - TC_Alignment \ - Truncatable \ - ValueBox - diff --git a/tests/OBV/Simple/Client_i.cpp b/tests/OBV/Simple/Client_i.cpp index cc43b60108c..e83a9203b6a 100644 --- a/tests/OBV/Simple/Client_i.cpp +++ b/tests/OBV/Simple/Client_i.cpp @@ -3,8 +3,6 @@ #include "Client_i.h" #include "OBV_impl.h" -#include "tao/ORB_Core.h" - #include "ace/Get_Opt.h" #include "ace/OS_NS_sys_time.h" diff --git a/tests/OBV/Simple/Client_i.h b/tests/OBV/Simple/Client_i.h index 7406b10edcb..296bf588550 100644 --- a/tests/OBV/Simple/Client_i.h +++ b/tests/OBV/Simple/Client_i.h @@ -1,26 +1,20 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/examples/OBV/Typed_Events -// -// = FILENAME -// Client_i.h -// -// = DESCRIPTION -// This class is a template for a CORBA client. -// run () sends some valuetypes to a server and -// gets back a list of valuetypes. -// -// = AUTHOR -// -// Torsten Kuepper -// based on the echo example -// from code from Balachandran Natarajan <bala@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file Client_i.h + * + * $Id$ + * + * This class is a template for a CORBA client. + * run () sends some valuetypes to a server and + * gets back a list of valuetypes. + * + * + * @author Torsten Kuepperbased on the echo examplefrom code from Balachandran Natarajan <bala@cs.wustl.edu> + */ +//============================================================================= + #ifndef ECHO_CLIENT_I_H #define ECHO_CLIENT_I_H @@ -28,28 +22,30 @@ #include "OBVC.h" #include "Simple_util.h" +/** + * @class Checkpoint_Client_i + * + * @brief Checkpoint_Client interface subclass. + * + * This class implements the interface between the interface + * objects and the client . + */ class Checkpoint_Client_i { - // = TITLE - // Checkpoint_Client interface subclass. - // - // = DESCRIPTION - // This class implements the interface between the interface - // objects and the client . public: // = Initialization and termination methods. + /// Constructor Checkpoint_Client_i (void); - // Constructor + /// Destructor virtual ~Checkpoint_Client_i (void); - // Destructor + /// Execute the methods virtual int run (const char *,int, ACE_TCHAR** ); - // Execute the methods private: + /// Instantiate the checkpoint object. Client<Checkpoint, Checkpoint_var> checkpoint; - // Instantiate the checkpoint object. }; diff --git a/tests/OBV/Simple/Makefile.am b/tests/OBV/Simple/Makefile.am deleted file mode 100644 index 95707be9505..00000000000 --- a/tests/OBV/Simple/Makefile.am +++ /dev/null @@ -1,121 +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.OBV_Simple_IDL.am - -BUILT_SOURCES = \ - OBVC.cpp \ - OBVC.h \ - OBVC.inl \ - OBVS.cpp \ - OBVS.h \ - OBVS.inl - -CLEANFILES = \ - OBV-stamp \ - OBVC.cpp \ - OBVC.h \ - OBVC.inl \ - OBVS.cpp \ - OBVS.h \ - OBVS.inl - -OBVC.cpp OBVC.h OBVC.inl OBVS.cpp OBVS.h OBVS.inl: OBV-stamp - -OBV-stamp: $(srcdir)/OBV.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa $(srcdir)/OBV.idl - @touch $@ - -noinst_HEADERS = \ - OBV.idl - -## Makefile.OBV_Simple_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_i.cpp \ - OBVC.cpp \ - OBVS.cpp \ - OBV_impl.cpp \ - client.cpp \ - Client_i.h \ - OBV_impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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.OBV_Simple_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - OBVC.cpp \ - OBVS.cpp \ - OBV_impl.cpp \ - Server_i.cpp \ - server.cpp \ - OBV_impl.h \ - Server_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/OBV/Simple/Server_i.h b/tests/OBV/Simple/Server_i.h index 0d249a51b72..ae0b534a54b 100644 --- a/tests/OBV/Simple/Server_i.h +++ b/tests/OBV/Simple/Server_i.h @@ -1,23 +1,18 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/OBV/Typed_Events -// -// = FILENAME -// Server_i.h -// -// = DESCRIPTION -// This class implements the Event_Types IDL interface. -// -// = AUTHOR -// Torsten Kuepper -// derived from the Echo example TAO/example/Simple/echo -// of Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file Server_i.h + * + * $Id$ + * + * This class implements the Event_Types IDL interface. + * + * + * @author Torsten Kuepper derived from the Echo example TAO/example/Simple/echo of Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + #ifndef ECHO_I_H #define ECHO_I_H @@ -29,11 +24,11 @@ class Checkpoint_i : public POA_Checkpoint { public: // = Initialization and termination methods. + /// Constructor. Checkpoint_i (void); - // Constructor. + /// Destructor. ~Checkpoint_i (void); - // Destructor. virtual void put_event ( Event * e @@ -42,12 +37,12 @@ public: virtual void shutdown ( ); + /// Set the ORB pointer. void orb (CORBA::ORB_ptr o); - // Set the ORB pointer. private: + /// ORB pointer. CORBA::ORB_var orb_; - // ORB pointer. }; #endif /* ECHO_I_H */ diff --git a/tests/OBV/Simple/Simple_util.h b/tests/OBV/Simple/Simple_util.h index a8c70b1d52f..55da5de3889 100644 --- a/tests/OBV/Simple/Simple_util.h +++ b/tests/OBV/Simple/Simple_util.h @@ -1,24 +1,15 @@ -//$Id$ - -// This version of Simple_Util doesn't need to link against orbsvcs -// On the other hand it has no naming service. - -// ============================================================================ -// -// = LIBRARY -// -// taken from TAO/tests/Simple -// -// = FILENAME -// Simple_Util.h -// -// = DESCRIPTION -// The classe define the templates for the client and server. -// -// = AUTHOR -// Balachandran Natarajan <bala@cs.wustl.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file Simple_util.h + * + * $Id$ + * + * The classe define the templates for the client and server. + * + * + * @author Balachandran Natarajan <bala@cs.wustl.edu> + */ +//============================================================================= #ifndef TAO_UTIL_H #define TAO_UTIL_H @@ -28,134 +19,138 @@ #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" +/** + * @class Server + * + * @brief A set of useful class Templates for using the TAO CORBA + * implementation. + * + * A template server definition. This template can be used by + * single server/client projects for defintion of their + * server/clients. See the directories time, bank, echo for + * further details of implemenatation. + */ template <class Servant> class Server { - // = TITLE - // A set of useful class Templates for using the TAO CORBA - // implementation. - // - // = DESCRIPTION - // A template server definition. This template can be used by - // single server/client projects for defintion of their - // server/clients. See the directories time, bank, echo for - // further details of implemenatation. public: // = Initialization and termination methods. + /// Constructor. Server (void); - // Constructor. + /// Destructor. ~Server (void); - // Destructor. + /// Initialize the Server state - parsing arguments and waiting. + /// interface_name is the name used to register the Servant. int init (const char *servant_name, int argc, ACE_TCHAR *argv[]); - // Initialize the Server state - parsing arguments and waiting. - // interface_name is the name used to register the Servant. + /// After calling <init>, this method will register the server with + /// the TAO Naming Service using the servant_name passed to <init>. int register_name (void); - // After calling <init>, this method will register the server with - // the TAO Naming Service using the servant_name passed to <init>. + /// Run the orb. int run (void); - // Run the orb. protected: + /// Servant class Servant servant_; - // Servant class + /// name of the servant to be used for TAO Naming Service const char *name; - // name of the servant to be used for TAO Naming Service + /// Parses the commandline arguments. int parse_args (void); - // Parses the commandline arguments. + /// The ORB manager - a helper class for accessing the POA and + /// registering objects. TAO_ORB_Manager orb_manager_; - // The ORB manager - a helper class for accessing the POA and - // registering objects. // TAO_Naming_Server namingServer; // helper class for getting access to Naming Service. + /// File where the IOR of the server object is stored. FILE *ior_output_file_; - // File where the IOR of the server object is stored. + /// Number of command line arguments. int argc_; - // Number of command line arguments. + /// The command line arguments. ACE_TCHAR **argv_; - // The command line arguments. }; +/** + * @class Client + * + * @brief Template Client class + * + * A template client implementation for a single server/client + * model. The example usage of these usage can be found in the + * sub-directories below + */ template <class InterfaceObj, class Var> class Client { - // = TITLE - // Template Client class - // - // = DESCRIPTION - // A template client implementation for a single server/client - // model. The example usage of these usage can be found in the - // sub-directories below public: // = Initialization and termination methods. + /// Constructor. Client (void); - // Constructor. + /// Destructor. ~Client (void); - // Destructor. + /// Initialize the client communication endpoint with server. int init (const char *name,int argc, ACE_TCHAR *argv[]); - // Initialize the client communication endpoint with server. + /// Return the interface object pointer. InterfaceObj *operator-> () { return server_.in ();}; - // Return the interface object pointer. + /// Returns the shutdown flag. int shutdown (void ); - // Returns the shutdown flag. + /// Fills in the shutdwon flag. void shutdown (int); - // Fills in the shutdwon flag. + /// Initialize naming service int obtain_initial_references (void); - // Initialize naming service protected: + /// Function to read the server IOR from a file. int read_ior (ACE_TCHAR *filename); - // Function to read the server IOR from a file. + /// Parses the arguments passed on the command line. int parse_args (void); - // Parses the arguments passed on the command line. // TAO_Naming_Client namingClient; // helper class for getting access to Naming Service. + /// # of arguments on the command line. int argc_; - // # of arguments on the command line. + /// arguments from command line. ACE_TCHAR **argv_; - // arguments from command line. + /// IOR of the obj ref of the server. ACE_TCHAR *ior_; - // IOR of the obj ref of the server. + /// Name to be usred for the naming service char *name_; - // Name to be usred for the naming service + /// Remember our orb. CORBA::ORB_var orb_; - // Remember our orb. + /// Server object Var server_; - // Server object + /// Flag to use the naming service int naming_; - // Flag to use the naming service + /// Flag for shutting down the server int shutdown_; - // Flag for shutting down the server }; diff --git a/tests/OBV/Supports/Supports_Test.idl b/tests/OBV/Supports/Supports_Test.idl index e86e3956839..9b60a941d7a 100644 --- a/tests/OBV/Supports/Supports_Test.idl +++ b/tests/OBV/Supports/Supports_Test.idl @@ -65,7 +65,7 @@ module Supports_Test long size (); void add_node (in string name); void print (); - + }; valuetype vt_graph supports graph diff --git a/tests/OBV/Supports/client.cpp b/tests/OBV/Supports/client.cpp index 2e77f6911e2..669d551153b 100644 --- a/tests/OBV/Supports/client.cpp +++ b/tests/OBV/Supports/client.cpp @@ -38,7 +38,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/tests/OBV/Supports/server.cpp b/tests/OBV/Supports/server.cpp index ae5bfe517f7..45870a85cab 100644 --- a/tests/OBV/Supports/server.cpp +++ b/tests/OBV/Supports/server.cpp @@ -28,7 +28,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/tests/OBV/TC_Alignment/Makefile.am b/tests/OBV/TC_Alignment/Makefile.am deleted file mode 100644 index 4b3f77b6592..00000000000 --- a/tests/OBV/TC_Alignment/Makefile.am +++ /dev/null @@ -1,112 +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.OBV_TC_Alignment_Idl.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_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_TC_Alignment_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 \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_TC_Alignment_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/tests/OBV/TC_Alignment/client.cpp b/tests/OBV/TC_Alignment/client.cpp index f88a5eb5392..5059c5a740c 100644 --- a/tests/OBV/TC_Alignment/client.cpp +++ b/tests/OBV/TC_Alignment/client.cpp @@ -3,10 +3,6 @@ #include "testC.h" #include "ace/Get_Opt.h" -ACE_RCSID (TC_Alignment, - client, - "$Id$") - static const ACE_TCHAR *ior_input_file = ACE_TEXT("file://test.ior"); static obvmod::tcOffset1 *vt1 = 0; @@ -143,7 +139,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/tests/OBV/TC_Alignment/server.cpp b/tests/OBV/TC_Alignment/server.cpp index eaf77808813..7a7b83fb205 100644 --- a/tests/OBV/TC_Alignment/server.cpp +++ b/tests/OBV/TC_Alignment/server.cpp @@ -4,10 +4,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" -ACE_RCSID (TC_Alignment, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +28,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/tests/OBV/TC_Alignment/test.idl b/tests/OBV/TC_Alignment/test.idl index a48a747f219..e21abcf1f46 100644 --- a/tests/OBV/TC_Alignment/test.idl +++ b/tests/OBV/TC_Alignment/test.idl @@ -1,20 +1,17 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/OBV/TC_Alignment -// -// = FILENAME -// test.idl -// -// = DESCRIPTION -// IDL description of the TypeCode alignment Test interface for valuetypes -// -// = AUTHOR -// Jeff Parsons <j.parsons@vanderbilt.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file test.idl + * + * $Id$ + * + * IDL description of the TypeCode alignment Test interface for valuetypes + * + * + * @author Jeff Parsons <j.parsons@vanderbilt.edu> + */ +//============================================================================= + module obvmod { diff --git a/tests/OBV/TC_Alignment/test_i.cpp b/tests/OBV/TC_Alignment/test_i.cpp index 734c078f6c8..71ca17435a1 100644 --- a/tests/OBV/TC_Alignment/test_i.cpp +++ b/tests/OBV/TC_Alignment/test_i.cpp @@ -2,10 +2,6 @@ #include "test_i.h" -ACE_RCSID (TC_Alignment, - test_i, - "$Id$") - test_i::test_i (CORBA::ORB_ptr orb) : orb_ (orb) { diff --git a/tests/OBV/TC_Alignment/test_i.h b/tests/OBV/TC_Alignment/test_i.h index b51b8e7e1ab..c4a7c8086cc 100644 --- a/tests/OBV/TC_Alignment/test_i.h +++ b/tests/OBV/TC_Alignment/test_i.h @@ -1,17 +1,14 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/OBV/TC_Alignment -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Jeff Parsons <j.parsons@vanderbilt.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Jeff Parsons <j.parsons@vanderbilt.edu> + */ +//============================================================================= + #ifndef TAO_OBV_TC_ALIGNMENT_TEST_I_H #define TAO_OBV_TC_ALIGNMENT_TEST_I_H diff --git a/tests/OBV/Truncatable/Makefile.am b/tests/OBV/Truncatable/Makefile.am deleted file mode 100644 index 07a4b563f98..00000000000 --- a/tests/OBV/Truncatable/Makefile.am +++ /dev/null @@ -1,141 +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 = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.OBV_Truncatable_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - ExtraC.cpp \ - ExtraC.h \ - ExtraC.inl \ - ExtraS.cpp \ - ExtraS.h \ - ExtraS.inl - -CLEANFILES += \ - Extra-stamp \ - ExtraC.cpp \ - ExtraC.h \ - ExtraC.inl \ - ExtraS.cpp \ - ExtraS.h \ - ExtraS.inl - -ExtraC.cpp ExtraC.h ExtraC.inl ExtraS.cpp ExtraS.h ExtraS.inl: Extra-stamp - -Extra-stamp: $(srcdir)/Extra.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Extra.idl - @touch $@ - -BUILT_SOURCES += \ - TruncatableC.cpp \ - TruncatableC.h \ - TruncatableC.inl \ - TruncatableS.cpp \ - TruncatableS.h \ - TruncatableS.inl - -CLEANFILES += \ - Truncatable-stamp \ - TruncatableC.cpp \ - TruncatableC.h \ - TruncatableC.inl \ - TruncatableS.cpp \ - TruncatableS.h \ - TruncatableS.inl - -TruncatableC.cpp TruncatableC.h TruncatableC.inl TruncatableS.cpp TruncatableS.h TruncatableS.inl: Truncatable-stamp - -Truncatable-stamp: $(srcdir)/Truncatable.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Truncatable.idl - @touch $@ - -noinst_HEADERS = \ - Extra.idl \ - Truncatable.idl - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_Truncatable_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - ExtraC.cpp \ - TruncatableC.cpp \ - client.cpp \ - TruncatableS_impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.OBV_Truncatable_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - ExtraC.cpp \ - ExtraS.cpp \ - TruncatableC.cpp \ - TruncatableS.cpp \ - TruncatableS_impl.cpp \ - server.cpp \ - TruncatableS_impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/tests/OBV/Truncatable/TruncatableS_impl.cpp b/tests/OBV/Truncatable/TruncatableS_impl.cpp index cebb9267320..cf704486e3c 100644 --- a/tests/OBV/Truncatable/TruncatableS_impl.cpp +++ b/tests/OBV/Truncatable/TruncatableS_impl.cpp @@ -3,8 +3,6 @@ #include "TruncatableS_impl.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Truncatable, TruncatableS_impl, "$Id$") - Test_impl::Test_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/OBV/Truncatable/TruncatableS_impl.h b/tests/OBV/Truncatable/TruncatableS_impl.h index 4c8c6d46218..456b546e83e 100644 --- a/tests/OBV/Truncatable/TruncatableS_impl.h +++ b/tests/OBV/Truncatable/TruncatableS_impl.h @@ -1,35 +1,33 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/OBV/Truncatable -// -// = FILENAME -// TruncatableS_impl.h -// -// = AUTHOR -// Boris Kolpackov <bosk@ipmce.ru> -// -// ============================================================================ +//============================================================================= +/** + * @file TruncatableS_impl.h + * + * $Id$ + * + * @author Boris Kolpackov <bosk@ipmce.ru> + */ +//============================================================================= + #ifndef TAO_TRUNCATABLE_S_IMPL_H #define TAO_TRUNCATABLE_S_IMPL_H #include "TruncatableS.h" +/** + * @class Test_impl + * + * @brief Implementation of Test interface + * + * This interface is provided to produce valuetypes and test + * marshaling + */ class Test_impl : public POA_OBV_TruncatableTest::Test { - // = TITLE - // Implementation of Test interface - // - // = DESCRIPTION - // This interface is provided to produce valuetypes and test - // marshaling - // public: + /// ctor Test_impl (CORBA::ORB_ptr orb); - // ctor virtual void op1 ( const char * id, @@ -71,8 +69,8 @@ public: virtual void shutdown (void); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB }; #endif /* TAO_TRUNCATABLE_S_IMPL_H */ diff --git a/tests/OBV/Truncatable/client.cpp b/tests/OBV/Truncatable/client.cpp index 2bc631f9667..4527a992e32 100644 --- a/tests/OBV/Truncatable/client.cpp +++ b/tests/OBV/Truncatable/client.cpp @@ -4,9 +4,7 @@ #include "ExtraC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Truncatable, client, "$Id$") - - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); +const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int fail = 0; int pretest = 0; @@ -50,7 +48,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/tests/OBV/Truncatable/server.cpp b/tests/OBV/Truncatable/server.cpp index 4e45ad361ec..fdad2ebdcf2 100644 --- a/tests/OBV/Truncatable/server.cpp +++ b/tests/OBV/Truncatable/server.cpp @@ -5,8 +5,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Truncatable, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -31,7 +29,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/tests/OBV/ValueBox/Makefile.am b/tests/OBV/ValueBox/Makefile.am deleted file mode 100644 index 42a3f415f4c..00000000000 --- a/tests/OBV/ValueBox/Makefile.am +++ /dev/null @@ -1,195 +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 = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.valuebox_idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES += \ - vb_basicC.cpp \ - vb_basicC.h \ - vb_basicC.inl \ - vb_basicS.cpp \ - vb_basicS.h \ - vb_basicS.inl - -CLEANFILES += \ - vb_basic-stamp \ - vb_basicC.cpp \ - vb_basicC.h \ - vb_basicC.inl \ - vb_basicS.cpp \ - vb_basicS.h \ - vb_basicS.inl - -vb_basicC.cpp vb_basicC.h vb_basicC.inl vb_basicS.cpp vb_basicS.h vb_basicS.inl: vb_basic-stamp - -vb_basic-stamp: $(srcdir)/vb_basic.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/vb_basic.idl - @touch $@ - -BUILT_SOURCES += \ - vb_structC.cpp \ - vb_structC.h \ - vb_structC.inl \ - vb_structS.cpp \ - vb_structS.h \ - vb_structS.inl - -CLEANFILES += \ - vb_struct-stamp \ - vb_structC.cpp \ - vb_structC.h \ - vb_structC.inl \ - vb_structS.cpp \ - vb_structS.h \ - vb_structS.inl - -vb_structC.cpp vb_structC.h vb_structC.inl vb_structS.cpp vb_structS.h vb_structS.inl: vb_struct-stamp - -vb_struct-stamp: $(srcdir)/vb_struct.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/vb_struct.idl - @touch $@ - -BUILT_SOURCES += \ - vb_unionC.cpp \ - vb_unionC.h \ - vb_unionC.inl \ - vb_unionS.cpp \ - vb_unionS.h \ - vb_unionS.inl - -CLEANFILES += \ - vb_union-stamp \ - vb_unionC.cpp \ - vb_unionC.h \ - vb_unionC.inl \ - vb_unionS.cpp \ - vb_unionS.h \ - vb_unionS.inl - -vb_unionC.cpp vb_unionC.h vb_unionC.inl vb_unionS.cpp vb_unionS.h vb_unionS.inl: vb_union-stamp - -vb_union-stamp: $(srcdir)/vb_union.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/vb_union.idl - @touch $@ - -BUILT_SOURCES += \ - valueboxC.cpp \ - valueboxC.h \ - valueboxC.inl \ - valueboxS.cpp \ - valueboxS.h \ - valueboxS.inl - -CLEANFILES += \ - valuebox-stamp \ - valueboxC.cpp \ - valueboxC.h \ - valueboxC.inl \ - valueboxS.cpp \ - valueboxS.h \ - valueboxS.inl - -valueboxC.cpp valueboxC.h valueboxC.inl valueboxS.cpp valueboxS.h valueboxS.inl: valuebox-stamp - -valuebox-stamp: $(srcdir)/valuebox.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/valuebox.idl - @touch $@ - -noinst_HEADERS = \ - valuebox.idl \ - vb_basic.idl \ - vb_struct.idl \ - vb_union.idl - -endif BUILD_EXCEPTIONS - -## Makefile.Valuebox_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 \ - valueboxC.cpp \ - vb_basicC.cpp \ - vb_structC.cpp \ - vb_unionC.cpp \ - Test_impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Valuebox_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Test_impl.cpp \ - server.cpp \ - valueboxC.cpp \ - valueboxS.cpp \ - vb_basicC.cpp \ - vb_basicS.cpp \ - vb_structC.cpp \ - vb_structS.cpp \ - vb_unionC.cpp \ - vb_unionS.cpp \ - Test_impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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/tests/OBV/ValueBox/Test_impl.cpp b/tests/OBV/ValueBox/Test_impl.cpp index ec5b020d1c5..50e9c5b1d19 100644 --- a/tests/OBV/ValueBox/Test_impl.cpp +++ b/tests/OBV/ValueBox/Test_impl.cpp @@ -2,10 +2,6 @@ #include "Test_impl.h" -ACE_RCSID(Forward, - Test_impl, - "$Id$") - Test_impl::Test_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/OBV/ValueBox/Test_impl.h b/tests/OBV/ValueBox/Test_impl.h index 179177176be..c5857dd9d47 100644 --- a/tests/OBV/ValueBox/Test_impl.h +++ b/tests/OBV/ValueBox/Test_impl.h @@ -1,17 +1,14 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/OBV/ValueBox -// -// = FILENAME -// Test_impl.h -// -// = AUTHOR -// Gary Maxey -// -// ============================================================================ + +//============================================================================= +/** + * @file Test_impl.h + * + * $Id$ + * + * @author Gary Maxey + */ +//============================================================================= + #ifndef TAO_TEST_IMPL_H @@ -23,8 +20,8 @@ class Test_impl : public POA_Test { public: + /// ctor Test_impl (CORBA::ORB_ptr orb); - // ctor virtual VBlong * basic_op1 ( VBlong * p1, @@ -111,8 +108,8 @@ public: virtual void shutdown (void); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB }; #endif /* TAO_TEST_IMPL_H */ diff --git a/tests/OBV/ValueBox/client.cpp b/tests/OBV/ValueBox/client.cpp index 5044f87e6ea..a88b462bdfa 100644 --- a/tests/OBV/ValueBox/client.cpp +++ b/tests/OBV/ValueBox/client.cpp @@ -3,11 +3,6 @@ #include "valueboxC.h" #include "ace/Get_Opt.h" -ACE_RCSID(ValueBox, - client, - "$Id$") - - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -32,7 +27,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; } @@ -65,29 +60,29 @@ int box_test1 (BoxT *valuebox, UT val1, UT val2) OBV_VERITY ( &valuebox_clone->_boxed_inout () != &valuebox->_boxed_inout () ); // but values should be equal - OBV_VERITY ( valuebox_clone->_value () == valuebox->_value () ); + OBV_VERITY (ACE::is_equal (valuebox_clone->_value (), valuebox->_value ())); // Check that modifier is working. valuebox_clone->_value ( val2 ); - OBV_VERITY ( valuebox_clone->_value () != valuebox->_value () ); + OBV_VERITY (!ACE::is_equal (valuebox_clone->_value (), valuebox->_value ())); // use operator= *valuebox = val2; - OBV_VERITY ( valuebox_clone->_value () == valuebox->_value () ); + OBV_VERITY (ACE::is_equal (valuebox_clone->_value (), valuebox->_value ())); // Check that _value and _boxed_in are the same. - OBV_VERITY ( valuebox_clone->_value () == valuebox_clone->_boxed_in () ); - OBV_VERITY ( valuebox->_value () == valuebox->_boxed_in () ); + OBV_VERITY (ACE::is_equal (valuebox_clone->_value (), valuebox_clone->_boxed_in ())); + OBV_VERITY (ACE::is_equal (valuebox->_value (), valuebox->_boxed_in ())); // Used _boxed_inout to change the value - OBV_VERITY ( valuebox->_value () != val1 ); + OBV_VERITY (!ACE::is_equal (valuebox->_value (), val1)); valuebox->_boxed_inout () = val1; - OBV_VERITY ( valuebox->_value () == val1 ); + OBV_VERITY (ACE::is_equal (valuebox->_value (), val1)); // Use _boxed_out to access the value - OBV_VERITY ( valuebox_clone->_value () != val1 ); + OBV_VERITY (!ACE::is_equal (valuebox_clone->_value (), val1)); valuebox_clone->_boxed_out () = val1; - OBV_VERITY ( valuebox_clone->_value () == val1 ); + OBV_VERITY (ACE::is_equal (valuebox_clone->_value (), val1)); // Test _copy_value CORBA::ValueBase *copy = valuebox->_copy_value (); @@ -105,10 +100,10 @@ int box_test1 (BoxT *valuebox, UT val1, UT val2) } else { - OBV_VERITY ( down->_value () == val1 ); + OBV_VERITY (ACE::is_equal (down->_value (), val1)); down->_value ( val2 ); - OBV_VERITY ( down->_value () != valuebox->_value () ); - OBV_VERITY ( down->_value () == val2 ); + OBV_VERITY (!ACE::is_equal (down->_value (), valuebox->_value ())); + OBV_VERITY (ACE::is_equal (down->_value (), val2)); } CORBA::remove_ref (copy); diff --git a/tests/OBV/ValueBox/server.cpp b/tests/OBV/ValueBox/server.cpp index 773833fa73e..37f27f1ccb3 100644 --- a/tests/OBV/ValueBox/server.cpp +++ b/tests/OBV/ValueBox/server.cpp @@ -5,10 +5,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(ValueBox, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -33,7 +29,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/tests/OBV/ValueBox/valuebox.idl b/tests/OBV/ValueBox/valuebox.idl index 6af684b75aa..235513c6c55 100644 --- a/tests/OBV/ValueBox/valuebox.idl +++ b/tests/OBV/ValueBox/valuebox.idl @@ -38,20 +38,20 @@ interface Test out vb_basic::M_VBlong p3); long basic_op3 (in long p1, inout long p2, out long p3); - + // Boxed string VBstring string_op1(in VBstring p1, inout VBstring p2, out VBstring p3); string string_op2(in string p1, inout string p2, out string p3); - + // Boxed sequence VBseqlong seq_op1(in VBseqlong p1, inout VBseqlong p2, out VBseqlong p3); void seq_op2(in TDseqlong p1, inout TDseqlong p2, out TDseqlong p3); - + // Boxed struct - VBfixed_struct1 struct_op1(in VBfixed_struct1 p1, + VBfixed_struct1 struct_op1(in VBfixed_struct1 p1, inout VBfixed_struct1 p2, out VBfixed_struct1 p3); @@ -59,7 +59,7 @@ interface Test inout Fixed_Struct1 p2, out Fixed_Struct1 p3); - VBvariable_struct1 struct_op3(in VBvariable_struct1 p1, + VBvariable_struct1 struct_op3(in VBvariable_struct1 p1, inout VBvariable_struct1 p2, out VBvariable_struct1 p3); @@ -79,9 +79,9 @@ interface Test void array_op4 (in StringArray p1, inout StringArray p2, out StringArray p3); - + // Boxed union - VBfixed_union1 union_op1(in VBfixed_union1 p1, + VBfixed_union1 union_op1(in VBfixed_union1 p1, inout VBfixed_union1 p2, out VBfixed_union1 p3); @@ -89,14 +89,14 @@ interface Test inout Fixed_Union1 p2, out Fixed_Union1 p3); - VBvariable_union1 union_op3(in VBvariable_union1 p1, + VBvariable_union1 union_op3(in VBvariable_union1 p1, inout VBvariable_union1 p2, out VBvariable_union1 p3); void union_op4(in Variable_Union1 p1, inout Variable_Union1 p2, out Variable_Union1 p3); - + // Shutdown the remote ORB oneway void shutdown (); }; diff --git a/tests/OBV/ValueBox/vb_basic.idl b/tests/OBV/ValueBox/vb_basic.idl index 3c4c5f09c54..14d1a9791f7 100644 --- a/tests/OBV/ValueBox/vb_basic.idl +++ b/tests/OBV/ValueBox/vb_basic.idl @@ -6,7 +6,7 @@ // Valuebox of all basic types defined at outermost scope: -enum Color { red, orange, yellow, green, blue, indigo, violet }; +enum Color { red, orange, yellow, green, blue, indigo, violet }; valuetype VBshort short; valuetype VBlong long; 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; } diff --git a/tests/ORB_destroy/Makefile.am b/tests/ORB_destroy/Makefile.am deleted file mode 100644 index 254e3a073b4..00000000000 --- a/tests/ORB_destroy/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.ORB_destroy.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = ORB_destroy - -ORB_destroy_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -ORB_destroy_SOURCES = \ - ORB_destroy.cpp - -ORB_destroy_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_destroy/ORB_destroy.cpp b/tests/ORB_destroy/ORB_destroy.cpp index f77379f0d4a..61aa04872aa 100644 --- a/tests/ORB_destroy/ORB_destroy.cpp +++ b/tests/ORB_destroy/ORB_destroy.cpp @@ -1,28 +1,23 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/ORB_destroy -// -// = FILENAME -// ORB_destroy.cpp -// -// = DESCRIPTION -// Simple ORB destruction test. -// -// = AUTHOR -// Irfan Pyarali <irfan@cs.wustl.edu> -// -//========================================================================= + +//============================================================================= +/** + * @file ORB_destroy.cpp + * + * $Id$ + * + * Simple ORB destruction test. + * + * + * @author Irfan Pyarali <irfan@cs.wustl.edu> + */ +//============================================================================= + #include "tao/ORB.h" #include "tao/PortableServer/PortableServer.h" #include "ace/Log_Msg.h" -ACE_RCSID(ORB_destroy, ORB_destroy, "$Id$") - int test_with_regular_poa_manager (int argc, ACE_TCHAR **argv, diff --git a/tests/ORB_init/Makefile.am b/tests/ORB_init/Makefile.am deleted file mode 100644 index 78920636fba..00000000000 --- a/tests/ORB_init/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) - -SUBDIRS = \ - . \ - Portspan - - -## Makefile.ORB_init.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = ORB_init - -ORB_init_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -ORB_init_SOURCES = \ - ORB_init.cpp - -ORB_init_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_init/ORB_init.cpp b/tests/ORB_init/ORB_init.cpp index 679d40521e2..137b3920ba8 100644 --- a/tests/ORB_init/ORB_init.cpp +++ b/tests/ORB_init/ORB_init.cpp @@ -7,10 +7,6 @@ #include "ace/Log_Msg.h" -ACE_RCSID (ORB_init, - ORB_init, - "$Id$") - // Valid test IOR. // Do not attempt to narrow the object represented by this IOR, nor // should you modify the IOR unless you replace it with another diff --git a/tests/ORB_init/Portspan/Makefile.am b/tests/ORB_init/Portspan/Makefile.am deleted file mode 100644 index bf783a3cc2e..00000000000 --- a/tests/ORB_init/Portspan/Makefile.am +++ /dev/null @@ -1,80 +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) - - -## Makefile.ORB_Init_Portspan_Server.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - simpleC.cpp \ - simpleC.h \ - simpleC.inl \ - simpleS.cpp \ - simpleS.h \ - simpleS.inl - -CLEANFILES = \ - simple-stamp \ - simpleC.cpp \ - simpleC.h \ - simpleC.inl \ - simpleS.cpp \ - simpleS.h \ - simpleS.inl - -simpleC.cpp simpleC.h simpleC.inl simpleS.cpp simpleS.h simpleS.inl: simple-stamp - -simple-stamp: $(srcdir)/simple.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/simple.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - simpleC.cpp \ - simpleI.cpp \ - simpleS.cpp \ - simpleC.h \ - simpleC.inl \ - simpleI.h \ - simpleS.h \ - simpleS.inl - -server_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_shutdown/Foo_Bar.cpp b/tests/ORB_shutdown/Foo_Bar.cpp index 27cb46e1a42..a55aa17b7e1 100644 --- a/tests/ORB_shutdown/Foo_Bar.cpp +++ b/tests/ORB_shutdown/Foo_Bar.cpp @@ -1,9 +1,6 @@ -// // $Id$ -// -#include "Foo_Bar.h" -ACE_RCSID(Foo_Bar, Foo_Bar, "$Id$") +#include "Foo_Bar.h" Foo_Bar::Foo_Bar (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) @@ -15,5 +12,12 @@ Foo_Bar::~Foo_Bar (void) ACE_DEBUG ((LM_DEBUG, "(%P|%t) Shutting down the ORB again\n")); - this->orb_->shutdown (1); + try + { + this->orb_->shutdown (1); + } + catch (...) + { + // Don't allow exceptions to leave the destructor. + } } diff --git a/tests/ORB_shutdown/Makefile.am b/tests/ORB_shutdown/Makefile.am deleted file mode 100644 index d0e3e660b0c..00000000000 --- a/tests/ORB_shutdown/Makefile.am +++ /dev/null @@ -1,80 +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) - - -## Makefile.ORB_Shutdown_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) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Foo_Bar.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Foo_Bar.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_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_shutdown/server.cpp b/tests/ORB_shutdown/server.cpp index 32a16e3f383..7618864afe6 100644 --- a/tests/ORB_shutdown/server.cpp +++ b/tests/ORB_shutdown/server.cpp @@ -4,10 +4,6 @@ #include "ace/Time_Value.h" #include "ace/Get_Opt.h" -ACE_RCSID (Hello, - server, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/tests/ORT/Makefile.am b/tests/ORT/Makefile.am deleted file mode 100644 index c801a22a12e..00000000000 --- a/tests/ORT/Makefile.am +++ /dev/null @@ -1,149 +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.Test_ORT_IDL.am - -BUILT_SOURCES = \ - ORT_testC.cpp \ - ORT_testC.h \ - ORT_testC.inl \ - ORT_testS.cpp \ - ORT_testS.h \ - ORT_testS.inl - -CLEANFILES = \ - ORT_test-stamp \ - ORT_testC.cpp \ - ORT_testC.h \ - ORT_testC.inl \ - ORT_testS.cpp \ - ORT_testS.h \ - ORT_testS.inl - -ORT_testC.cpp ORT_testC.h ORT_testC.inl ORT_testS.cpp ORT_testS.h ORT_testS.inl: ORT_test-stamp - -ORT_test-stamp: $(srcdir)/ORT_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/ORT_test.idl - @touch $@ - -BUILT_SOURCES += \ - ObjectReferenceFactoryC.cpp \ - ObjectReferenceFactoryC.h \ - ObjectReferenceFactoryC.inl \ - ObjectReferenceFactoryS.h - -CLEANFILES += \ - ObjectReferenceFactory-stamp \ - ObjectReferenceFactoryC.cpp \ - ObjectReferenceFactoryC.h \ - ObjectReferenceFactoryC.inl \ - ObjectReferenceFactoryS.h - -ObjectReferenceFactoryC.cpp ObjectReferenceFactoryC.h ObjectReferenceFactoryC.inl ObjectReferenceFactoryS.h: ObjectReferenceFactory-stamp - -ObjectReferenceFactory-stamp: $(srcdir)/ObjectReferenceFactory.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -SS $(srcdir)/ObjectReferenceFactory.idl - @touch $@ - -noinst_HEADERS = \ - ORT_test.idl \ - ObjectReferenceFactory.idl - -## Makefile.Test_ORT_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - ORT_testC.cpp \ - ORT_testS.cpp \ - ORT_test_IORInterceptor.cpp \ - ORT_test_i.cpp \ - ObjectReferenceFactory.cpp \ - ObjectReferenceFactoryC.cpp \ - ServerORBInitializer.cpp \ - ServerRequestInterceptor.cpp \ - server.cpp \ - ORT_test_IORInterceptor.h \ - ORT_test_i.h \ - ObjectReferenceFactory.h \ - ServerORBInitializer.h \ - ServerRequestInterceptor.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.Test_ORT_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - ORT_testC.cpp \ - client.cpp \ - ORT_test_IORInterceptor.h \ - ORT_test_i.h \ - ObjectReferenceFactory.h \ - ServerORBInitializer.h \ - ServerRequestInterceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -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/ORT/ORT_test_IORInterceptor.cpp b/tests/ORT/ORT_test_IORInterceptor.cpp index 3d8106210bc..53ddd0ecb11 100644 --- a/tests/ORT/ORT_test_IORInterceptor.cpp +++ b/tests/ORT/ORT_test_IORInterceptor.cpp @@ -1,13 +1,10 @@ +// $Id$ + #include "ORT_test_IORInterceptor.h" #include "ObjectReferenceFactory.h" #include "tao/ORB_Constants.h" -ACE_RCSID (ORT, - ORT_test_IORInterceptor, - "$Id$") - - ORT_test_IORInterceptor::ORT_test_IORInterceptor (void) : establish_count_ (0), components_establish_count_ (0) diff --git a/tests/ORT/ORT_test_i.cpp b/tests/ORT/ORT_test_i.cpp index 3477dd25651..7580b83f35a 100644 --- a/tests/ORT/ORT_test_i.cpp +++ b/tests/ORT/ORT_test_i.cpp @@ -1,10 +1,6 @@ -#include "ORT_test_i.h" - - -ACE_RCSID (ORT, - ORT_test_i, - "$Id$") +// $Id$ +#include "ORT_test_i.h" ORT_test_i::ORT_test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/tests/ORT/ObjectReferenceFactory.cpp b/tests/ORT/ObjectReferenceFactory.cpp index 0373edccd29..cee5cdf81fa 100644 --- a/tests/ORT/ObjectReferenceFactory.cpp +++ b/tests/ORT/ObjectReferenceFactory.cpp @@ -1,11 +1,6 @@ -#include "ObjectReferenceFactory.h" - - -ACE_RCSID (ORT, - ObjectReferenceFactory, - "$Id$") - +// $Id$ +#include "ObjectReferenceFactory.h" #include "tao/debug.h" diff --git a/tests/ORT/ServerORBInitializer.cpp b/tests/ORT/ServerORBInitializer.cpp index 054801c2c7e..c6170fd8ca3 100644 --- a/tests/ORT/ServerORBInitializer.cpp +++ b/tests/ORT/ServerORBInitializer.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "ServerORBInitializer.h" #include "ServerRequestInterceptor.h" #include "ORT_test_IORInterceptor.h" @@ -5,12 +7,6 @@ #include "tao/ORB_Constants.h" #include "tao/PortableServer/PortableServer.h" - -ACE_RCSID (ORT, - ServerORBInitializer, - "$Id$") - - void ServerORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */) diff --git a/tests/ORT/ServerRequestInterceptor.cpp b/tests/ORT/ServerRequestInterceptor.cpp index f7465651657..7d71a124a69 100644 --- a/tests/ORT/ServerRequestInterceptor.cpp +++ b/tests/ORT/ServerRequestInterceptor.cpp @@ -1,15 +1,11 @@ // -*- C++ -*- +// $Id$ #include "ServerRequestInterceptor.h" #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" -ACE_RCSID (ORT, - ServerRequestInterceptor, - "$Id$") - - ServerRequestInterceptor::ServerRequestInterceptor ( const char * orb_id, PortableServer::Current_ptr poa_current) diff --git a/tests/ORT/client.cpp b/tests/ORT/client.cpp index 9d0945ebd74..9d3d446fe01 100644 --- a/tests/ORT/client.cpp +++ b/tests/ORT/client.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" -ACE_RCSID (ORT, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/tests/ORT/server.cpp b/tests/ORT/server.cpp index a340cfb774a..5918b3c001b 100644 --- a/tests/ORT/server.cpp +++ b/tests/ORT/server.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "ORT_test_i.h" #include "ServerORBInitializer.h" @@ -6,11 +8,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (ORT, - server, - "$Id$") - - const ACE_TCHAR *ior_output_file = 0; int @@ -35,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Object_Loader/Loader.cpp b/tests/Object_Loader/Loader.cpp index de9fba45745..ebbe574b6a7 100644 --- a/tests/Object_Loader/Loader.cpp +++ b/tests/Object_Loader/Loader.cpp @@ -3,8 +3,6 @@ #include "Loader.h" #include "Test_i.h" -ACE_RCSID(Object_Loader, Loader, "$Id$") - Loader::Loader (void) { } diff --git a/tests/Object_Loader/Loader.h b/tests/Object_Loader/Loader.h index 18e157271b3..0d2ed52f964 100644 --- a/tests/Object_Loader/Loader.h +++ b/tests/Object_Loader/Loader.h @@ -1,17 +1,14 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Object_Loader -// -// = FILENAME -// Loader.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file Loader.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_OBJECT_LOADER_LOADER_H #define TAO_OBJECT_LOADER_LOADER_H @@ -19,21 +16,22 @@ #include "tao/Object_Loader.h" #include "OLT_Export.h" +/** + * @class Loader + * + * @brief Implement the Test interface + * + */ class OLT_Export Loader : public TAO_Object_Loader { - // = TITLE - // Implement the Test interface - // - // = DESCRIPTION - // public: + /// ctor Loader (void); - // ctor + /// Create a new instance virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv[]); - // Create a new instance }; // ACE_STATIC_SVC_DECLARE (Loader) diff --git a/tests/Object_Loader/Makefile.am b/tests/Object_Loader/Makefile.am deleted file mode 100644 index 0787fd68189..00000000000 --- a/tests/Object_Loader/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) - - -## Makefile.Object_Loader_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.Object_Loader_Test.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES = libTest_DLL.la - -libTest_DLL_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DOLT_BUILD_DLL - -libTest_DLL_la_SOURCES = \ - Loader.cpp \ - TestC.cpp \ - TestS.cpp \ - Test_i.cpp - -noinst_HEADERS += \ - Loader.h \ - Test_i.h - -endif BUILD_EXCEPTIONS - -## Makefile.Object_Loader_Driver.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = driver - -driver_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -driver_SOURCES = \ - TestC.cpp \ - driver.cpp \ - Loader.h \ - OLT_Export.h \ - Test_i.h - -driver_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/Object_Loader/Test_i.cpp b/tests/Object_Loader/Test_i.cpp index f0f147c9f96..6ca3c420183 100644 --- a/tests/Object_Loader/Test_i.cpp +++ b/tests/Object_Loader/Test_i.cpp @@ -2,8 +2,6 @@ #include "Test_i.h" -ACE_RCSID(Object_Loader, Test_i, "$Id$") - CORBA::Long Test_i::instance_count_ = 0; diff --git a/tests/Object_Loader/Test_i.h b/tests/Object_Loader/Test_i.h index e9a7edf00bb..e9efeb48bce 100644 --- a/tests/Object_Loader/Test_i.h +++ b/tests/Object_Loader/Test_i.h @@ -1,17 +1,14 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Object_Loader -// -// = FILENAME -// Test_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file Test_i.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_OBJECT_LOADER_TEST_I_H #define TAO_OBJECT_LOADER_TEST_I_H @@ -19,16 +16,17 @@ #include "TestS.h" #include "OLT_Export.h" +/** + * @class Test_i + * + * @brief Implement the Test interface + * + */ class OLT_Export Test_i : public POA_Test { - // = TITLE - // Implement the Test interface - // - // = DESCRIPTION - // public: + /// ctor Test_i (PortableServer::POA_ptr poa); - // ctor CORBA::Long instance_count (void); @@ -37,8 +35,8 @@ public: PortableServer::POA_ptr _default_POA (void); private: + /// The default POA used for this object PortableServer::POA_var poa_; - // The default POA used for this object static CORBA::Long instance_count_; }; diff --git a/tests/Objref_Sequence_Test/Makefile.am b/tests/Objref_Sequence_Test/Makefile.am deleted file mode 100644 index 3cc784fe1f6..00000000000 --- a/tests/Objref_Sequence_Test/Makefile.am +++ /dev/null @@ -1,103 +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.Objref_Sequence_Test_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.Objref_Sequence_Test_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 - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Objref_Sequence_Test_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 \ - TestS.cpp \ - server.cpp - -server_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/Objref_Sequence_Test/client.cpp b/tests/Objref_Sequence_Test/client.cpp index ca5d67393cb..89484499c3a 100644 --- a/tests/Objref_Sequence_Test/client.cpp +++ b/tests/Objref_Sequence_Test/client.cpp @@ -26,7 +26,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/tests/Objref_Sequence_Test/server.cpp b/tests/Objref_Sequence_Test/server.cpp index 53da8b757dc..65b8af14aa6 100644 --- a/tests/Objref_Sequence_Test/server.cpp +++ b/tests/Objref_Sequence_Test/server.cpp @@ -132,7 +132,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/tests/OctetSeq/Makefile.am b/tests/OctetSeq/Makefile.am deleted file mode 100644 index cba9c243c89..00000000000 --- a/tests/OctetSeq/Makefile.am +++ /dev/null @@ -1,137 +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.OctetSeq_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.OctetSeq_Client.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 = \ - client.cpp \ - testC.cpp \ - test_i.h \ - test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_EXCEPTIONS - -## Makefile.OctetSeq_OctetSeq.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += OctetSeq - -OctetSeq_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -OctetSeq_SOURCES = \ - OctetSeq.cpp \ - testC.cpp \ - test_i.h \ - test_i.inl - -OctetSeq_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.OctetSeq_Server.am - -if BUILD_EXCEPTIONS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h \ - test_i.inl - -server_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_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/tests/OctetSeq/OctetSeq.cpp b/tests/OctetSeq/OctetSeq.cpp index c896d05fd26..899efbc9810 100644 --- a/tests/OctetSeq/OctetSeq.cpp +++ b/tests/OctetSeq/OctetSeq.cpp @@ -1,22 +1,19 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/OctetSeq -// -// = FILENAME -// octetseq.cpp -// -// = DESCRIPTION -// TAO optimizes octet sequences, this test verifies that the -// optimizations do not break any code and that they effectively -// improve performance. -// -// = AUTHORS -// Carlos O'Ryan -// -// ============================================================================ +// -*- C++ -*- + +//============================================================================= +/** + * @file OctetSeq.cpp + * + * $Id$ + * + * TAO optimizes octet sequences, this test verifies that the + * optimizations do not break any code and that they effectively + * improve performance. + * + * + * @author Carlos O'Ryan + */ +//============================================================================= #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" @@ -26,8 +23,6 @@ #include "testC.h" #include "ace/OS_NS_string.h" -ACE_RCSID(OctetSeq, OctetSeq, "$Id$") - static int test_write_octet (TAO_OutputCDR &cdr, char* /* buf */, diff --git a/tests/OctetSeq/client.cpp b/tests/OctetSeq/client.cpp index ecaf3588334..1db48a68a30 100644 --- a/tests/OctetSeq/client.cpp +++ b/tests/OctetSeq/client.cpp @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ #include "ace/Get_Opt.h" @@ -7,11 +8,9 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(OctetSeq, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 5; -ACE_RANDR_TYPE seed = 0; +unsigned int seed = 0; int verbose = 0; int @@ -51,7 +50,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; } @@ -95,7 +94,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (seed == 0) { - seed = static_cast<ACE_RANDR_TYPE> (ACE_OS::time (0)); + seed = static_cast<unsigned int> (ACE_OS::time (0)); ACE_DEBUG ((LM_DEBUG, "Seed value is %d\n", seed)); } @@ -105,20 +104,20 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) for (int i = 0; i != niterations; ++i) { - CORBA::ULong r = ACE_OS::rand_r (seed); + CORBA::ULong r = ACE_OS::rand_r (&seed); Test::Index idx = (r % nelements); if (i % 100 == 0) { for (int j = 0; j != nelements; ++j) { - CORBA::ULong r = ACE_OS::rand_r (seed); + CORBA::ULong r = ACE_OS::rand_r (&seed); CORBA::ULong l = r % maxsize; elements[j].length (l); CORBA::Double token = 0; for (CORBA::ULong k = 0; k != l; ++k) { - r = ACE_OS::rand_r (seed); + r = ACE_OS::rand_r (&seed); elements[j][k] = (r % 128); token += r; } @@ -128,7 +127,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) token, returned_token); - if (token != returned_token) + if (!ACE::is_equal (token, returned_token)) { ACE_ERROR ((LM_ERROR, "ERROR - invalid token <%f> returned," diff --git a/tests/OctetSeq/server.cpp b/tests/OctetSeq/server.cpp index a27b76a8e3a..93fa08571ff 100644 --- a/tests/OctetSeq/server.cpp +++ b/tests/OctetSeq/server.cpp @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ #include "ace/Get_Opt.h" @@ -5,10 +6,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (OctetSeq, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +29,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/tests/OctetSeq/test.idl b/tests/OctetSeq/test.idl index 493c026dd0c..4327caa4891 100644 --- a/tests/OctetSeq/test.idl +++ b/tests/OctetSeq/test.idl @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/OctetSeq -// -// = FILENAME -// test.idl -// -// = DESCRIPTION -// Simple IDL file to test octet sequences. -// -// = AUTHORS -// Carlos O'Ryan <coryan@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file test.idl + * + * $Id$ + * + * Simple IDL file to test octet sequences. + * + * + * @author Carlos O'Ryan <coryan@cs.wustl.edu> + */ +//============================================================================= + module Test { diff --git a/tests/OctetSeq/test_i.cpp b/tests/OctetSeq/test_i.cpp index 39cd395e926..fb3a36f0e82 100644 --- a/tests/OctetSeq/test_i.cpp +++ b/tests/OctetSeq/test_i.cpp @@ -1,3 +1,4 @@ +// -*- C++ -*- // $Id$ #include "test_i.h" @@ -7,8 +8,6 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(OctetSeq, test_i, "$Id$") - Database_i::~Database_i (void) { delete[] this->elements_; diff --git a/tests/OctetSeq/test_i.h b/tests/OctetSeq/test_i.h index 1269850b911..5608f216f64 100644 --- a/tests/OctetSeq/test_i.h +++ b/tests/OctetSeq/test_i.h @@ -1,35 +1,34 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/OctetSeq -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_OCTETSEQ_TEST_I_H #define TAO_OCTETSEQ_TEST_I_H #include "testS.h" +/** + * @class Database_i + * + * Implements the Database interface in test.idl + */ class Database_i : public POA_Test::Database { - // = DESCRIPTION - // Implements the Database interface in test.idl - // public: + /// ctor Database_i (CORBA::ORB_ptr orb, Test::Index max_range); - // ctor + /// dtor ~Database_i (void); - // dtor // = The Simple_Server methods. void set (Test::Index i, @@ -44,14 +43,14 @@ public: void shutdown (void); private: + /// The ORB pointer CORBA::ORB_var orb_; - // The ORB pointer + /// The maximum number of elements in the database Test::Index max_range_; - // The maximum number of elements in the database + /// The elements Test::OctetSeq* elements_; - // The elements }; #if defined(__ACE_INLINE__) diff --git a/tests/Ondemand_Write/Hello.cpp b/tests/Ondemand_Write/Hello.cpp index a2a4d8ae380..68768aed3e2 100644 --- a/tests/Ondemand_Write/Hello.cpp +++ b/tests/Ondemand_Write/Hello.cpp @@ -1,9 +1,6 @@ -// // $Id$ -// -#include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") +#include "Hello.h" Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/tests/Ondemand_Write/Makefile.am b/tests/Ondemand_Write/Makefile.am deleted file mode 100644 index e0deedeba2a..00000000000 --- a/tests/Ondemand_Write/Makefile.am +++ /dev/null @@ -1,105 +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.Ondemand_Write_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.Ondemand_Write_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 \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Ondemand_Write_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_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/Ondemand_Write/client.cpp b/tests/Ondemand_Write/client.cpp index 50af9f4596b..d00f9a7cf84 100644 --- a/tests/Ondemand_Write/client.cpp +++ b/tests/Ondemand_Write/client.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -29,7 +27,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/tests/Ondemand_Write/server.cpp b/tests/Ondemand_Write/server.cpp index c1d8bd1bb30..ab19d0fb0a7 100644 --- a/tests/Ondemand_Write/server.cpp +++ b/tests/Ondemand_Write/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +28,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/tests/Oneway_Buffering/Makefile.am b/tests/Oneway_Buffering/Makefile.am deleted file mode 100644 index 1c28c88f038..00000000000 --- a/tests/Oneway_Buffering/Makefile.am +++ /dev/null @@ -1,153 +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.Oneway_Buffering_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.Oneway_Buffering_Admin.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += admin - -admin_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -admin_SOURCES = \ - Oneway_Buffering_Admin.cpp \ - TestC.cpp \ - TestS.cpp \ - admin.cpp \ - Oneway_Buffering_Admin.h - -admin_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.Oneway_Buffering_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 = \ - TestC.cpp \ - client.cpp \ - Oneway_Buffering.h \ - Oneway_Buffering_Admin.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.Oneway_Buffering_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Oneway_Buffering.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Oneway_Buffering.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## 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/Oneway_Buffering/Oneway_Buffering.cpp b/tests/Oneway_Buffering/Oneway_Buffering.cpp index 698098675db..d36b6d9f84d 100644 --- a/tests/Oneway_Buffering/Oneway_Buffering.cpp +++ b/tests/Oneway_Buffering/Oneway_Buffering.cpp @@ -3,8 +3,6 @@ // #include "Oneway_Buffering.h" -ACE_RCSID(Oneway_Buffering, Oneway_Buffering, "$Id$") - Oneway_Buffering::Oneway_Buffering (CORBA::ORB_ptr orb, Test::Oneway_Buffering_Admin_ptr admin) : orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp b/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp index 432642eac38..b788fa1b5a5 100644 --- a/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp +++ b/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp @@ -9,8 +9,6 @@ namespace const unsigned int timeout_in_sec= 2u; } -ACE_RCSID(Oneway_Buffering, Oneway_Buffering_Admin, "$Id$") - Oneway_Buffering_Admin::Oneway_Buffering_Admin (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) , request_count_ (0) diff --git a/tests/Oneway_Buffering/admin.cpp b/tests/Oneway_Buffering/admin.cpp index 73b72c533a0..0443972028e 100644 --- a/tests/Oneway_Buffering/admin.cpp +++ b/tests/Oneway_Buffering/admin.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Oneway_Buffering, admin, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("admin.ior"); int @@ -30,7 +28,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/tests/Oneway_Buffering/client.cpp b/tests/Oneway_Buffering/client.cpp index 8a3362dc2ea..7c60f9a794f 100644 --- a/tests/Oneway_Buffering/client.cpp +++ b/tests/Oneway_Buffering/client.cpp @@ -9,8 +9,6 @@ #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Oneway_Buffering, client, "$Id$") - const ACE_TCHAR *server_ior = ACE_TEXT("file://server.ior"); const ACE_TCHAR *admin_ior = ACE_TEXT("file://admin.ior"); int iterations = 20; @@ -87,7 +85,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/tests/Oneway_Buffering/server.cpp b/tests/Oneway_Buffering/server.cpp index 7b8934d39b7..c27cd5cf5f0 100644 --- a/tests/Oneway_Buffering/server.cpp +++ b/tests/Oneway_Buffering/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Oneway_Buffering, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); const ACE_TCHAR *ior = ACE_TEXT("file://admin.ior"); @@ -36,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/tests/Oneway_Send_Timeouts/Makefile.am b/tests/Oneway_Send_Timeouts/Makefile.am deleted file mode 100644 index 637d2b191eb..00000000000 --- a/tests/Oneway_Send_Timeouts/Makefile.am +++ /dev/null @@ -1,92 +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) - - -## Makefile.Oneway_Scenarios_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.Oneway_Scenarios_Oneway_Test.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = oneway_test - -oneway_test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -oneway_test_SOURCES = \ - Client.cpp \ - Server.cpp \ - TestC.cpp \ - TestS.cpp \ - Test_i.cpp \ - main.cpp \ - Client.h \ - Server.h \ - Test_i.h - -oneway_test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## 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/Oneway_Send_Timeouts/Test_i.cpp b/tests/Oneway_Send_Timeouts/Test_i.cpp index f96b69523e6..036c9580781 100644 --- a/tests/Oneway_Send_Timeouts/Test_i.cpp +++ b/tests/Oneway_Send_Timeouts/Test_i.cpp @@ -67,7 +67,7 @@ void Test_i::dummy_one_way (const char* msg) { if (msg != 0) { - ACE_DEBUG ((LM_DEBUG, "(%P|%t) Test_i::dummy_one_way> %.25s\n", msg)); + ACE_DEBUG ((LM_DEBUG, "(%P|%t) Test_i::dummy_one_way> %.25C\n", msg)); } // do nothing } diff --git a/tests/Oneway_Send_Timeouts/block_flush.conf b/tests/Oneway_Send_Timeouts/block_flush.conf index 9c379527209..fd51e319362 100644 --- a/tests/Oneway_Send_Timeouts/block_flush.conf +++ b/tests/Oneway_Send_Timeouts/block_flush.conf @@ -1 +1,3 @@ +# $Id$ + static Resource_Factory "-ORBFlushingStrategy blocking" diff --git a/tests/Oneway_Send_Timeouts/lf_flush.conf b/tests/Oneway_Send_Timeouts/lf_flush.conf index 82425ab8e93..415b7aca7e9 100644 --- a/tests/Oneway_Send_Timeouts/lf_flush.conf +++ b/tests/Oneway_Send_Timeouts/lf_flush.conf @@ -1 +1,3 @@ +# $Id$ + static Resource_Factory "-ORBFlushingStrategy leader_follower" diff --git a/tests/Oneway_Send_Timeouts/reactive_flush.conf b/tests/Oneway_Send_Timeouts/reactive_flush.conf index 4c233d061f6..6856499350b 100644 --- a/tests/Oneway_Send_Timeouts/reactive_flush.conf +++ b/tests/Oneway_Send_Timeouts/reactive_flush.conf @@ -1 +1,3 @@ +# $Id$ + static Resource_Factory "-ORBFlushingStrategy reactive" diff --git a/tests/Oneway_Timeouts/Makefile.am b/tests/Oneway_Timeouts/Makefile.am deleted file mode 100644 index 7ea65d7d73d..00000000000 --- a/tests/Oneway_Timeouts/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.test_server.am - -if BUILD_CORBA_MESSAGING -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) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.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_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.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 = \ - TestC.cpp \ - client.cpp \ - TestC.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.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_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 - -## 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/Oneway_Timeouts/test.mpc b/tests/Oneway_Timeouts/test.mpc index cf7dcc95795..3f3e7cd6050 100644 --- a/tests/Oneway_Timeouts/test.mpc +++ b/tests/Oneway_Timeouts/test.mpc @@ -1,28 +1,38 @@ // -*- MPC -*- // $Id$ -project (*client) : taoserver, messaging, strategies { - exename = client - after = *server - source_files { - TestC.cpp - client.cpp +project(*idl): taoidldefaults { + idlflags += -Sp + IDL_Files { + Test.idl + } + custom_only = 1 +} + +project(*Server): taoserver, messaging, strategies { + after += *idl + Source_Files { + server.cpp } - header_files { - TestC.h + Source_Files { + TestC.cpp + TestS.cpp } - idl_files { + IDL_Files { } } -project (*server) : taoserver, messaging, strategies { - source_files { +project(*Client): taoserver, messaging, strategies { + exename = client + after += *idl + Source_Files { + client.cpp + } + Source_Files { TestC.cpp - TestS.cpp - server.cpp } - header_files { - TestS.h - TestC.h + IDL_Files { } } + + diff --git a/tests/Oneways_Invoking_Twoways/Client_Task.cpp b/tests/Oneways_Invoking_Twoways/Client_Task.cpp index 738d0e312ed..5600b0a9eb1 100644 --- a/tests/Oneways_Invoking_Twoways/Client_Task.cpp +++ b/tests/Oneways_Invoking_Twoways/Client_Task.cpp @@ -5,8 +5,6 @@ #include "Client_Task.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Muxing, Client_Task, "$Id$") - Client_Task::Client_Task (Test::Sender_ptr reply_gen, Test::Receiver_ptr us, ACE_Thread_Manager *thr_mgr, diff --git a/tests/Oneways_Invoking_Twoways/Makefile.am b/tests/Oneways_Invoking_Twoways/Makefile.am deleted file mode 100644 index a9a5aac9654..00000000000 --- a/tests/Oneways_Invoking_Twoways/Makefile.am +++ /dev/null @@ -1,115 +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.Oneways_Invoking_Twoways_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.Oneways_Invoking_Twoways_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_Task.cpp \ - Receiver_i.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Client_Task.h \ - Receiver_i.h \ - Server_Task.h - -client_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.Oneways_Invoking_Twoways_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Sender_i.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Sender_i.h \ - Server_Task.h - -server_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/Oneways_Invoking_Twoways/Receiver_i.cpp b/tests/Oneways_Invoking_Twoways/Receiver_i.cpp index 570a06fe83b..f12cbc8c09b 100644 --- a/tests/Oneways_Invoking_Twoways/Receiver_i.cpp +++ b/tests/Oneways_Invoking_Twoways/Receiver_i.cpp @@ -1,6 +1,6 @@ -#include "Receiver_i.h" +// $Id$ -ACE_RCSID(Oneways_Invoking_Twoways, Receiver_i, "$Id$") +#include "Receiver_i.h" Receiver_i::Receiver_i (CORBA::ORB_ptr orb, Test::Sender_ptr sender, @@ -16,8 +16,6 @@ Receiver_i::~Receiver_i (void) { } - - CORBA::Long Receiver_i::receive_call (void) { diff --git a/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/tests/Oneways_Invoking_Twoways/Sender_i.cpp index 5e408c90e49..6944edebff0 100644 --- a/tests/Oneways_Invoking_Twoways/Sender_i.cpp +++ b/tests/Oneways_Invoking_Twoways/Sender_i.cpp @@ -1,6 +1,6 @@ -#include "Sender_i.h" +// $Id$ -ACE_RCSID(Oneways_Invoking_Twoways, Sender_i, "$Id$") +#include "Sender_i.h" Sender_i::Sender_i (CORBA::ORB_ptr orb, CORBA::ULong no) diff --git a/tests/Oneways_Invoking_Twoways/Sender_i.h b/tests/Oneways_Invoking_Twoways/Sender_i.h index ab267b02277..e566594f46e 100644 --- a/tests/Oneways_Invoking_Twoways/Sender_i.h +++ b/tests/Oneways_Invoking_Twoways/Sender_i.h @@ -43,7 +43,7 @@ public: private: /// Our local ORB ptr - CORBA::ORB_ptr orb_; + CORBA::ORB_var orb_; /// Number of invocations to be made on the receiver CORBA::ULong number_; diff --git a/tests/Oneways_Invoking_Twoways/Server_Task.cpp b/tests/Oneways_Invoking_Twoways/Server_Task.cpp index 3529e7ac785..4e97b7ca0ca 100644 --- a/tests/Oneways_Invoking_Twoways/Server_Task.cpp +++ b/tests/Oneways_Invoking_Twoways/Server_Task.cpp @@ -4,8 +4,6 @@ #include "Server_Task.h" -ACE_RCSID(Muxing, Server_Task, "$Id$") - Server_Task::Server_Task (CORBA::ORB_ptr orb, ACE_Thread_Manager *thr_mgr) : ACE_Task_Base (thr_mgr) diff --git a/tests/Oneways_Invoking_Twoways/client.cpp b/tests/Oneways_Invoking_Twoways/client.cpp index 50932a36842..89b4c650553 100644 --- a/tests/Oneways_Invoking_Twoways/client.cpp +++ b/tests/Oneways_Invoking_Twoways/client.cpp @@ -5,8 +5,6 @@ #include "Server_Task.h" #include "ace/Get_Opt.h" -ACE_RCSID(Muxing, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -30,7 +28,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; } @@ -118,16 +116,16 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // wait for oneway sends and twoway replies to be processed client_task.wait (); - + // shutdown server sender->shutdown (); - + // shutdown ourself receiver->shutdown (); - + // wait for event loop to finish server_task.wait (); - + ACE_DEBUG ((LM_DEBUG, "Event Loop finished\n")); diff --git a/tests/Oneways_Invoking_Twoways/run_test_svc.pl b/tests/Oneways_Invoking_Twoways/run_test_svc.pl index ecaa7acd182..ab2a0769b96 100755 --- a/tests/Oneways_Invoking_Twoways/run_test_svc.pl +++ b/tests/Oneways_Invoking_Twoways/run_test_svc.pl @@ -35,7 +35,7 @@ $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-o $server_iorfile"); $CL = $client->CreateProcess ("client", - "-ORBSvcConf $client_conf " . + "-ORBSvcConf $client_conf " . "-k file://$client_iorfile"); $server_status = $SV->Spawn (); diff --git a/tests/Oneways_Invoking_Twoways/server.cpp b/tests/Oneways_Invoking_Twoways/server.cpp index 09b14bef701..ac3522946f8 100644 --- a/tests/Oneways_Invoking_Twoways/server.cpp +++ b/tests/Oneways_Invoking_Twoways/server.cpp @@ -4,8 +4,6 @@ #include "Server_Task.h" #include "ace/Get_Opt.h" -ACE_RCSID(Oneways_Invoking_Twoways, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -29,7 +27,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/tests/Optimized_Connection/Makefile.am b/tests/Optimized_Connection/Makefile.am deleted file mode 100644 index 7d150ad25b2..00000000000 --- a/tests/Optimized_Connection/Makefile.am +++ /dev/null @@ -1,80 +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) - - -## Makefile.Optimized_Connection_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 -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Optimized_Connection_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 \ - oc_client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/Optimized_Connection/Optimized_Connection.mpc b/tests/Optimized_Connection/Optimized_Connection.mpc index d28e7cc1381..39ff38f6991 100644 --- a/tests/Optimized_Connection/Optimized_Connection.mpc +++ b/tests/Optimized_Connection/Optimized_Connection.mpc @@ -2,14 +2,12 @@ // $Id$ project(*idl): taoidldefaults { - idlflags += -Sa -St IDL_Files { Test.idl } custom_only = 1 } - project(*Client): taoclient, strategies { after += *idl Source_Files { diff --git a/tests/Optimized_Connection/oc_client.cpp b/tests/Optimized_Connection/oc_client.cpp index f4e73d19dac..42295a80a16 100644 --- a/tests/Optimized_Connection/oc_client.cpp +++ b/tests/Optimized_Connection/oc_client.cpp @@ -6,8 +6,6 @@ #include "tao/Strategies/advanced_resource.h" #include "tao/Strategies/OC_Endpoint_Selector_Loader.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -32,7 +30,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/tests/Optimized_Connection/oc_svc.conf b/tests/Optimized_Connection/oc_svc.conf index 75b92f3c589..320c5e26391 100644 --- a/tests/Optimized_Connection/oc_svc.conf +++ b/tests/Optimized_Connection/oc_svc.conf @@ -1 +1,3 @@ +# $Id$ + static OC_Endpoint_Selector_Factory "-connect_timeout 1300" diff --git a/tests/Optimized_Connection/run_test.pl b/tests/Optimized_Connection/run_test.pl index b79ba666d13..79ad8241918 100755 --- a/tests/Optimized_Connection/run_test.pl +++ b/tests/Optimized_Connection/run_test.pl @@ -27,7 +27,7 @@ my $client_conf = $client->LocalFile ("oc_svc.conf"); $CL = $client->CreateProcess ("client", "-k file://$client_iorfile ". "-orbsvcconf $client_conf ". "-ORBDebugLevel $debug_level"); - + if ($client->WaitForFileTimed ($iorbase, $client->ProcessStartWaitInterval()) == -1) { diff --git a/tests/POA/Adapter_Activator/Makefile.am b/tests/POA/Adapter_Activator/Makefile.am deleted file mode 100644 index b2ba5518ab9..00000000000 --- a/tests/POA/Adapter_Activator/Makefile.am +++ /dev/null @@ -1,52 +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.POA_Adapter_Activator_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../Generic_Servant \ - -I../Generic_Servant - -server_SOURCES = \ - server.cpp - -server_LDFLAGS = \ - -L../Generic_Servant - -server_LDADD = \ - $(top_builddir)/tests/POA/Generic_Servant/libGeneric_Servant.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/tests/POA/Adapter_Activator/server.cpp b/tests/POA/Adapter_Activator/server.cpp index 3a690274174..075079129c5 100644 --- a/tests/POA/Adapter_Activator/server.cpp +++ b/tests/POA/Adapter_Activator/server.cpp @@ -1,26 +1,23 @@ -// $Id$ - -// ================================================================ -// -// = LIBRARY -// TAO/tests/POA/Adapter_Activator -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// This example is very similar to the Explicit_Activation example -// except that the POAs are deleted once the object references have -// been created. After this, an adapter activator is install in the -// RootPOA to reactivate the POAs on demand. -// -// Similar to the Explicit_Activation, the client for this example -// is Generic_Servant. -// -// = AUTHOR -// Irfan Pyarali -// -// ================================================================ + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * This example is very similar to the Explicit_Activation example + * except that the POAs are deleted once the object references have + * been created. After this, an adapter activator is install in the + * RootPOA to reactivate the POAs on demand. + * + * Similar to the Explicit_Activation, the client for this example + * is Generic_Servant. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "ace/Get_Opt.h" #include "test_i.h" @@ -28,8 +25,6 @@ #include "ace/OS_NS_string.h" #include "tao/PortableServer/AdapterActivatorC.h" -ACE_RCSID(Adapter_Activator, server, "$Id$") - // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. #if defined (_MSC_VER) @@ -40,9 +35,9 @@ class reference_counted_test_i : public virtual test_i { public: + /// Constructor - takes a POA and a value parameter reference_counted_test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - // Constructor - takes a POA and a value parameter }; reference_counted_test_i::reference_counted_test_i (CORBA::ORB_ptr orb, diff --git a/tests/POA/Bug_1592_Regression/Makefile.am b/tests/POA/Bug_1592_Regression/Makefile.am deleted file mode 100644 index 9a45fce19f5..00000000000 --- a/tests/POA/Bug_1592_Regression/Makefile.am +++ /dev/null @@ -1,120 +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_1592_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_1592_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 \ - testC.cpp \ - ServantLocator.h \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_1592_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 = \ - ServantLocator.cpp \ - Server_ORBInitializer.cpp \ - Server_Request_Interceptor.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - ServantLocator.h \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/POA/Bug_1592_Regression/ServantLocator.cpp b/tests/POA/Bug_1592_Regression/ServantLocator.cpp index 58e7a244d4c..b46f29f82bd 100644 --- a/tests/POA/Bug_1592_Regression/ServantLocator.cpp +++ b/tests/POA/Bug_1592_Regression/ServantLocator.cpp @@ -1,14 +1,8 @@ -#include "ServantLocator.h" - - -ACE_RCSID (ServantLocator, - ServantLocator, - "$Id$") - +// $Id$ +#include "ServantLocator.h" #include "test_i.h" - extern CORBA::Boolean receive_request_service_contexts_called; extern CORBA::Boolean ending_interception_point_called; diff --git a/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp b/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp index 0c22259babf..b6aff9b68d2 100644 --- a/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp +++ b/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp @@ -1,9 +1,6 @@ -#include "Server_ORBInitializer.h" - -ACE_RCSID (ServantLocator, - Server_ORBInitializer, - "$Id$") +// $Id$ +#include "Server_ORBInitializer.h" #include "tao/ORB_Constants.h" #include "Server_Request_Interceptor.h" diff --git a/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp b/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp index a235fec3cee..38d56a401a0 100644 --- a/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp +++ b/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp @@ -1,10 +1,6 @@ -#include "Server_Request_Interceptor.h" - - -ACE_RCSID (ServantLocator, - Server_Request_Interceptor, - "$Id$") +// $Id$ +#include "Server_Request_Interceptor.h" CORBA::Boolean receive_request_service_contexts_called = 0; CORBA::Boolean receive_request_called = 0; diff --git a/tests/POA/Bug_1592_Regression/client.cpp b/tests/POA/Bug_1592_Regression/client.cpp index 8f40fd25861..f7c91f25a47 100644 --- a/tests/POA/Bug_1592_Regression/client.cpp +++ b/tests/POA/Bug_1592_Regression/client.cpp @@ -1,12 +1,8 @@ -#include "ace/Get_Opt.h" +// $Id$ +#include "ace/Get_Opt.h" #include "testC.h" -ACE_RCSID (ServantLocator, - client, - "$Id$") - - const ACE_TCHAR * ior = 0; int diff --git a/tests/POA/Bug_1592_Regression/server.cpp b/tests/POA/Bug_1592_Regression/server.cpp index eb9f9e71a98..0066751ec00 100644 --- a/tests/POA/Bug_1592_Regression/server.cpp +++ b/tests/POA/Bug_1592_Regression/server.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "test_i.h" @@ -6,10 +7,6 @@ #include "Server_ORBInitializer.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (ServantLocator, - server, - "$Id$") - const ACE_TCHAR * ior_file = 0; int diff --git a/tests/POA/Bug_1592_Regression/test_i.cpp b/tests/POA/Bug_1592_Regression/test_i.cpp index 46086a944d2..4d9d57dd008 100644 --- a/tests/POA/Bug_1592_Regression/test_i.cpp +++ b/tests/POA/Bug_1592_Regression/test_i.cpp @@ -1,10 +1,6 @@ -#include "test_i.h" - - -ACE_RCSID (ServantLocator, - test_i, - "$Id$") +// $Id$ +#include "test_i.h" extern CORBA::Boolean receive_request_called; diff --git a/tests/POA/Bug_2511_Regression/Makefile.am b/tests/POA/Bug_2511_Regression/Makefile.am deleted file mode 100644 index a84dedbf249..00000000000 --- a/tests/POA/Bug_2511_Regression/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.POA_Bug_2511_Regression.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) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -server_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/POA/Bug_2511_Regression/server.cpp b/tests/POA/Bug_2511_Regression/server.cpp index ef75c7a91c7..087db823045 100644 --- a/tests/POA/Bug_2511_Regression/server.cpp +++ b/tests/POA/Bug_2511_Regression/server.cpp @@ -1,24 +1,20 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/POA/MT_Servant_Locator -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// This program tests that multiple calls to the Servant Locator -// can take place simultaneously. -// -// = AUTHOR -// Irfan Pyarali -// -//========================================================================= + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * This program tests that multiple calls to the Servant Locator + * can take place simultaneously. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "testS.h" -#include "ace/OS.h" #include "tao/PortableServer/ServantLocatorC.h" #include "tao/CDR.h" @@ -49,19 +45,19 @@ test_i::test_i (PortableServer::POA_ptr poa) void test_i::normal (void) { - ACE_DEBUG ((LM_DEBUG, "executing normal\n")); + ACE_DEBUG ((LM_DEBUG, "executing normal\n")); } void test_i::exceptional (void) { - ACE_DEBUG ((LM_DEBUG, "executing exceptional\n")); + ACE_DEBUG ((LM_DEBUG, "executing exceptional\n")); } void test_i::notexisting (void) { - ACE_DEBUG ((LM_DEBUG, "executing notexisting\n")); + ACE_DEBUG ((LM_DEBUG, "executing notexisting\n")); } class Servant_Locator : @@ -104,20 +100,20 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid, name.in (), op )); if (ACE_OS::strcmp (op, "normal") == 0) - { - ACE_DEBUG ((LM_DEBUG, "returning servant\n")); - return &this->servant_; - } + { + ACE_DEBUG ((LM_DEBUG, "returning servant\n")); + return &this->servant_; + } else if (ACE_OS::strcmp (op, "exceptional") == 0) - { - ACE_DEBUG ((LM_DEBUG, "throwing exception\n")); - throw CORBA::INTERNAL(); - } + { + ACE_DEBUG ((LM_DEBUG, "throwing exception\n")); + throw CORBA::INTERNAL(); + } else - { - ACE_DEBUG ((LM_DEBUG, "returning NULL\n")); - return 0; - } + { + ACE_DEBUG ((LM_DEBUG, "returning NULL\n")); + return 0; + } } void @@ -132,10 +128,10 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid, PortableServer::ObjectId_to_string (oid); if (!op) - { - op = "NULL"; - ++errorCount; - } + { + op = "NULL"; + ++errorCount; + } ACE_DEBUG ((LM_DEBUG, "Servant_Locator::postinvoke for %C.%C\n", @@ -146,8 +142,6 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid, int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { - int retval = 0; - try { CORBA::ORB_var orb = @@ -201,43 +195,43 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) bool caught = false; try - { - testObject->exceptional(); - } + { + testObject->exceptional(); + } catch (const CORBA::Exception&) - { - ACE_DEBUG ((LM_DEBUG, "exceptional() yielded exception\n")); - caught = true; - } + { + ACE_DEBUG ((LM_DEBUG, "exceptional() yielded exception\n")); + caught = true; + } if (!caught) ++errorCount; caught = false; try - { - testObject->notexisting(); - } + { + testObject->notexisting(); + } catch (const CORBA::Exception&) - { - ACE_DEBUG ((LM_DEBUG, "notexisting() yielded exception\n")); - caught = true; - } + { + ACE_DEBUG ((LM_DEBUG, "notexisting() yielded exception\n")); + caught = true; + } if (!caught) ++errorCount; - if (!errorCount) - { - ACE_DEBUG ((LM_DEBUG,"test successful\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG,"unsuccessfull: %d errors\n", errorCount )); - } - orb->destroy (); } catch (const CORBA::Exception& ex) { ex._tao_print_exception ("Exception caught"); - retval = -1; + ++errorCount; + } + + if (!errorCount) + { + ACE_DEBUG ((LM_DEBUG,"test successful\n")); + } + else + { + ACE_DEBUG ((LM_DEBUG,"unsuccessfull: %d errors\n", errorCount )); } return errorCount; diff --git a/tests/POA/Current/Current.cpp b/tests/POA/Current/Current.cpp index f710a939edc..914f665c636 100644 --- a/tests/POA/Current/Current.cpp +++ b/tests/POA/Current/Current.cpp @@ -1,21 +1,18 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/POA/Current -// -// = FILENAME -// Current.cpp -// -// = DESCRIPTION -// This program tests if accessing the POA current before the -// RootPOA can cause any problems. -// -// = AUTHOR -// Irfan Pyarali -// -//========================================================================= + +//============================================================================= +/** + * @file Current.cpp + * + * $Id$ + * + * This program tests if accessing the POA current before the + * RootPOA can cause any problems. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "tao/ORB.h" #include "tao/PortableServer/PortableServer.h" diff --git a/tests/POA/Current/Makefile.am b/tests/POA/Current/Makefile.am deleted file mode 100644 index ed1e544b1a9..00000000000 --- a/tests/POA/Current/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.POA_Current.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Current - -Current_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Current_SOURCES = \ - Current.cpp - -Current_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/POA/DSI/Database_i.cpp b/tests/POA/DSI/Database_i.cpp index 59a6445c636..0de086a877e 100644 --- a/tests/POA/DSI/Database_i.cpp +++ b/tests/POA/DSI/Database_i.cpp @@ -8,10 +8,6 @@ #include "tao/AnyTypeCode/TypeCode.h" #include "ace/Null_Mutex.h" -ACE_RCSID (DSI, - Database_i, - "$Id$") - DatabaseImpl::Simpler_Database_Malloc::Simpler_Database_Malloc (void) // : DATABASE_MALLOC () { @@ -199,7 +195,7 @@ DatabaseImpl::Agent::find_entry (const char *key, "Employee") != 0) throw Database::Unknown_Type (); - void *temp; + void *temp = 0; Database::Entry_var entry; if (DATABASE::instance ()->find (key, temp) == 0) { @@ -243,7 +239,7 @@ DatabaseImpl::Agent::destroy_entry (const char *key, if (ACE_OS::strcmp (entry_type, "Employee") != 0) throw Database::Unknown_Type (); - void *temp; + void *temp = 0; if (DATABASE::instance ()->unbind (key, temp) == 0) { Employee *employee = diff --git a/tests/POA/DSI/Makefile.am b/tests/POA/DSI/Makefile.am deleted file mode 100644 index 7e23728b17c..00000000000 --- a/tests/POA/DSI/Makefile.am +++ /dev/null @@ -1,120 +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.POA_DSI_IDL.am - -BUILT_SOURCES = \ - DatabaseC.cpp \ - DatabaseC.h \ - DatabaseC.inl \ - DatabaseS.cpp \ - DatabaseS.h \ - DatabaseS.inl - -CLEANFILES = \ - Database-stamp \ - DatabaseC.cpp \ - DatabaseC.h \ - DatabaseC.inl \ - DatabaseS.cpp \ - DatabaseS.h \ - DatabaseS.inl - -DatabaseC.cpp DatabaseC.h DatabaseC.inl DatabaseS.cpp DatabaseS.h DatabaseS.inl: Database-stamp - -Database-stamp: $(srcdir)/Database.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Database.idl - @touch $@ - -noinst_HEADERS = \ - Database.idl - -## Makefile.POA_DSI_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 = \ - DatabaseC.cpp \ - client.cpp \ - Database_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.POA_DSI_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - DatabaseC.cpp \ - DatabaseS.cpp \ - Database_i.cpp \ - server.cpp \ - Database_i.h - -server_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_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 - -## 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/POA/DSI/client.cpp b/tests/POA/DSI/client.cpp index 8376117469d..8cadb1d1896 100644 --- a/tests/POA/DSI/client.cpp +++ b/tests/POA/DSI/client.cpp @@ -1,19 +1,17 @@ -// $Id$ - -//=================================================================== -// = LIBRARY -// TAO/tests/POA/DSI/client -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// A client program for the Database IDL module -// -// = AUTHOR -// Irfan Pyarali -// -//==================================================================== + +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * A client program for the Database IDL module + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" @@ -22,8 +20,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_string.h" -ACE_RCSID(DSI, client, "$Id$") - static char *IOR = 0; static const ACE_TCHAR *IOR_file = 0; static int shutdown_server = 0; diff --git a/tests/POA/DSI/server.cpp b/tests/POA/DSI/server.cpp index dd84c80edef..f702a4a42c8 100644 --- a/tests/POA/DSI/server.cpp +++ b/tests/POA/DSI/server.cpp @@ -1,26 +1,22 @@ -// $Id$ - -//=================================================================== -// = LIBRARY -// TAO/tests/POA/Default_Servant/server -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// A server program for the File IDL module -// -// = AUTHOR -// Irfan Pyarali -// -//==================================================================== + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * A server program for the File IDL module + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "Database_i.h" #include "ace/Get_Opt.h" #include "ace/SString.h" -ACE_RCSID(DSI, server, "$Id$") - static const ACE_TCHAR *ior_output_file = ACE_TEXT ("ior"); static int diff --git a/tests/POA/Deactivate_Object/Hello.cpp b/tests/POA/Deactivate_Object/Hello.cpp index f6380be5ae2..8f5c72b2c0a 100644 --- a/tests/POA/Deactivate_Object/Hello.cpp +++ b/tests/POA/Deactivate_Object/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/POA/Deactivate_Object/Makefile.am b/tests/POA/Deactivate_Object/Makefile.am deleted file mode 100644 index bfce23023f6..00000000000 --- a/tests/POA/Deactivate_Object/Makefile.am +++ /dev/null @@ -1,80 +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) - - -## Makefile.Deactivate_Object_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) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_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/POA/Deactivate_Object/server.cpp b/tests/POA/Deactivate_Object/server.cpp index bddce540e7c..a4ccb0f8198 100644 --- a/tests/POA/Deactivate_Object/server.cpp +++ b/tests/POA/Deactivate_Object/server.cpp @@ -3,10 +3,6 @@ #include "Hello.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/tests/POA/Default_Servant/Default_Servant.cpp b/tests/POA/Default_Servant/Default_Servant.cpp index 7ec6c3f722d..0a2ada0131d 100644 --- a/tests/POA/Default_Servant/Default_Servant.cpp +++ b/tests/POA/Default_Servant/Default_Servant.cpp @@ -1,21 +1,18 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/POA/Default_Servant -// -// = FILENAME -// Default_Servant.cpp -// -// = DESCRIPTION -// This program tests the behavior of POA::id_to_servant() and -// POA::reference_to_servant() with the use of default servants. -// -// = AUTHOR -// Irfan Pyarali -// -//========================================================================= + +//============================================================================= +/** + * @file Default_Servant.cpp + * + * $Id$ + * + * This program tests the behavior of POA::id_to_servant() and + * POA::reference_to_servant() with the use of default servants. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "testS.h" #include "ace/SString.h" @@ -121,10 +118,10 @@ test_reference_to_servant_active_object(PortableServer::POA_ptr root_poa) PortableServer::ServantBase_var servant = root_poa->reference_to_servant (object.in ()); - expected_refcount++; + ++expected_refcount; root_poa->deactivate_object (id.in ()); - expected_refcount--; + --expected_refcount; CORBA::ULong refcount = test._refcount_value (); diff --git a/tests/POA/Default_Servant/Makefile.am b/tests/POA/Default_Servant/Makefile.am deleted file mode 100644 index 35367f867cb..00000000000 --- a/tests/POA/Default_Servant/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.POA_Default_Servant.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) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Default_Servant - -Default_Servant_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Default_Servant_SOURCES = \ - Default_Servant.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Default_Servant_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/POA/Default_Servant2/File.idl b/tests/POA/Default_Servant2/File.idl index c7476b120b9..e1e156e06ab 100644 --- a/tests/POA/Default_Servant2/File.idl +++ b/tests/POA/Default_Servant2/File.idl @@ -1,17 +1,17 @@ -// $Id$ - -//================================================================= -// -// = FILENAME -// File.idl -// -// = DESCRIPTION -// A simple File Descriptor and File System IDL interface. -// -// = AUTHOR -// Irfan Pyarali -// -//================================================================== + +//============================================================================= +/** + * @file File.idl + * + * $Id$ + * + * A simple File Descriptor and File System IDL interface. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + // IDL diff --git a/tests/POA/Default_Servant2/File_i.cpp b/tests/POA/Default_Servant2/File_i.cpp index 72236f1fd14..8dadb95ddd7 100644 --- a/tests/POA/Default_Servant2/File_i.cpp +++ b/tests/POA/Default_Servant2/File_i.cpp @@ -1,18 +1,18 @@ -// $Id$ - -//=================================================================== -// -// = FILENAME -// File_i.cpp -// -// = DESCRIPTION -// Implementation of the File IDL module and the interfaces -// Descriptor and System in it. -// -// = AUTHOR -// Irfan Pyarali -// -//==================================================================== + +//============================================================================= +/** + * @file File_i.cpp + * + * $Id$ + * + * Implementation of the File IDL module and the interfaces + * Descriptor and System in it. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "File_i.h" #include "ace/OS_NS_stdio.h" @@ -20,8 +20,6 @@ #include "ace/OS_NS_unistd.h" #include "tao/PortableServer/PortableServer.h" -ACE_RCSID(Default_Servant, File_i, "$Id$") - // IDL File::System constructor FileImpl::System::System (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) : orb_ (CORBA::ORB::_duplicate (orb)), diff --git a/tests/POA/Default_Servant2/File_i.h b/tests/POA/Default_Servant2/File_i.h index 5c5de0a4da4..96238ca075e 100644 --- a/tests/POA/Default_Servant2/File_i.h +++ b/tests/POA/Default_Servant2/File_i.h @@ -1,82 +1,91 @@ -// $Id$ - -//=================================================================== -// -// = FILENAME -// File_i.h -// -// = DESCRIPTION -// Defines the implementation classes for the File IDL -// module -// -// = AUTHOR -// Irfan Pyarali -// -//==================================================================== + +//============================================================================= +/** + * @file File_i.h + * + * $Id$ + * + * Defines the implementation classes for the File IDL + * module + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "FileS.h" +/** + * @class FileImpl + * + * @brief FileImpl class provides the namespace for the File IDL module . + */ class FileImpl { - // = TITLE - // FileImpl class provides the namespace for the File IDL module . public: + /** + * @class Descriptor + * + * @brief Descriptor implements the Descriptor interface in the File + * Module A single Descriptor servant can serve multiple object + * references + */ class Descriptor : public POA_File::Descriptor { - // = TITLE - // Descriptor implements the Descriptor interface in the File - // Module A single Descriptor servant can serve multiple object - // references public: + /// Constructor Descriptor (PortableServer::POA_ptr poa); - // Constructor + /// Destructor ~Descriptor (void); - // Destructor + /// Returns the default POA of this object PortableServer::POA_ptr _default_POA (void); - // Returns the default POA of this object + /// write buffer to File corresponding to this Descriptor virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer); - // write buffer to File corresponding to this Descriptor virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes); + /// seek to the offset in file from whence virtual CORBA::ULong lseek (CORBA::ULong offset, CORBA::Long whence); - // seek to the offset in file from whence + /// closes the file corresponding to the requested ObjectID virtual void destroy (void); - // closes the file corresponding to the requested ObjectID private: + /// Extracts the ACE_HANDLE from the objectID ACE_HANDLE fd (void); - // Extracts the ACE_HANDLE from the objectID PortableServer::POA_var poa_; }; + /** + * @class System + * + * @brief File System implementation class. + */ class System : public POA_File::System { - // = TITLE - // File System implementation class. public: + /// Constructor, Creates a single File Descriptor Servant and + /// registers it with the POA as the Default Servant System (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - // Constructor, Creates a single File Descriptor Servant and - // registers it with the POA as the Default Servant + ///Destructor ~System (void); - //Destructor + ///Returns the default POA of this object PortableServer::POA_ptr _default_POA (void); - //Returns the default POA of this object + /// Opens a file ,creates a Descriptor reference with the + /// ACE_HANDLE and returns that reference File::Descriptor_ptr open (const char *file_name, CORBA::Long flags); - // Opens a file ,creates a Descriptor reference with the - // ACE_HANDLE and returns that reference void shutdown (void); private: @@ -84,8 +93,8 @@ public: PortableServer::POA_var poa_; + /// The single File Descriptor servant which serves requests for + /// any Descriptor object under poa_. Descriptor fd_servant_; - // The single File Descriptor servant which serves requests for - // any Descriptor object under poa_. }; }; diff --git a/tests/POA/Default_Servant2/Makefile.am b/tests/POA/Default_Servant2/Makefile.am deleted file mode 100644 index 3b07504808f..00000000000 --- a/tests/POA/Default_Servant2/Makefile.am +++ /dev/null @@ -1,110 +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.POA_Default_Servant_IDL.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - FileC.cpp \ - FileC.h \ - FileC.inl \ - FileS.cpp \ - FileS.h \ - FileS.inl - -CLEANFILES = \ - File-stamp \ - FileC.cpp \ - FileC.h \ - FileC.inl \ - FileS.cpp \ - FileS.h \ - FileS.inl - -FileC.cpp FileC.h FileC.inl FileS.cpp FileS.h FileS.inl: File-stamp - -File-stamp: $(srcdir)/File.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/File.idl - @touch $@ - -noinst_HEADERS = \ - File.idl - -endif BUILD_EXCEPTIONS - -## Makefile.POA_Default_Servant_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - FileC.cpp \ - client.cpp \ - File_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.POA_Default_Servant_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - FileC.cpp \ - FileS.cpp \ - File_i.cpp \ - server.cpp \ - File_i.h - -server_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/POA/Default_Servant2/client.cpp b/tests/POA/Default_Servant2/client.cpp index 2140127120a..70cfde5879e 100644 --- a/tests/POA/Default_Servant2/client.cpp +++ b/tests/POA/Default_Servant2/client.cpp @@ -1,29 +1,26 @@ -// $Id$ - -//=================================================================== -// = LIBRARY -// TAO/tests/POA/Default_Servant/client -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// A client program for the File IDL module -// -// = AUTHOR -// Irfan Pyarali -// -//==================================================================== + +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * A client program for the File IDL module + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "FileC.h" #include "tao/debug.h" #include "ace/streams.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" -#include "ace/OS.h" #include "ace/SString.h" - -ACE_RCSID(Default_Servant, client, "$Id$") +#include "ace/OS_NS_fcntl.h" +#include "ace/OS_NS_unistd.h" static const ACE_TCHAR *iorfile = 0; static const ACE_TCHAR *filename = ACE_TEXT ("test"); diff --git a/tests/POA/Default_Servant2/server.cpp b/tests/POA/Default_Servant2/server.cpp index 53cf482e0a9..c4bf0788b75 100644 --- a/tests/POA/Default_Servant2/server.cpp +++ b/tests/POA/Default_Servant2/server.cpp @@ -1,19 +1,17 @@ -// $Id$ - -//=================================================================== -// = LIBRARY -// TAO/tests/POA/Default_Servant/server -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// A server program for the File IDL module -// -// = AUTHOR -// Irfan Pyarali -// -//==================================================================== + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * A server program for the File IDL module + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "File_i.h" #include "tao/debug.h" @@ -22,8 +20,6 @@ #include "ace/SString.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Default_Servant, server, "$Id$") - static const ACE_TCHAR *ior_output_file = ACE_TEXT ("ior"); static int diff --git a/tests/POA/EndpointPolicy/EndpointPolicy.mpc b/tests/POA/EndpointPolicy/EndpointPolicy.mpc index a100d5a8e5e..35f5976c43a 100644 --- a/tests/POA/EndpointPolicy/EndpointPolicy.mpc +++ b/tests/POA/EndpointPolicy/EndpointPolicy.mpc @@ -2,7 +2,6 @@ // $Id$ project(*idl): taoidldefaults { - idlflags += -Sa -St IDL_Files { Test.idl } diff --git a/tests/POA/EndpointPolicy/Hello.cpp b/tests/POA/EndpointPolicy/Hello.cpp index df5dc90d3d9..0f62f20b906 100644 --- a/tests/POA/EndpointPolicy/Hello.cpp +++ b/tests/POA/EndpointPolicy/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/POA/EndpointPolicy/Makefile.am b/tests/POA/EndpointPolicy/Makefile.am deleted file mode 100644 index 637c39ab0de..00000000000 --- a/tests/POA/EndpointPolicy/Makefile.am +++ /dev/null @@ -1,109 +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) - - -## Makefile.EndpointPolicy_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 -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.EndpointPolicy_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 \ - Hello.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.EndpointPolicy_Server.am - -if BUILD_EXCEPTIONS - -bin_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_EndpointPolicy.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/POA/EndpointPolicy/client.cpp b/tests/POA/EndpointPolicy/client.cpp index 0ee720ca386..d5043541f5d 100644 --- a/tests/POA/EndpointPolicy/client.cpp +++ b/tests/POA/EndpointPolicy/client.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int bad_ior = 0; @@ -34,7 +32,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/tests/POA/EndpointPolicy/multi_prot.conf b/tests/POA/EndpointPolicy/multi_prot.conf index 0e7da86541c..e43fb7004f8 100644 --- a/tests/POA/EndpointPolicy/multi_prot.conf +++ b/tests/POA/EndpointPolicy/multi_prot.conf @@ -1,2 +1,4 @@ +# $Id$ + static DIOP_Factory static Advanced_Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory DIOP_Factory" diff --git a/tests/POA/EndpointPolicy/server.cpp b/tests/POA/EndpointPolicy/server.cpp index ea2a57820ba..3b2f0887539 100644 --- a/tests/POA/EndpointPolicy/server.cpp +++ b/tests/POA/EndpointPolicy/server.cpp @@ -11,10 +11,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *good_ior_file = ACE_TEXT ("good.ior"); const ACE_TCHAR *bad_ior_file = ACE_TEXT ("bad.ior"); const ACE_TCHAR *root_ior_file = ACE_TEXT("root.ior"); @@ -96,7 +92,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/tests/POA/Etherealization/Etherealization.cpp b/tests/POA/Etherealization/Etherealization.cpp index 498dd087888..c5b086aa895 100644 --- a/tests/POA/Etherealization/Etherealization.cpp +++ b/tests/POA/Etherealization/Etherealization.cpp @@ -1,21 +1,18 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/POA/Etherealization -// -// = FILENAME -// Etherealization.cpp -// -// = DESCRIPTION -// This program tests for deactivation and etherealization of -// reference counted and non reference counted servants. -// -// = AUTHOR -// Irfan Pyarali -// -//========================================================================= + +//============================================================================= +/** + * @file Etherealization.cpp + * + * $Id$ + * + * This program tests for deactivation and etherealization of + * reference counted and non reference counted servants. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "testS.h" #include "ace/OS_NS_string.h" diff --git a/tests/POA/Etherealization/Makefile.am b/tests/POA/Etherealization/Makefile.am deleted file mode 100644 index cd2b4410aa8..00000000000 --- a/tests/POA/Etherealization/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.POA_Etherealization.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) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Etherealization - -Etherealization_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Etherealization_SOURCES = \ - Etherealization.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Etherealization_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/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp index 1f159c8cc13..9f7f101b28b 100644 --- a/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp +++ b/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp @@ -1,23 +1,20 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/POA/Excessive_Object_Deactivations -// -// = FILENAME -// Excessive_Object_Deactivations.cpp -// -// = DESCRIPTION -// This program tests for excessive deactivations of a servant. -// The test checks excessive deactivations in a POA with SYSTEM_ID -// and other POA with USER_ID. The test also check for excessive -// deactivations during upcalls. -// -// = AUTHOR -// Irfan Pyarali -// -//========================================================================= + +//============================================================================= +/** + * @file Excessive_Object_Deactivations.cpp + * + * $Id$ + * + * This program tests for excessive deactivations of a servant. + * The test checks excessive deactivations in a POA with SYSTEM_ID + * and other POA with USER_ID. The test also check for excessive + * deactivations during upcalls. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "testS.h" diff --git a/tests/POA/Excessive_Object_Deactivations/Makefile.am b/tests/POA/Excessive_Object_Deactivations/Makefile.am deleted file mode 100644 index 5a4cd97f714..00000000000 --- a/tests/POA/Excessive_Object_Deactivations/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.POA_Excessive_Object_Deactivations.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) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Excessive_Object_Deactivations - -Excessive_Object_Deactivations_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Excessive_Object_Deactivations_SOURCES = \ - Excessive_Object_Deactivations.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Excessive_Object_Deactivations_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/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h b/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h index f0a316eee8e..898bad28526 100644 --- a/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h +++ b/tests/POA/Explicit_Activation/Alt_Resources/Alt_Resource_Factory.h @@ -7,8 +7,6 @@ #ifndef Alt_Resource_Factory_EXPORT_H #define Alt_Resource_Factory_EXPORT_H -#include "ace/OS.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ diff --git a/tests/POA/Explicit_Activation/Alt_Resources/Makefile.am b/tests/POA/Explicit_Activation/Alt_Resources/Makefile.am deleted file mode 100644 index 6418d4a8979..00000000000 --- a/tests/POA/Explicit_Activation/Alt_Resources/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.Alt_Resource.am - -if BUILD_EXCEPTIONS -if BUILD_WFMO - -noinst_LTLIBRARIES = libAlt_Resource_Factory.la - -libAlt_Resource_Factory_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DAlt_Resource_Factory_BUILD_DLL - -libAlt_Resource_Factory_la_SOURCES = \ - Resource_Factory.cpp - -noinst_HEADERS = \ - Alt_Resource_Factory.h \ - Resource_Factory.h - -endif BUILD_WFMO -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/POA/Explicit_Activation/Makefile.am b/tests/POA/Explicit_Activation/Makefile.am deleted file mode 100644 index ff427e6ce7a..00000000000 --- a/tests/POA/Explicit_Activation/Makefile.am +++ /dev/null @@ -1,56 +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) - -SUBDIRS = \ - . \ - Alt_Resources - - -## Makefile.POA_Explicit_Activation_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../Generic_Servant \ - -I../Generic_Servant - -server_SOURCES = \ - server.cpp - -server_LDFLAGS = \ - -L../Generic_Servant - -server_LDADD = \ - $(top_builddir)/tests/POA/Generic_Servant/libGeneric_Servant.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/tests/POA/Explicit_Activation/alternate.conf b/tests/POA/Explicit_Activation/alternate.conf index 262dc5b4308..b1b8d3f22a8 100644 --- a/tests/POA/Explicit_Activation/alternate.conf +++ b/tests/POA/Explicit_Activation/alternate.conf @@ -1,3 +1,5 @@ +# $Id$ + # Refer to Alternate_Resource_Factory/README for details dynamic Resource_Factory Service_Object * Alt_Resources/Alt_Resource_Factory:_make_My_Resource_Factory() diff --git a/tests/POA/Explicit_Activation/server.cpp b/tests/POA/Explicit_Activation/server.cpp index 42c2663520b..54d1e76aa4d 100644 --- a/tests/POA/Explicit_Activation/server.cpp +++ b/tests/POA/Explicit_Activation/server.cpp @@ -1,28 +1,23 @@ -// $Id$ - -// ================================================================ -// -// = LIBRARY -// TAO/tests/POA/Explicit_Activation -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// Explicit creation of servants. -// -// = AUTHOR -// Irfan Pyarali -// -// ================================================================ + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * Explicit creation of servants. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "ace/Get_Opt.h" #include "ace/SString.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Explicit_Activation, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("ior"); static int diff --git a/tests/POA/FindPOA/FindPOA.cpp b/tests/POA/FindPOA/FindPOA.cpp index 0d781c5f0ce..d7e3c868aa8 100644 --- a/tests/POA/FindPOA/FindPOA.cpp +++ b/tests/POA/FindPOA/FindPOA.cpp @@ -1,20 +1,17 @@ -// $Id$ - -//=========================================================================== -// -// = LIBRARY -// TAO/tests/POA/FindPOA -// -// = FILENAME -// FindPOA.cpp -// -// = DESCRIPTION -// This Program tests the find_POA method of a POA. -// -// = AUTHOR -// Irfan Pyarali -// -//=========================================================================== + +//============================================================================= +/** + * @file FindPOA.cpp + * + * $Id$ + * + * This Program tests the find_POA method of a POA. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "tao/PortableServer/PortableServer.h" #include "tao/PortableServer/Adapter_Activator.h" @@ -23,10 +20,6 @@ #include "ace/Log_Msg.h" #include "ace/SString.h" -ACE_RCSID (FindPOA, - FindPOA, - "$Id$") - void find_non_existant_POA (PortableServer::POA_ptr parent, const char *child_poa_name, diff --git a/tests/POA/FindPOA/Makefile.am b/tests/POA/FindPOA/Makefile.am deleted file mode 100644 index 2e62250678d..00000000000 --- a/tests/POA/FindPOA/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.POA_FindPOA.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = FindPOA - -FindPOA_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -FindPOA_SOURCES = \ - FindPOA.cpp - -FindPOA_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/POA/Forwarding/Makefile.am b/tests/POA/Forwarding/Makefile.am deleted file mode 100644 index a1853b3178d..00000000000 --- a/tests/POA/Forwarding/Makefile.am +++ /dev/null @@ -1,113 +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.POA_Forwarding_IDL.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_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.POA_Forwarding_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 \ - testC.cpp \ - Servant_Activator.h \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.POA_Forwarding_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Servant_Activator.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Servant_Activator.h \ - test_i.h - -server_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/POA/Forwarding/Servant_Activator.cpp b/tests/POA/Forwarding/Servant_Activator.cpp index 49f4d0825bd..605a43debaf 100644 --- a/tests/POA/Forwarding/Servant_Activator.cpp +++ b/tests/POA/Forwarding/Servant_Activator.cpp @@ -3,10 +3,8 @@ #include "Servant_Activator.h" #include "test_i.h" -ACE_RCSID(Forwarding, Servant_Activator, "$Id$") - - ServantActivator::ServantActivator (CORBA::ORB_ptr orb, - CORBA::Object_ptr forward_to) +ServantActivator::ServantActivator (CORBA::ORB_ptr orb, + CORBA::Object_ptr forward_to) : orb_ (CORBA::ORB::_duplicate (orb)), forward_to_ (CORBA::Object::_duplicate (forward_to)) { diff --git a/tests/POA/Forwarding/Servant_Activator.h b/tests/POA/Forwarding/Servant_Activator.h index 57a31ea1bb8..e2e81975774 100644 --- a/tests/POA/Forwarding/Servant_Activator.h +++ b/tests/POA/Forwarding/Servant_Activator.h @@ -1,23 +1,19 @@ // -*- C++ -*- -// $Id$ - -// ================================================================ -// -// = LIBRARY -// TAO/examples/POA/Forwarding -// -// = FILENAME -// Servant_Activator.h -// -// = DESCRIPTION -// Defines a ServantActivator class, used with a POA having a -// RETAIN policy -// -// = AUTHOR -// Irfan Pyarali -// Michael Kircher -// -// ================================================================ + +//============================================================================= +/** + * @file Servant_Activator.h + * + * $Id$ + * + * Defines a ServantActivator class, used with a POA having a + * RETAIN policy + * + * + * @author Irfan Pyarali Michael Kircher + */ +//============================================================================= + #ifndef SERVANT_ACTIVATOR_H #define SERVANT_ACTIVATOR_H @@ -47,14 +43,14 @@ public: CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations); + /// Object should be forwarded from now on. void forward_requests (void); - // Object should be forwarded from now on. private: CORBA::ORB_var orb_; + /// Location to forward to CORBA::Object_var forward_to_; - // Location to forward to }; #endif /* SERVANT_ACTIVATOR_H */ diff --git a/tests/POA/Forwarding/client.cpp b/tests/POA/Forwarding/client.cpp index fad5e856b92..11f800e37f8 100644 --- a/tests/POA/Forwarding/client.cpp +++ b/tests/POA/Forwarding/client.cpp @@ -1,28 +1,25 @@ -// $Id$ - -//========================================================================== -// -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// -// This is a simple test client implementation. Also looks out -// for forwarding exceptions -// -// = AUTHOR -// Irfan Pyarali -// -//========================================================================== + +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * + * This is a simple test client implementation. Also looks out + * for forwarding exceptions + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "ace/streams.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" #include "testC.h" -ACE_RCSID(Forwarding, client, "$Id$") - static ACE_TCHAR *IOR = 0; static int servers = 2; static int iterations = 3; diff --git a/tests/POA/Forwarding/server.cpp b/tests/POA/Forwarding/server.cpp index 444b323a98f..b73de679875 100644 --- a/tests/POA/Forwarding/server.cpp +++ b/tests/POA/Forwarding/server.cpp @@ -1,29 +1,24 @@ -// $Id$ - -// ======================================================================== -// = LIBRARY -// TAO/examples/POA/Forwarding -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// Server that receives requests. The server can be asked to -// forward new requests to another server. -// -// = AUTHOR -// Irfan Pyarali -// Michael Kircher -// -// ======================================================================== + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * Server that receives requests. The server can be asked to + * forward new requests to another server. + * + * + * @author Irfan Pyarali Michael Kircher + */ +//============================================================================= + #include "ace/Get_Opt.h" #include "test_i.h" #include "Servant_Activator.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Forwarding, server, "$Id$") - static const ACE_TCHAR *ior_output_file = 0; static const ACE_TCHAR *forward_to_ior = 0; diff --git a/tests/POA/Forwarding/test_i.cpp b/tests/POA/Forwarding/test_i.cpp index b973b929ffc..e5869d89c06 100644 --- a/tests/POA/Forwarding/test_i.cpp +++ b/tests/POA/Forwarding/test_i.cpp @@ -3,8 +3,6 @@ #include "test_i.h" #include "Servant_Activator.h" -ACE_RCSID(Forwarding, test_i, "$Id$") - // Constructor test_i::test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, diff --git a/tests/POA/Forwarding/test_i.h b/tests/POA/Forwarding/test_i.h index 023e60b962a..ce1fbff6f14 100644 --- a/tests/POA/Forwarding/test_i.h +++ b/tests/POA/Forwarding/test_i.h @@ -1,17 +1,17 @@ -// $Id$ //============================================================================= -// -// = FILENAME -// test_i.h -// -// = DESCRIPTION -// Defines test_i class for the test interface -// -// = AUTHOR -// Irfan Pyarali and Michael Kircher -// +/** + * @file test_i.h + * + * $Id$ + * + * Defines test_i class for the test interface + * + * + * @author Irfan Pyarali and Michael Kircher + */ //============================================================================= + #include "testS.h" class ServantActivator; @@ -32,8 +32,8 @@ public: virtual void shutdown (void); + /// Returns the default POA for this servant. virtual PortableServer::POA_ptr _default_POA (void); - // Returns the default POA for this servant. protected: CORBA::ORB_var orb_; diff --git a/tests/POA/Generic_Servant/Makefile.am b/tests/POA/Generic_Servant/Makefile.am deleted file mode 100644 index 3bc9fab28c9..00000000000 --- a/tests/POA/Generic_Servant/Makefile.am +++ /dev/null @@ -1,105 +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) - - -## Makefile.POA_Generic_Servant_Lib.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) -Sa -St -Wb,export_macro=GENERIC_SERVANT_Export -Wb,export_include=generic_servant_export.h $(srcdir)/test.idl - @touch $@ - -noinst_LTLIBRARIES = libGeneric_Servant.la - -libGeneric_Servant_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DGENERIC_SERVANT_BUILD_DLL - -libGeneric_Servant_la_SOURCES = \ - testC.cpp \ - testS.cpp \ - test_i.cpp - -noinst_HEADERS = \ - test.idl \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ - test_i.h - -endif BUILD_EXCEPTIONS - -## Makefile.POA_Generic_Servant_Client.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 = \ - client.cpp \ - generic_servant_export.h \ - test_i.h - -client_LDADD = \ - libGeneric_Servant.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_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/tests/POA/Generic_Servant/client.cpp b/tests/POA/Generic_Servant/client.cpp index b00706c55da..2d6f2520451 100644 --- a/tests/POA/Generic_Servant/client.cpp +++ b/tests/POA/Generic_Servant/client.cpp @@ -6,8 +6,6 @@ #include "ace/Read_Buffer.h" #include "testC.h" -ACE_RCSID(Generic_Servant, client, "$Id$") - static ACE_TCHAR *IOR = 0; static int iterations = 1; static int oneway = 0; diff --git a/tests/POA/Generic_Servant/test_i.cpp b/tests/POA/Generic_Servant/test_i.cpp index 787cbbd889e..2335e268f06 100644 --- a/tests/POA/Generic_Servant/test_i.cpp +++ b/tests/POA/Generic_Servant/test_i.cpp @@ -4,8 +4,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_string.h" -ACE_RCSID(Generic_Servant, test_i, "$Id$") - // Constructor test_i::test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) diff --git a/tests/POA/Generic_Servant/test_i.h b/tests/POA/Generic_Servant/test_i.h index 24094760497..cc3c834acb5 100644 --- a/tests/POA/Generic_Servant/test_i.h +++ b/tests/POA/Generic_Servant/test_i.h @@ -1,53 +1,52 @@ -// $Id$ //============================================================================= -// -// -// = FILENAME -// test_i.h -// -// = DESCRIPTION -// Defines test_i class for the test interface -// -// = AUTHOR -// Irfan Pyarali -// +/** + * @file test_i.h + * + * $Id$ + * + * Defines test_i class for the test interface + * + * + * @author Irfan Pyarali + */ //============================================================================= + #include "testS.h" class GENERIC_SERVANT_Export test_i : public POA_test { public: + /// Constructor - takes a POA and a value parameter test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - // Constructor - takes a POA and a value parameter + /// Returns the Default POA of this servant PortableServer::POA_ptr _default_POA (void); - // Returns the Default POA of this servant + /// A twoway operation. void method (void); - // A twoway operation. + /// A oneway operation. void oneway_method (void); - // A oneway operation. + /// A timed twoway operation. void timed_method (CORBA::ULong timeout); - // A timed twoway operation. + /// A timed twoway operation. void timed_oneway_method (CORBA::ULong timeout); - // A timed twoway operation. + /// Shutdown the ORB void shutdown (void); - // Shutdown the ORB + /// Sleep for some time. void sleep (CORBA::ULong timeout, const char *operation); - // Sleep for some time. protected: + /// Our ORB. CORBA::ORB_var orb_; - // Our ORB. + /// Our POA. PortableServer::POA_var poa_; - // Our POA. }; diff --git a/tests/POA/Identity/Identity.cpp b/tests/POA/Identity/Identity.cpp index 4474adba7a5..5d544812401 100644 --- a/tests/POA/Identity/Identity.cpp +++ b/tests/POA/Identity/Identity.cpp @@ -1,26 +1,23 @@ -// $Id$ - -// ================================================== -// = LIBRARY -// TAO/test/POA/Identity -// -// = FILENAME -// Identity.cpp -// -// = DESCRIPTION -// This program demonstrates and tests how to move between id, -// reference, and servants. -// -// = AUTHOR -// Irfan Pyarali -// ================================================== + +//============================================================================= +/** + * @file Identity.cpp + * + * $Id$ + * + * This program demonstrates and tests how to move between id, + * reference, and servants. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "testS.h" #include "tao/ORB_Core.h" #include "tao/Server_Strategy_Factory.h" -ACE_RCSID(Identity, Identity, "$Id$") - class test_i : public POA_test { public: diff --git a/tests/POA/Identity/Makefile.am b/tests/POA/Identity/Makefile.am deleted file mode 100644 index 307d67d650d..00000000000 --- a/tests/POA/Identity/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.POA_Identity.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) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Identity - -Identity_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Identity_SOURCES = \ - Identity.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Identity_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/POA/Loader/Makefile.am b/tests/POA/Loader/Makefile.am deleted file mode 100644 index fb675280511..00000000000 --- a/tests/POA/Loader/Makefile.am +++ /dev/null @@ -1,52 +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.POA_Loader_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Servant_Activator.cpp \ - Servant_Locator.cpp \ - Server_Manager.cpp \ - server.cpp \ - Servant_Activator.h \ - Servant_Locator.h \ - Server_Manager.h - -server_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/POA/Loader/Servant_Activator.cpp b/tests/POA/Loader/Servant_Activator.cpp index 76650d877d2..9f274cb60a4 100644 --- a/tests/POA/Loader/Servant_Activator.cpp +++ b/tests/POA/Loader/Servant_Activator.cpp @@ -1,29 +1,22 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/examples/POA/Loader -// -// = FILENAME -// Servant_Activator.cpp -// -// = DESCRIPTION -// Implementation of <ServantActivator>, which is used by a POA -// with a RETAIN policy. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file Servant_Activator.cpp + * + * $Id$ + * + * Implementation of <ServantActivator>, which is used by a POA + * with a RETAIN policy. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + #include "Servant_Activator.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Loader, - Servant_Activator, - "$Id$") - // Initialization.The dllname is used by the Loactor to load it into // memory. The factory function is the point of entry into the dll and // is used for obtaining the servant. The garbage_collection_function diff --git a/tests/POA/Loader/Servant_Activator.h b/tests/POA/Loader/Servant_Activator.h index 2b00f10541a..7f1815ac5ed 100644 --- a/tests/POA/Loader/Servant_Activator.h +++ b/tests/POA/Loader/Servant_Activator.h @@ -1,22 +1,17 @@ // This may look like C, but it's really -*- C++ -*- -// $Id$ -// ================================================================ -// -// = LIBRARY -// TAO/examples/POA/On_Demand_Loading -// -// = FILENAME -// Servant_Activator.h -// -// = DESCRIPTION -// Defines a <ServantActivator> class, which activates a servant by -// obtaining it and associates it with an object on-demand. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -// ================================================================ +//============================================================================= +/** + * @file Servant_Activator.h + * + * $Id$ + * + * Defines a <ServantActivator> class, which activates a servant by + * obtaining it and associates it with an object on-demand. + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= #ifndef SERVANT_ACTIVATOR_H #define SERVANT_ACTIVATOR_H @@ -30,76 +25,84 @@ #include "ace/DLL.h" #include "ace/Log_Msg.h" +/** + * Servant Activator for the test servant. + * + * This class associates an unassociated servant with an object in + * the POA Active Object Map. + */ class ServantActivator : public virtual PortableServer::ServantActivator, public virtual ::CORBA::LocalObject { - //= TITLE - // Servant Activator for the test servant. - // - //= DESCRIPTION - // This class associates an unassociated servant with an object in - // the POA Active Object Map. public: + /** + * This typedef is used to typecast the void* obtained when finding + * a symbol in the dll. Invoking the function pointer obtained would + * get a servant. + */ typedef PortableServer::Servant (*SERVANT_FACTORY) (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa, CORBA::ORB_ptr orb); - // This typedef is used to typecast the void* obtained when finding - // a symbol in the dll. Invoking the function pointer obtained would - // get a servant. + /** + * This typedef is used to obtain the garbage_collection_function symbol + * in the dll. Invoking the function pointer obtained would then destroy + * the servant. + */ typedef void (*SERVANT_GARBAGE_COLLECTOR) (const PortableServer::ObjectId &oid, PortableServer::POA_ptr, PortableServer::Servant servant); - // This typedef is used to obtain the garbage_collection_function symbol - // in the dll. Invoking the function pointer obtained would then destroy - // the servant. + /// Initialization. ServantActivator (CORBA::ORB_ptr orb, const ACE_TCHAR *dllname, const ACE_TCHAR *factory_function, const ACE_TCHAR *garbage_collection_function); - // Initialization. + /** + * This method is invoked by a POA with USE_SERVANT_MANAGER and + * RETAIN policies, whenever it receives a request for a + * test object that is not currently active. When an servant + * pointer corresponding to objectId is not found in the Active + * Object Map, the POA hands over the job of obtaining the servant + * to the Servant Manager. Depending upon whether the POA is created + * with RETAIN or NON_RETAIN as the servant_retention policy, the + * Servant Activator or the Servant Locator interface is invoked + * respectively. + */ virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa); - // This method is invoked by a POA with USE_SERVANT_MANAGER and - // RETAIN policies, whenever it receives a request for a - // test object that is not currently active. When an servant - // pointer corresponding to objectId is not found in the Active - // Object Map, the POA hands over the job of obtaining the servant - // to the Servant Manager. Depending upon whether the POA is created - // with RETAIN or NON_RETAIN as the servant_retention policy, the - // Servant Activator or the Servant Locator interface is invoked - // respectively. + /** + * This method is invoked whenever a test object is + * deactivated. This occurs when the POA is destroyed or the Object + * is deactivated. When the POA is getting destroyed, it needs to + * deactivate every object in the Active Object Map and on that call + * the ServantActivator invokes this method which will destroy the + * servant associated with the object. + */ virtual void etherealize (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations); - // This method is invoked whenever a test object is - // deactivated. This occurs when the POA is destroyed or the Object - // is deactivated. When the POA is getting destroyed, it needs to - // deactivate every object in the Active Object Map and on that call - // the ServantActivator invokes this method which will destroy the - // servant associated with the object. private: + /// The ACE_DLL object which performs the task of loading the dll + /// and accessing it. ACE_DLL dll_; - // The ACE_DLL object which performs the task of loading the dll - // and accessing it. + /// The function pointer of factory_function type. SERVANT_FACTORY servant_supplier_; - // The function pointer of factory_function type. + /// The function pointer of garbage_collection_function type. SERVANT_GARBAGE_COLLECTOR servant_garbage_collector_; - // The function pointer of garbage_collection_function type. + /// A reference to the ORB. CORBA::ORB_var orb_; - // A reference to the ORB. }; #endif /* SERVANT_ACTIVATOR_H */ diff --git a/tests/POA/Loader/Servant_Locator.cpp b/tests/POA/Loader/Servant_Locator.cpp index c7c91e02667..7faaa0a429d 100644 --- a/tests/POA/Loader/Servant_Locator.cpp +++ b/tests/POA/Loader/Servant_Locator.cpp @@ -1,29 +1,22 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/examples/POA/Loader -// -// = FILENAME -// Servant_Locator.cpp -// -// = DESCRIPTION -// Implementation of ServantLocator class, used with a POA -// having a NON_RETAIN policy. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file Servant_Locator.cpp + * + * $Id$ + * + * Implementation of ServantLocator class, used with a POA + * having a NON_RETAIN policy. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + #include "Servant_Locator.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Loader, - Servant_Locator, - "$Id$") - // Initialization.The dllname is used by the Loactor to load it into // memory. The factory function is the point of entry into the dll and // is used for obtaining the servant. The garbage_collection_function diff --git a/tests/POA/Loader/Servant_Locator.h b/tests/POA/Loader/Servant_Locator.h index 2c4c64a92a4..050856983b3 100644 --- a/tests/POA/Loader/Servant_Locator.h +++ b/tests/POA/Loader/Servant_Locator.h @@ -1,22 +1,19 @@ // This may look like C, but it's really -*- C++ -*- -// $Id$ - -// ================================================================ -// -// = LIBRARY -// TAO/examples/POA/Loader -// -// = FILENAME -// Servant_Locator.h -// -// = DESCRIPTION -// Defines a ServantLocator class , used with a POA having -// a NON_RETAIN policy. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -// ================================================================ + +//============================================================================= +/** + * @file Servant_Locator.h + * + * $Id$ + * + * Defines a ServantLocator class , used with a POA having + * a NON_RETAIN policy. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + #ifndef SERVANT_LOCATOR_H #define SERVANT_LOCATOR_H @@ -44,74 +41,82 @@ class ServantLocator : // Manager. It is invoked when the POA has an USE_SERVANT_MANAGER // policy and a servant_retention policy of NON_RETAIN type. public: + /** + * This typedef is used to typecast the void* obtained when finding + * a symbol in the dll. Invoking the function pointer obtained would + * get a servant. + */ typedef PortableServer::Servant (*SERVANT_FACTORY) (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa, CORBA::ORB_ptr orb); - // This typedef is used to typecast the void* obtained when finding - // a symbol in the dll. Invoking the function pointer obtained would - // get a servant. + /** + * This typedef is used to obtain the garbage_collection_function symbol + * in the dll. Invoking the function pointer obtained would then destroy + * the servant. + */ typedef void (*SERVANT_GARBAGE_COLLECTOR) (const PortableServer::ObjectId &oid, PortableServer::POA_ptr, PortableServer::Servant servant); - // This typedef is used to obtain the garbage_collection_function symbol - // in the dll. Invoking the function pointer obtained would then destroy - // the servant. + /// Constructor. ServantLocator (CORBA::ORB_ptr orb, const ACE_TCHAR *dllname, const ACE_TCHAR *factory_function, const ACE_TCHAR *garbage_collection_function); - // Constructor. + /** + * This method is invoked by a POA whenever it receives a request + * for test object that is not currently active. When the POA is + * created using the NON_RETAIN policy the Active Object Map is not + * maintained, in other words, an association between the ObjectId + * and the servant is not maintained. Hence every client request the + * servant has to be loaded. Note the operation argument. This + * argument specifies the operation to be invoked on the + * servant. The cookie helps in marking the servant. This marking is + * useful while destroying the servant. + */ virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie); - // This method is invoked by a POA whenever it receives a request - // for test object that is not currently active. When the POA is - // created using the NON_RETAIN policy the Active Object Map is not - // maintained, in other words, an association between the ObjectId - // and the servant is not maintained. Hence every client request the - // servant has to be loaded. Note the operation argument. This - // argument specifies the operation to be invoked on the - // servant. The cookie helps in marking the servant. This marking is - // useful while destroying the servant. + /** + * This method is invoked whenever a test servant completes a + * request. As the Servant Loactor interface is used when the POA + * doesnt maintain the Active Object Map, its necessary to get rid + * of the servant after the client request has been processed. The + * appropriate servant is destroyed by verifying the cookie.Again + * this method is invoked per client request. + */ virtual void postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant); - // This method is invoked whenever a test servant completes a - // request. As the Servant Loactor interface is used when the POA - // doesnt maintain the Active Object Map, its necessary to get rid - // of the servant after the client request has been processed. The - // appropriate servant is destroyed by verifying the cookie.Again - // this method is invoked per client request. private: + /// The name of the dll containing the servant. ACE_CString dllname_; - // The name of the dll containing the servant. + /// The symbol which on getting invoked will give us the servant + /// pointer. ACE_CString create_symbol_; - // The symbol which on getting invoked will give us the servant - // pointer. + /// The ACE_DLL object which performs the task of loading the dll + /// and accessing it. ACE_DLL dll_; - // The ACE_DLL object which performs the task of loading the dll - // and accessing it. + /// The function pointer of factory_function type. SERVANT_FACTORY servant_supplier_; - // The function pointer of factory_function type. + /// The function pointer of garbage_collection_function type. SERVANT_GARBAGE_COLLECTOR servant_garbage_collector_; - // The function pointer of garbage_collection_function type. + /// A reference to the ORB. CORBA::ORB_var orb_; - // A reference to the ORB. }; #endif /* SERVANT_LOCATOR_H */ diff --git a/tests/POA/Loader/Server_Manager.cpp b/tests/POA/Loader/Server_Manager.cpp index eae582da9c6..3511aeffe3b 100644 --- a/tests/POA/Loader/Server_Manager.cpp +++ b/tests/POA/Loader/Server_Manager.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Loader, Server_Manager, "$Id$") - Server_i::Server_i (void) : ior_output_file_ (0), policies_ (4) diff --git a/tests/POA/Loader/Server_Manager.h b/tests/POA/Loader/Server_Manager.h index 84d347dc2b4..15db7a8549a 100644 --- a/tests/POA/Loader/Server_Manager.h +++ b/tests/POA/Loader/Server_Manager.h @@ -1,102 +1,103 @@ // This may look like C, but it's really -*- C++ -*- -// $Id$ //============================================================================= -// -// = LIBRARY -// TAO/examples/POA/Loader -// -// = FILENAME -// Server_Manager.h -// -// = DESCRIPTION -// Helper class for the server application. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// +/** + * @file Server_Manager.h + * + * $Id$ + * + * Helper class for the server application. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ //============================================================================= + #ifndef SERVER_MANAGER_H #define SERVER_MANAGER_H #include "Servant_Activator.h" #include "Servant_Locator.h" +/** + * @class Server_i + * + * @brief This class provides the server application with helper methods + * + * The various methods required by the server application for + * utilizing the ServantActivator and ServantLocator interfaces of + * the Servant Manager are implemented by this class. These + * include initialisation procedures of the ServantActivator and + * ServantLocator, and creation of POAs with emphasis on the + * servant retention policy. + */ class Server_i { - // = TITLE - // This class provides the server application with helper methods - // - // = DESCRIPTION - // The various methods required by the server application for - // utilizing the ServantActivator and ServantLocator interfaces of - // the Servant Manager are implemented by this class. These - // include initialisation procedures of the ServantActivator and - // ServantLocator, and creation of POAs with emphasis on the - // servant retention policy. public: // = Initialization and termination methods. + /// Initialisation. Server_i (void); - // Initialisation. + /// Destruction. ~Server_i (void); - // Destruction. + /// Initialisation of the ORB and poa. int init (int argc, ACE_TCHAR **argv); - // Initialisation of the ORB and poa. + /** + * This method creates a POA from the root_poa with emphasis being + * on the servant_retention_policy which decides the use of the + * ServantActivator or ServantLocator interfaces. The + * servent_retention_policy value is 1 for the RETAIN policy and 0 + * for the NONRETAIN policy. + */ PortableServer::POA_ptr create_poa (const char* name, int servant_retention_policy); - // This method creates a POA from the root_poa with emphasis being - // on the servant_retention_policy which decides the use of the - // ServantActivator or ServantLocator interfaces. The - // servent_retention_policy value is 1 for the RETAIN policy and 0 - // for the NONRETAIN policy. + /// A ServantActivator object is created and initialised. int create_activator (PortableServer::POA_var first_poa); - // A ServantActivator object is created and initialised. + /// A ServantActivator object is created and initialised. int create_locator (PortableServer::POA_var second_poa); - // A ServantActivator object is created and initialised. + /// The server is executed. int run (void); - // The server is executed. private: + /// Parses the input arguments. int parse_args (int argc, ACE_TCHAR **argv); - // Parses the input arguments. + /// The IORs are written to a file for future use. int write_iors_to_file (const char *first_ior, const char *second_ior); - // The IORs are written to a file for future use. + /// Default ior file. ACE_TCHAR *ior_output_file_; - // Default ior file. + /// The orb pointer. CORBA::ORB_var orb_; - // The orb pointer. + /// The poa policicies. CORBA::PolicyList policies_; - // The poa policicies. + /// The root_poa which is used for cretaing different child poas. PortableServer::POA_var root_poa_; - // The root_poa which is used for cretaing different child poas. + /// The poa_manager object. PortableServer::POAManager_var poa_manager_; - // The poa_manager object. + /// The object pointer used by the ServantActivator. CORBA::Object_var first_test_; - // The object pointer used by the ServantActivator. + /// The object pointer used by the Servant Locator. CORBA::Object_var second_test_; - // The object pointer used by the Servant Locator. + /// The servant activator object. ServantActivator *servant_activator_; - // The servant activator object. + /// The servant locator object. ServantLocator *servant_locator_; - // The servant locator object. }; #endif /* SERVER_MANAGER_H */ diff --git a/tests/POA/Loader/run_test.pl b/tests/POA/Loader/run_test.pl index 0bc52287cac..83dda3bc405 100755 --- a/tests/POA/Loader/run_test.pl +++ b/tests/POA/Loader/run_test.pl @@ -18,8 +18,8 @@ $extra_args = ""; $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; - -$server->AddLibPath ('../Generic_Servant/.'); + +$server->AddLibPath ('../Generic_Servant/.'); $client->AddLibPath ('../Generic_Servant/.'); # Parse the arguments diff --git a/tests/POA/Loader/server.cpp b/tests/POA/Loader/server.cpp index 55e2f7f8b3f..809eccba1fa 100644 --- a/tests/POA/Loader/server.cpp +++ b/tests/POA/Loader/server.cpp @@ -1,21 +1,19 @@ -// $Id$ -//============================================================================ -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// Server application to test the Servant Activator and Servant Locator. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * Server application to test the Servant Activator and Servant Locator. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ //============================================================================= -#include "Server_Manager.h" -ACE_RCSID(Loader, server, "$Id$") +#include "Server_Manager.h" int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) diff --git a/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp index 3b556cafe75..98350ccd826 100644 --- a/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp +++ b/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp @@ -1,21 +1,18 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/POA/MT_Servant_Locator -// -// = FILENAME -// MT_Servant_Locator.cpp -// -// = DESCRIPTION -// This program tests that multiple calls to the Servant Locator -// can take place simultaneously. -// -// = AUTHOR -// Irfan Pyarali -// -//========================================================================= + +//============================================================================= +/** + * @file MT_Servant_Locator.cpp + * + * $Id$ + * + * This program tests that multiple calls to the Servant Locator + * can take place simultaneously. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "testS.h" #include "ace/Task.h" diff --git a/tests/POA/MT_Servant_Locator/Makefile.am b/tests/POA/MT_Servant_Locator/Makefile.am deleted file mode 100644 index 0abd36986a7..00000000000 --- a/tests/POA/MT_Servant_Locator/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.POA_MT_Servant_Locator.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) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = MT_Servant_Locator - -MT_Servant_Locator_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -MT_Servant_Locator_SOURCES = \ - MT_Servant_Locator.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -MT_Servant_Locator_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/POA/Makefile.am b/tests/POA/Makefile.am deleted file mode 100644 index bcbf18f8568..00000000000 --- a/tests/POA/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 - -SUBDIRS = \ - Bug_1592_Regression \ - Bug_2511_Regression \ - Current \ - DSI \ - Deactivate_Object \ - Default_Servant \ - Default_Servant2 \ - EndpointPolicy \ - Etherealization \ - Excessive_Object_Deactivations \ - FindPOA \ - Forwarding \ - Generic_Servant \ - Explicit_Activation \ - Adapter_Activator \ - Identity \ - Loader \ - MT_Servant_Locator \ - Nested_Non_Servant_Upcalls \ - NewPOA \ - Non_Servant_Upcalls \ - Object_Reactivation \ - On_Demand_Activation \ - On_Demand_Loading \ - POAManagerFactory \ - POA_BiDir \ - POA_Destruction \ - Persistent_ID \ - Policies \ - Reference_Counted_Servant \ - Reference_Counting \ - RootPOA \ - Single_Threaded_POA \ - TIE \ - wait_for_completion - diff --git a/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am b/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am deleted file mode 100644 index 69d97514a73..00000000000 --- a/tests/POA/Nested_Non_Servant_Upcalls/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.POA_Nested_Non_Servant_Upcalls.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) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Nested_Non_Servant_Upcalls - -Nested_Non_Servant_Upcalls_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Nested_Non_Servant_Upcalls_SOURCES = \ - Nested_Non_Servant_Upcalls.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Nested_Non_Servant_Upcalls_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/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp index 01961ebc2ee..77a0ad2a2c0 100644 --- a/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp +++ b/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp @@ -1,21 +1,18 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/POA/Nested_Non_Servant_Upcalls -// -// = FILENAME -// Nested_Non_Servant_Upcalls.cpp -// -// = DESCRIPTION -// This program tests that nested non-servant upcalls are handled -// correctly. -// -// = AUTHOR -// Irfan Pyarali -// -//========================================================================= + +//============================================================================= +/** + * @file Nested_Non_Servant_Upcalls.cpp + * + * $Id$ + * + * This program tests that nested non-servant upcalls are handled + * correctly. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "testS.h" #include "ace/Task.h" diff --git a/tests/POA/NewPOA/Makefile.am b/tests/POA/NewPOA/Makefile.am deleted file mode 100644 index f1ff572e71f..00000000000 --- a/tests/POA/NewPOA/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.POA_NewPOA.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = NewPOA - -NewPOA_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -NewPOA_SOURCES = \ - NewPOA.cpp - -NewPOA_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/POA/NewPOA/NewPOA.cpp b/tests/POA/NewPOA/NewPOA.cpp index 97ec819ccc3..3d503c35d19 100644 --- a/tests/POA/NewPOA/NewPOA.cpp +++ b/tests/POA/NewPOA/NewPOA.cpp @@ -1,25 +1,24 @@ -// $Id$ - -// ========================================================================== -// = LIBRARY -// TAO/tests/POA/NewPOA -// -// = FILENAME -// NewPOA.cpp -// -// = DESCRIPTION -// This program demonstrates creation of new POAs, as children of the root POA or the -// existing POA. -// There are three new POA created in this example. -// The hierarchy of POAs looks like this. -// -// /-->first_poa-->first_poa/second_poa -// RootPOA-- -// \-->third_poa -// -// = AUTHOR -// Irfan Pyarali -// ======================================================================== + +//============================================================================= +/** + * @file NewPOA.cpp + * + * $Id$ + * + * This program demonstrates creation of new POAs, as children of the root POA or the + * existing POA. + * There are three new POA created in this example. + * The hierarchy of POAs looks like this. + * + * /-->first_poa-->first_poa/second_poa + * RootPOA-- + * \-->third_poa + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "tao/PortableServer/PortableServer.h" @@ -28,10 +27,6 @@ #include "ace/SString.h" #include "ace/Log_Msg.h" -ACE_RCSID (NewPOA, - NewPOA, - "$Id$") - void print_poa (PortableServer::POA_ptr poa) { diff --git a/tests/POA/Non_Servant_Upcalls/Makefile.am b/tests/POA/Non_Servant_Upcalls/Makefile.am deleted file mode 100644 index 3192f7d27fb..00000000000 --- a/tests/POA/Non_Servant_Upcalls/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.POA_Non_Servant_Upcalls.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) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Non_Servant_Upcalls - -Non_Servant_Upcalls_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Non_Servant_Upcalls_SOURCES = \ - Non_Servant_Upcalls.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Non_Servant_Upcalls_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/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp index b63df5cebd5..3d862fd28db 100644 --- a/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp +++ b/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp @@ -1,23 +1,20 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/POA/Non_Servant_Upcalls -// -// = FILENAME -// Non_Servant_Upcalls.cpp -// -// = DESCRIPTION -// This program tests the users ability to make calls on a POA -// during non-servant upcalls. In this example, a servant which -// is being destroyed during because of a deactivate_object() -// call, tries to deactivate another object in its destructor. -// -// = AUTHOR -// Irfan Pyarali -// -//========================================================================= + +//============================================================================= +/** + * @file Non_Servant_Upcalls.cpp + * + * $Id$ + * + * This program tests the users ability to make calls on a POA + * during non-servant upcalls. In this example, a servant which + * is being destroyed during because of a deactivate_object() + * call, tries to deactivate another object in its destructor. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "testS.h" diff --git a/tests/POA/Object_Reactivation/Makefile.am b/tests/POA/Object_Reactivation/Makefile.am deleted file mode 100644 index 0aa28e71aa5..00000000000 --- a/tests/POA/Object_Reactivation/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.POA_Object_Reactivation.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) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Object_Reactivation - -Object_Reactivation_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Object_Reactivation_SOURCES = \ - Object_Reactivation.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Object_Reactivation_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/POA/Object_Reactivation/Object_Reactivation.cpp b/tests/POA/Object_Reactivation/Object_Reactivation.cpp index 67835cf92cf..f497a31d384 100644 --- a/tests/POA/Object_Reactivation/Object_Reactivation.cpp +++ b/tests/POA/Object_Reactivation/Object_Reactivation.cpp @@ -1,21 +1,18 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/POA/Object_Reactivation -// -// = FILENAME -// Object_Reactivation.cpp -// -// = DESCRIPTION -// This program tests the reactivation of a servant that has been -// deactivated but not removed from the Active Object Map yet. -// -// = AUTHOR -// Irfan Pyarali -// -//========================================================================= + +//============================================================================= +/** + * @file Object_Reactivation.cpp + * + * $Id$ + * + * This program tests the reactivation of a servant that has been + * deactivated but not removed from the Active Object Map yet. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "testS.h" #include "ace/Task.h" diff --git a/tests/POA/On_Demand_Activation/Makefile.am b/tests/POA/On_Demand_Activation/Makefile.am deleted file mode 100644 index 25a7f4d121a..00000000000 --- a/tests/POA/On_Demand_Activation/Makefile.am +++ /dev/null @@ -1,56 +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.POA_On_Demand_Activation_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../Generic_Servant \ - -I../Generic_Servant - -server_SOURCES = \ - Servant_Activator.cpp \ - Servant_Locator.cpp \ - server.cpp \ - Servant_Activator.h \ - Servant_Locator.h - -server_LDFLAGS = \ - -L../Generic_Servant - -server_LDADD = \ - $(top_builddir)/tests/POA/Generic_Servant/libGeneric_Servant.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/tests/POA/On_Demand_Activation/Servant_Activator.cpp b/tests/POA/On_Demand_Activation/Servant_Activator.cpp index 7b20091b85f..abbd67a4ceb 100644 --- a/tests/POA/On_Demand_Activation/Servant_Activator.cpp +++ b/tests/POA/On_Demand_Activation/Servant_Activator.cpp @@ -1,30 +1,23 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/POA/On_Demand_Activation/Servant_Activator -// -// = FILENAME -// Servant_Activator.cpp -// -// = DESCRIPTION -// Implementation of ServantActivator, which is used by a POA with -// a RETAIN policy. -// -// = AUTHOR -// Irfan Pyarali -// -// ============================================================================ +//============================================================================= +/** + * @file Servant_Activator.cpp + * + * $Id$ + * + * Implementation of ServantActivator, which is used by a POA with + * a RETAIN policy. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "Servant_Activator.h" #include "test_i.h" #include "ace/OS_NS_string.h" -ACE_RCSID (On_Demand_Activation, - Servant_Activator, - "$Id$") - ServantActivator::ServantActivator (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/POA/On_Demand_Activation/Servant_Activator.h b/tests/POA/On_Demand_Activation/Servant_Activator.h index af28972deb1..5f455082704 100644 --- a/tests/POA/On_Demand_Activation/Servant_Activator.h +++ b/tests/POA/On_Demand_Activation/Servant_Activator.h @@ -1,21 +1,18 @@ // -*- C++ -*- -// $Id$ - -// ================================================================ -// -// = LIBRARY -// TAO/tests/POA/On_Demand_Activation/Servant_Activator -// -// = FILENAME -// Servant_Activator.h -// -// = DESCRIPTION -// Defines a ServantActivator class. -// -// = AUTHOR -// Irfan Pyarali -// -// ================================================================ + +//============================================================================= +/** + * @file Servant_Activator.h + * + * $Id$ + * + * Defines a ServantActivator class. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "tao/PortableServer/PortableServer.h" #include "tao/PortableServer/ServantActivatorC.h" @@ -30,20 +27,22 @@ class ServantActivator : public: ServantActivator (CORBA::ORB_ptr orb); + /** + * This method is invoked by a POA with USE_SERVANT_MANAGER and + * RETAIN policies, whenever it receives a request for a test object + * that is not currently active. + */ PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa); - // This method is invoked by a POA with USE_SERVANT_MANAGER and - // RETAIN policies, whenever it receives a request for a test object - // that is not currently active. + /// This method is invoked whenever a test object is deactivated. void etherealize (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations); - // This method is invoked whenever a test object is deactivated. private: + /// A reference to the ORB. CORBA::ORB_var orb_; - // A reference to the ORB. }; diff --git a/tests/POA/On_Demand_Activation/Servant_Locator.cpp b/tests/POA/On_Demand_Activation/Servant_Locator.cpp index 083ef55fbee..ed317299e10 100644 --- a/tests/POA/On_Demand_Activation/Servant_Locator.cpp +++ b/tests/POA/On_Demand_Activation/Servant_Locator.cpp @@ -1,30 +1,23 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/POA/On_Demand_Activation/Servant_Locator -// -// = FILENAME -// Servant_Locator.cpp -// -// = DESCRIPTION -// Implementation of ServantLocator class , used with a POA -// having a NON_RETAIN policy. -// -// = AUTHOR -// Irfan Pyarali -// -// ============================================================================ +//============================================================================= +/** + * @file Servant_Locator.cpp + * + * $Id$ + * + * Implementation of ServantLocator class , used with a POA + * having a NON_RETAIN policy. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "Servant_Locator.h" #include "test_i.h" #include "ace/OS_NS_string.h" -ACE_RCSID (On_Demand_Activation, - Servant_Locator, - "$Id$") - ServantLocator::ServantLocator (CORBA::ORB_ptr orb) : counter_ (0), orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/tests/POA/On_Demand_Activation/Servant_Locator.h b/tests/POA/On_Demand_Activation/Servant_Locator.h index fb1460827ac..13c3e5857ab 100644 --- a/tests/POA/On_Demand_Activation/Servant_Locator.h +++ b/tests/POA/On_Demand_Activation/Servant_Locator.h @@ -1,22 +1,19 @@ // -*- C++ -*- -// $Id$ - -//================================================================================ -// -// = LIBRARY -// TAO/tests/POA/On_Demand_Activation/Servant_Locator -// -// = FILENAME -// Servant_Locator.h -// -// = DESCRIPTION -// Defines a ServantLocator class, used with a POA having a -// NON_RETAIN policy -// -// = AUTHOR -// Irfan Pyarali -// -//================================================================================== + +//============================================================================= +/** + * @file Servant_Locator.h + * + * $Id$ + * + * Defines a ServantLocator class, used with a POA having a + * NON_RETAIN policy + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "tao/PortableServer/PortableServer.h" #include "tao/PortableServer/ServantLocatorC.h" @@ -33,27 +30,27 @@ class ServantLocator : // This class is used by a POA with USE_SERVANT_MANAGER and // NON_RETAIN policy. public: + /// constructor ServantLocator (CORBA::ORB_ptr orb); - // constructor + /// This method is invoked by a POA whenever it receives a request + /// for test object that is not currently active. virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie); - // This method is invoked by a POA whenever it receives a request - // for test object that is not currently active. + /// This method is invoked whenever a test servant completes a + /// request. virtual void postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant); - // This method is invoked whenever a test servant completes a - // request. private: + /// Counter for number of invocations of this. int counter_; - // Counter for number of invocations of this. CORBA::ORB_var orb_; }; diff --git a/tests/POA/On_Demand_Activation/run_test.pl b/tests/POA/On_Demand_Activation/run_test.pl index 2957b71a8bc..454157f91bb 100755 --- a/tests/POA/On_Demand_Activation/run_test.pl +++ b/tests/POA/On_Demand_Activation/run_test.pl @@ -13,7 +13,7 @@ $iorbase0 = "ior"; my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; -$server->AddLibPath ('../Generic_Servant/.'); +$server->AddLibPath ('../Generic_Servant/.'); $client->AddLibPath ('../Generic_Servant/.'); $oneway = ""; diff --git a/tests/POA/On_Demand_Activation/server.cpp b/tests/POA/On_Demand_Activation/server.cpp index e624e900df8..ed72b90c473 100644 --- a/tests/POA/On_Demand_Activation/server.cpp +++ b/tests/POA/On_Demand_Activation/server.cpp @@ -1,18 +1,18 @@ -// $Id$ - -//============================================================================ -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// Server to test the Servant Activator and Servant Locator for a POA. -// -// = AUTHOR -// Irfan Pyarali <irfan@cs.wustl.edu> -// + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * Server to test the Servant Activator and Servant Locator for a POA. + * + * + * @author Irfan Pyarali <irfan@cs.wustl.edu> + */ //============================================================================= + #include "ace/streams.h" #include "ace/Get_Opt.h" #include "ace/SString.h" @@ -20,8 +20,6 @@ #include "Servant_Locator.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(On_Demand_Activation, server, "$Id$") - static const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); static int diff --git a/tests/POA/On_Demand_Loading/Makefile.am b/tests/POA/On_Demand_Loading/Makefile.am deleted file mode 100644 index 3f8c10eb082..00000000000 --- a/tests/POA/On_Demand_Loading/Makefile.am +++ /dev/null @@ -1,54 +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.POA_On_Demand_Loading_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Servant_Activator.cpp \ - Servant_Locator.cpp \ - Servant_Manager.cpp \ - Server_Manager.cpp \ - server.cpp \ - Servant_Activator.h \ - Servant_Locator.h \ - Servant_Manager.h \ - Server_Manager.h - -server_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/POA/On_Demand_Loading/Servant_Activator.cpp b/tests/POA/On_Demand_Loading/Servant_Activator.cpp index b0d2e096c74..8b79859a529 100644 --- a/tests/POA/On_Demand_Loading/Servant_Activator.cpp +++ b/tests/POA/On_Demand_Loading/Servant_Activator.cpp @@ -1,27 +1,20 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/examples/POA/On_Demand_Loading -// -// = FILENAME -// Servant_Activator.cpp -// -// = DESCRIPTION -// Implementation of <ServantActivator_i>, which is used by a POA -// with a RETAIN policy. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file Servant_Activator.cpp + * + * $Id$ + * + * Implementation of <ServantActivator_i>, which is used by a POA + * with a RETAIN policy. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= -#include "Servant_Activator.h" -ACE_RCSID (On_Demand_Loading, - Servant_Activator, - "$Id$") +#include "Servant_Activator.h" // Initialization. diff --git a/tests/POA/On_Demand_Loading/Servant_Activator.h b/tests/POA/On_Demand_Loading/Servant_Activator.h index aeca82015f8..254def99c1e 100644 --- a/tests/POA/On_Demand_Loading/Servant_Activator.h +++ b/tests/POA/On_Demand_Loading/Servant_Activator.h @@ -1,23 +1,19 @@ // This may look like C, but it's really -*- C++ -*- -// $Id$ -// ================================================================ -// -// = LIBRARY -// TAO/examples/POA/On_Demand_Loading -// -// = FILENAME -// Servant_Activator.h -// -// = DESCRIPTION -// Defines a <ServantActivator_i> class, which uses a -// Servant_Manager to activate a servant by loading it and -// associates it with an object on-demand. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -// ================================================================ +//============================================================================= +/** + * @file Servant_Activator.h + * + * $Id$ + * + * Defines a <ServantActivator_i> class, which uses a + * Servant_Manager to activate a servant by loading it and + * associates it with an object on-demand. + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + #ifndef SERVANT_ACTIVATOR_H #define SERVANT_ACTIVATOR_H @@ -26,56 +22,62 @@ #include "tao/PortableServer/ServantActivatorC.h" #include "tao/LocalObject.h" +/** + * Servant Activator for the test servant. + * + * This class associates an unassociated servant with an object in + * the POA Active Object Map. + */ class ServantActivator_i : public virtual PortableServer::ServantActivator, public virtual ::CORBA::LocalObject { - //= TITLE - // Servant Activator for the test servant. - // - //= DESCRIPTION - // This class associates an unassociated servant with an object in - // the POA Active Object Map. public: + /// Initialization. ServantActivator_i (CORBA::ORB_ptr orb); - // Initialization. + /** + * This method is invoked by a POA with USE_SERVANT_MANAGER and + * RETAIN policies, whenever it receives a request for a test object + * that is not currently active. When an servant pointer + * corresponding to objectId is not found in the Active Object Map, + * the POA hands over the job of obtaining the servant to the + * Servant Manager. Depending upon whether the POA is created with + * RETAIN or NON_RETAIN as the servant_retention policy, the Servant + * Activator or the Servant Locator interface is invoked + * respectively. + */ virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa); - // This method is invoked by a POA with USE_SERVANT_MANAGER and - // RETAIN policies, whenever it receives a request for a test object - // that is not currently active. When an servant pointer - // corresponding to objectId is not found in the Active Object Map, - // the POA hands over the job of obtaining the servant to the - // Servant Manager. Depending upon whether the POA is created with - // RETAIN or NON_RETAIN as the servant_retention policy, the Servant - // Activator or the Servant Locator interface is invoked - // respectively. + /** + * This method is invoked whenever a test servant is + * deactivated. This occurs when the POA is destroyed or the Object + * is deactivated. When the POA is getting destroyed, it needs to + * deactivate every object in the Active Object Map and on that call + * the ServantActivator invokes this method which will destroy the + * servant associated with the object. + */ virtual void etherealize (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations); - // This method is invoked whenever a test servant is - // deactivated. This occurs when the POA is destroyed or the Object - // is deactivated. When the POA is getting destroyed, it needs to - // deactivate every object in the Active Object Map and on that call - // the ServantActivator invokes this method which will destroy the - // servant associated with the object. + /// Returns an ObjectId when given a DLL name and the factory + /// function in the DLL that will create an appropriate Servant. PortableServer::ObjectId_var create_dll_object_id (const char *dllname, const char *factory_function); - // Returns an ObjectId when given a DLL name and the factory - // function in the DLL that will create an appropriate Servant. private: + /** + * An ServantManager object that provides utility methods. The + * methods include obtaining the servant using an ACE_DLL object, + * destroying the servant and extracting the dllname and factory + * function from the ObjectId. + */ ServantManager_i servant_manager_; - // An ServantManager object that provides utility methods. The - // methods include obtaining the servant using an ACE_DLL object, - // destroying the servant and extracting the dllname and factory - // function from the ObjectId. }; #endif /* SERVANT_ACTIVATOR_H */ diff --git a/tests/POA/On_Demand_Loading/Servant_Locator.cpp b/tests/POA/On_Demand_Loading/Servant_Locator.cpp index 2eda77ee511..2ba068c0267 100644 --- a/tests/POA/On_Demand_Loading/Servant_Locator.cpp +++ b/tests/POA/On_Demand_Loading/Servant_Locator.cpp @@ -1,27 +1,20 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/examples/POA/On_Demand_Loading -// -// = FILENAME -// Servant_Locator.cpp -// -// = DESCRIPTION -// Implementation of ServantLocator_i class, used with a POA -// having a NON_RETAIN policy. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -// ============================================================================ -#include "Servant_Locator.h" +//============================================================================= +/** + * @file Servant_Locator.cpp + * + * $Id$ + * + * Implementation of ServantLocator_i class, used with a POA + * having a NON_RETAIN policy. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + -ACE_RCSID (On_Demand_Activation, - Servant_Locator, - "$Id$") +#include "Servant_Locator.h" // Initialization. diff --git a/tests/POA/On_Demand_Loading/Servant_Locator.h b/tests/POA/On_Demand_Loading/Servant_Locator.h index f1a0b45c5f8..a75819b1bc1 100644 --- a/tests/POA/On_Demand_Loading/Servant_Locator.h +++ b/tests/POA/On_Demand_Loading/Servant_Locator.h @@ -1,22 +1,19 @@ // This may look like C, but it's really -*- C++ -*- -// $Id$ -//================================================================================ -// -// = LIBRARY -// TAO/examples/POA/On_Demand_Loading -// -// = FILENAME -// Servant_Locator.h -// -// = DESCRIPTION -// Defines a ServantLocator_i class , used with a POA having -// a NON_RETAIN policy. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -//================================================================================== +//============================================================================= +/** + * @file Servant_Locator.h + * + * $Id$ + * + * Defines a ServantLocator_i class , used with a POA having + * a NON_RETAIN policy. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + #ifndef SERVANT_LOCATOR_H #define SERVANT_LOCATOR_H @@ -41,45 +38,51 @@ class ServantLocator_i : // Manager. It is invoked when the POA has an USE_SERVANT_MANAGER // policy and a servant_retention policy of NON_RETAIN type. public: + /// Constructor. ServantLocator_i (CORBA::ORB_ptr orb); - // Constructor. + /** + * This method is invoked by a POA whenever it receives a request + * for test object that is not currently active. When the POA is + * created using the NON_RETAIN policy the Active Object Map is not + * maintained, in other words, an association between the ObjectId + * and the servant is not maintained. Hence every client request the + * servant has to be loaded. Note the operation argument. This + * argument specifies the operation to be invoked on the + * servant. The cookie helps in marking the servant. This marking is + * useful while destroying the servant. + */ virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie); - // This method is invoked by a POA whenever it receives a request - // for test object that is not currently active. When the POA is - // created using the NON_RETAIN policy the Active Object Map is not - // maintained, in other words, an association between the ObjectId - // and the servant is not maintained. Hence every client request the - // servant has to be loaded. Note the operation argument. This - // argument specifies the operation to be invoked on the - // servant. The cookie helps in marking the servant. This marking is - // useful while destroying the servant. + /** + * This method is invoked whenever a test servant completes a + * request. As the Servant Loactor interface is used when the POA + * doesnt maintain the Active Object Map, its necessary to get rid + * of the servant after the client request has been processed. The + * appropriate servant is destroyed by verifying the cookie.Again + * this method is invoked per client request. + */ virtual void postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant); - // This method is invoked whenever a test servant completes a - // request. As the Servant Loactor interface is used when the POA - // doesnt maintain the Active Object Map, its necessary to get rid - // of the servant after the client request has been processed. The - // appropriate servant is destroyed by verifying the cookie.Again - // this method is invoked per client request. + /// Returns an ObjectId when given an dll name and the factory method + /// to be invoked in the dll. PortableServer::ObjectId_var create_dll_object_id (const char *dllname, const char *factory_function); - // Returns an ObjectId when given an dll name and the factory method - // to be invoked in the dll. private: + /** + * The <ServantManager_i> object that provides utility methods. The + * methods include obtaining the servant using an ACE_DLL object, + * destroying the servant and extracting the dllname and factory + * function from the ObjectId. + */ ServantManager_i servant_manager_; - // The <ServantManager_i> object that provides utility methods. The - // methods include obtaining the servant using an ACE_DLL object, - // destroying the servant and extracting the dllname and factory - // function from the ObjectId. }; #endif /* SERVANT_LOCATOR_H */ diff --git a/tests/POA/On_Demand_Loading/Servant_Manager.cpp b/tests/POA/On_Demand_Loading/Servant_Manager.cpp index 8b6a8d91629..edff944b13b 100644 --- a/tests/POA/On_Demand_Loading/Servant_Manager.cpp +++ b/tests/POA/On_Demand_Loading/Servant_Manager.cpp @@ -1,30 +1,25 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/examples/POA/On_Demand_Loading -// -// = FILENAME -// Servant_Manager.cpp -// -// = DESCRIPTION -// Implementation of the helper class for the ServantActivator_i -// and the ServantLocator_i. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file Servant_Manager.cpp + * + * $Id$ + * + * Implementation of the helper class for the ServantActivator_i + * and the ServantLocator_i. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + #include "Servant_Manager.h" #include "tao/debug.h" -ACE_RCSID(On_Demand_Activation, Servant_Manager, "$Id$") - - // Initialization. - ServantManager_i::ServantManager_i (CORBA::ORB_ptr orb) - : orb_ (CORBA::ORB::_duplicate (orb)) +// Initialization. +ServantManager_i::ServantManager_i (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) { } diff --git a/tests/POA/On_Demand_Loading/Servant_Manager.h b/tests/POA/On_Demand_Loading/Servant_Manager.h index 2ada43d81ab..3177f0b3964 100644 --- a/tests/POA/On_Demand_Loading/Servant_Manager.h +++ b/tests/POA/On_Demand_Loading/Servant_Manager.h @@ -1,21 +1,18 @@ // This may look like C, but it's really -*- C++ -*- -// $Id$ - -//================================================================================ -// -// = LIBRARY -// TAO/examples/POA/On_Demand_Loading -// -// = FILENAME -// Servant_Manager.h -// -// = DESCRIPTION -// Helper class for <ServantActivator_i> and <ServantLoactor_i>. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -//================================================================================== + +//============================================================================= +/** + * @file Servant_Manager.h + * + * $Id$ + * + * Helper class for <ServantActivator_i> and <ServantLoactor_i>. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + #ifndef SERVANT_MANAGER_H #define SERVANT_MANAGER_H @@ -34,68 +31,75 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +/** + * @class ServantManager_i + * + * @brief This class is the helper class for the ServantActivator_i and + * ServantLocator_i classes. + * + * The methods provided by this class are used by the ServantActivator_i + * and ServantLocator_i classes. This class contains the common methods + * needed by them. + */ class ServantManager_i { - // = TITLE - // This class is the helper class for the ServantActivator_i and - // ServantLocator_i classes. - // - // = DESCRIPTION - // The methods provided by this class are used by the ServantActivator_i - // and ServantLocator_i classes. This class contains the common methods - // needed by them. - // public: + /// This typedef is used to typecast the void* obtained when finding + /// a symbol in the DLL. typedef PortableServer::Servant (*SERVANT_FACTORY) (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - // This typedef is used to typecast the void* obtained when finding - // a symbol in the DLL. + /// Initialization. ServantManager_i (CORBA::ORB_ptr orb); - // Initialization. + /// Destruction. ~ServantManager_i (void); - // Destruction. + /** + * Returns an ObjectId when given an DLL name and the factory method + * to be invoked in the DLL. The application developer can initialise the + * ServantActivator object by providing the dllname and the factory function. + */ PortableServer::ObjectId_var create_dll_object_id (const char *libname, const char *factory_function); - // Returns an ObjectId when given an DLL name and the factory method - // to be invoked in the DLL. The application developer can initialise the - // ServantActivator object by providing the dllname and the factory function. // @@ *done*Kirthika, please explain what this function is USED for, i.e., // who calls it and why? + /** + * Obtains a servant on activation by linking and loading the + * appropriate DLL and creating the servant object. The <str> + * argument is the ObjectId that contains the servant DLL name and + * the factory function name. The <long> argument is an + * servant-specific argument needed to create the servant for this + * particular use-case. + */ PortableServer::Servant obtain_servant (const ACE_TCHAR *str, PortableServer::POA_ptr poa); - // Obtains a servant on activation by linking and loading the - // appropriate DLL and creating the servant object. The <str> - // argument is the ObjectId that contains the servant DLL name and - // the factory function name. The <long> argument is an - // servant-specific argument needed to create the servant for this - // particular use-case. + /// The servant is destroyed and the DLL that was dynamically linked + /// is closed. void destroy_servant (PortableServer::Servant servant, const PortableServer::ObjectId &oid); - // The servant is destroyed and the DLL that was dynamically linked - // is closed. private: + /** + * Parse the string to obtain the DLL name and the factory function + * symbol that we will used to dynamically obtain the servant + * pointer. + */ void parse_string (const ACE_TCHAR *s); - // Parse the string to obtain the DLL name and the factory function - // symbol that we will used to dynamically obtain the servant - // pointer. + /// A reference to the ORB. CORBA::ORB_var orb_; - // A reference to the ORB. + /// The name of the dll containing the servant. ACE_TString dllname_; - // The name of the dll containing the servant. + /// The symbol which on getting invoked will give us the servant + /// pointer. ACE_TString create_symbol_; - // The symbol which on getting invoked will give us the servant - // pointer. typedef ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId, ACE_DLL *, @@ -104,10 +108,12 @@ public: ACE_Null_Mutex> SERVANT_MAP; + /** + * This is the hash map object. The hash map is used to provide + * an quick access to the dll object associated with every servant + * using the unique ObjectId as key. + */ SERVANT_MAP servant_map_; - // This is the hash map object. The hash map is used to provide - // an quick access to the dll object associated with every servant - // using the unique ObjectId as key. }; #endif /* SERVANT_MANAGER_H */ diff --git a/tests/POA/On_Demand_Loading/Server_Manager.cpp b/tests/POA/On_Demand_Loading/Server_Manager.cpp index 2fb19d905d3..d7ae92ac6a8 100644 --- a/tests/POA/On_Demand_Loading/Server_Manager.cpp +++ b/tests/POA/On_Demand_Loading/Server_Manager.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(On_Demand_Loading, Server_Manager, "$Id$") - Server_i::Server_i(void) : ior_output_file_ (0), policies_ (4), diff --git a/tests/POA/On_Demand_Loading/Server_Manager.h b/tests/POA/On_Demand_Loading/Server_Manager.h index 21e8a733bf2..2aa642ce766 100644 --- a/tests/POA/On_Demand_Loading/Server_Manager.h +++ b/tests/POA/On_Demand_Loading/Server_Manager.h @@ -1,102 +1,103 @@ // This may look like C, but it's really -*- C++ -*- -// $Id$ //============================================================================= -// -// = LIBRARY -// TAO/examples/POA/On_Demand_Loading -// -// = FILENAME -// Server_Manager.h -// -// = DESCRIPTION -// Helper class for the server application. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// +/** + * @file Server_Manager.h + * + * $Id$ + * + * Helper class for the server application. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ //============================================================================= + #ifndef SERVER_MANAGER_H #define SERVER_MANAGER_H #include "Servant_Activator.h" #include "Servant_Locator.h" +/** + * @class Server_i + * + * @brief This class provides the server application with helper methods + * + * The various methods required by the server application for + * utilizing the ServantActivator and ServantLocator interfaces of + * the Servant Manager are implemented by this class. These + * include initialisation procedures of the ServantActivator and + * ServantLocator, and creation of POAs with emphasis on the + * servant retention policy. + */ class Server_i { - // = TITLE - // This class provides the server application with helper methods - // - // = DESCRIPTION - // The various methods required by the server application for - // utilizing the ServantActivator and ServantLocator interfaces of - // the Servant Manager are implemented by this class. These - // include initialisation procedures of the ServantActivator and - // ServantLocator, and creation of POAs with emphasis on the - // servant retention policy. public: // = Initialization and termination methods. + /// Initialisation. Server_i (void); - // Initialisation. + /// Destruction. ~Server_i (void); - // Destruction. + /// Initialisation of the ORB and poa. int init (int argc, ACE_TCHAR **argv); - // Initialisation of the ORB and poa. + /** + * This method creates a POA from the root_poa with emphasis being + * on the servant_retention_policy which decides the use of the + * ServantActivator or ServantLocator interfaces. The + * servent_retention_policy value is 1 for the RETAIN policy and 0 + * for the NONRETAIN policy. + */ PortableServer::POA_ptr create_poa (const char* name, int servant_retention_policy); - // This method creates a POA from the root_poa with emphasis being - // on the servant_retention_policy which decides the use of the - // ServantActivator or ServantLocator interfaces. The - // servent_retention_policy value is 1 for the RETAIN policy and 0 - // for the NONRETAIN policy. + /// A ServantActivator object is created and initialised. int create_activator (PortableServer::POA_var first_poa); - // A ServantActivator object is created and initialised. + /// A ServantActivator object is created and initialised. int create_locator (PortableServer::POA_var second_poa); - // A ServantActivator object is created and initialised. + /// The server is executed. int run (void); - // The server is executed. private: + /// Parses the input arguments. int parse_args (int argc, ACE_TCHAR **argv); - // Parses the input arguments. + /// The IORs are written to a file for future use. int write_iors_to_file (const char *first_ior, const char *second_ior); - // The IORs are written to a file for future use. + /// Default ior file. ACE_TCHAR *ior_output_file_; - // Default ior file. + /// The orb pointer. CORBA::ORB_var orb_; - // The orb pointer. + /// The poa policicies. CORBA::PolicyList policies_; - // The poa policicies. + /// The root_poa which is used for cretaing different child poas. PortableServer::POA_var root_poa_; - // The root_poa which is used for cretaing different child poas. + /// The poa_manager object. PortableServer::POAManager_var poa_manager_; - // The poa_manager object. + /// The object pointer used by the ServantActivator. CORBA::Object_var first_test_; - // The object pointer used by the ServantActivator. + /// The object pointer used by the Servant Locator. CORBA::Object_var second_test_; - // The object pointer used by the Servant Locator. + /// The servant activator object. ServantActivator_i *servant_activator_impl_; - // The servant activator object. + /// The servant locator object. ServantLocator_i *servant_locator_impl_; - // The servant locator object. }; #endif /* SERVER_MANAGER_H */ diff --git a/tests/POA/On_Demand_Loading/run_test.pl b/tests/POA/On_Demand_Loading/run_test.pl index 34ad00d6daa..4127f780899 100755 --- a/tests/POA/On_Demand_Loading/run_test.pl +++ b/tests/POA/On_Demand_Loading/run_test.pl @@ -13,7 +13,7 @@ $iorbase0 = "ior"; my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; -$server->AddLibPath ('../Generic_Servant/.'); +$server->AddLibPath ('../Generic_Servant/.'); $client->AddLibPath ('../Generic_Servant/.'); $oneway = ""; diff --git a/tests/POA/On_Demand_Loading/server.cpp b/tests/POA/On_Demand_Loading/server.cpp index ce70a5014c0..809eccba1fa 100644 --- a/tests/POA/On_Demand_Loading/server.cpp +++ b/tests/POA/On_Demand_Loading/server.cpp @@ -1,21 +1,19 @@ -// $Id$ -//============================================================================ -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// Server application to test the Servant Activator and Servant Locator. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * Server application to test the Servant Activator and Servant Locator. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ //============================================================================= -#include "Server_Manager.h" -ACE_RCSID(On_Demand_Loading, server, "$Id$") +#include "Server_Manager.h" int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) diff --git a/tests/POA/POAManagerFactory/Makefile.am b/tests/POA/POAManagerFactory/Makefile.am deleted file mode 100644 index c2a1826f118..00000000000 --- a/tests/POA/POAManagerFactory/Makefile.am +++ /dev/null @@ -1,49 +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.POA_POAManagerFactory.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = POAManagerFactory - -POAManagerFactory_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -POAManagerFactory_SOURCES = \ - POAManagerFactory.cpp - -POAManagerFactory_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/POA/POAManagerFactory/POAManagerFactory.cpp b/tests/POA/POAManagerFactory/POAManagerFactory.cpp index 2a94043c709..478e8a81e27 100644 --- a/tests/POA/POAManagerFactory/POAManagerFactory.cpp +++ b/tests/POA/POAManagerFactory/POAManagerFactory.cpp @@ -1,22 +1,19 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/POA/POAManagerFactory -// -// = FILENAME -// POAManagerFactory.cpp -// -// = DESCRIPTION -// This program tests Root_POA::the_POAManagerFactory and -// the POAManagerFactory interfaces such as create_POAManager(), -// list () and find (). -// -// = AUTHOR -// Yan Dai -// -//========================================================================= + +//============================================================================= +/** + * @file POAManagerFactory.cpp + * + * $Id$ + * + * This program tests Root_POA::the_POAManagerFactory and + * the POAManagerFactory interfaces such as create_POAManager(), + * list () and find (). + * + * + * @author Yan Dai + */ +//============================================================================= + #include "tao/ORB.h" #include "tao/AnyTypeCode/Any.h" @@ -63,7 +60,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/tests/POA/POA_BiDir/Makefile.am b/tests/POA/POA_BiDir/Makefile.am deleted file mode 100644 index 34a34b595b1..00000000000 --- a/tests/POA/POA_BiDir/Makefile.am +++ /dev/null @@ -1,49 +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.POA_BiDir.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = POA_BiDir - -POA_BiDir_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -POA_BiDir_SOURCES = \ - POA_BiDir.cpp - -POA_BiDir_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_BiDirGIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/POA/POA_BiDir/POA_BiDir.cpp b/tests/POA/POA_BiDir/POA_BiDir.cpp index 2aaedd37c73..2fd60b0a6e6 100644 --- a/tests/POA/POA_BiDir/POA_BiDir.cpp +++ b/tests/POA/POA_BiDir/POA_BiDir.cpp @@ -1,20 +1,19 @@ -// $Id$ - -// ========================================================================== -// = LIBRARY -// TAO/example/POA/POA_BiDir -// -// = FILENAME -// POA_BiDir.cpp -// -// = DESCRIPTION -// This program is an extension of $TAO_ROOT/example/POA/NewPOA. In -// the many POA's created this example adds a BiDirGIOP policy to -// one of the POA's. -// -// = AUTHOR -// Balachandran Natarajan <bala@cs.wustl.edu> -// ======================================================================== + +//============================================================================= +/** + * @file POA_BiDir.cpp + * + * $Id$ + * + * This program is an extension of $TAO_ROOT/example/POA/NewPOA. In + * the many POA's created this example adds a BiDirGIOP policy to + * one of the POA's. + * + * + * @author Balachandran Natarajan <bala@cs.wustl.edu> + */ +//============================================================================= + #include "tao/PortableServer/PortableServer.h" @@ -25,11 +24,6 @@ #include "ace/SString.h" - -ACE_RCSID (POA_BiDir, - POA_BiDir, - "$Id$") - void print_poa (PortableServer::POA_ptr poa) { diff --git a/tests/POA/POA_Destruction/Makefile.am b/tests/POA/POA_Destruction/Makefile.am deleted file mode 100644 index 28496ecd3eb..00000000000 --- a/tests/POA/POA_Destruction/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.POA_POA_Destruction.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) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = POA_Destruction - -POA_Destruction_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -POA_Destruction_SOURCES = \ - POA_Destruction.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -POA_Destruction_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/POA/POA_Destruction/POA_Destruction.cpp b/tests/POA/POA_Destruction/POA_Destruction.cpp index 46efabbc309..38df305afdb 100644 --- a/tests/POA/POA_Destruction/POA_Destruction.cpp +++ b/tests/POA/POA_Destruction/POA_Destruction.cpp @@ -1,21 +1,18 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/POA/POA_Destruction -// -// = FILENAME -// POA_Destruction.cpp -// -// = DESCRIPTION -// This program tests the destruction of a POA while there is an -// upcall in progress. -// -// = AUTHOR -// Irfan Pyarali -// -//========================================================================= + +//============================================================================= +/** + * @file POA_Destruction.cpp + * + * $Id$ + * + * This program tests the destruction of a POA while there is an + * upcall in progress. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "testS.h" diff --git a/tests/POA/Persistent_ID/Makefile.am b/tests/POA/Persistent_ID/Makefile.am deleted file mode 100644 index b787848cb63..00000000000 --- a/tests/POA/Persistent_ID/Makefile.am +++ /dev/null @@ -1,104 +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.POA_IDL_Persistent_ID.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.POA_Server_Persistent_ID.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_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.POA_Client_Persistent_ID.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 \ - testC.cpp - -client_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/POA/Persistent_ID/client.cpp b/tests/POA/Persistent_ID/client.cpp index fe95b34dfdf..ce3e525ea0c 100644 --- a/tests/POA/Persistent_ID/client.cpp +++ b/tests/POA/Persistent_ID/client.cpp @@ -1,25 +1,22 @@ -// $Id$ - -// ================================================================ -// -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// This is a client implementation. -// -// = AUTHOR -// Irfan Pyarali -// -// ================================================================ + +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * This is a client implementation. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "ace/Get_Opt.h" #include "testC.h" #include "ace/OS_NS_string.h" -ACE_RCSID(Generic_Servant, client, "$Id$") - static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior"); static int shutdown_server = 0; diff --git a/tests/POA/Persistent_ID/server.cpp b/tests/POA/Persistent_ID/server.cpp index 158da5b4b00..4ec3caaa473 100644 --- a/tests/POA/Persistent_ID/server.cpp +++ b/tests/POA/Persistent_ID/server.cpp @@ -1,20 +1,17 @@ -// $Id$ - -// ================================================================ -// -// = LIBRARY -// TAO/tests/POA/Persistent_ID -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// In this example of using Persistent IDs. -// -// = AUTHOR -// Irfan Pyarali -// -// ================================================================ + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * In this example of using Persistent IDs. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "ace/Get_Opt.h" #include "ace/SString.h" @@ -22,8 +19,6 @@ #include "ace/OS_NS_stdio.h" #include "tao/PortableServer/PortableServer.h" -ACE_RCSID(Explicit_Activation, server, "$Id$") - class test_i : public virtual POA_test { @@ -34,8 +29,8 @@ public: void method (void); //FUZZ: disable check_for_lack_ACE_OS + ///FUZZ: enable check_for_lack_ACE_OS void shutdown (void); - //FUZZ: enable check_for_lack_ACE_OS test_ptr create_POA (void); diff --git a/tests/POA/Policies/Makefile.am b/tests/POA/Policies/Makefile.am deleted file mode 100644 index 716682b4339..00000000000 --- a/tests/POA/Policies/Makefile.am +++ /dev/null @@ -1,49 +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.POA_Policies.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Policies - -Policies_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Policies_SOURCES = \ - Policies.cpp - -Policies_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/POA/Policies/Policies.cpp b/tests/POA/Policies/Policies.cpp index d1a228faa12..38751511447 100644 --- a/tests/POA/Policies/Policies.cpp +++ b/tests/POA/Policies/Policies.cpp @@ -1,22 +1,19 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/POA/Policies -// -// = FILENAME -// Policies.cpp -// -// = DESCRIPTION -// This program tests the construction of POA policies, both -// through the generic ORB::create_policy interface and the -// PortableServer specific interfaces. -// -// = AUTHOR -// Irfan Pyarali -// -//========================================================================= + +//============================================================================= +/** + * @file Policies.cpp + * + * $Id$ + * + * This program tests the construction of POA policies, both + * through the generic ORB::create_policy interface and the + * PortableServer specific interfaces. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "tao/ORB.h" #include "tao/AnyTypeCode/Any.h" diff --git a/tests/POA/Reference_Counted_Servant/Makefile.am b/tests/POA/Reference_Counted_Servant/Makefile.am deleted file mode 100644 index 236995f7094..00000000000 --- a/tests/POA/Reference_Counted_Servant/Makefile.am +++ /dev/null @@ -1,52 +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.Reference_Counted_Servant_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../Generic_Servant \ - -I../Generic_Servant - -server_SOURCES = \ - server.cpp - -server_LDFLAGS = \ - -L../Generic_Servant - -server_LDADD = \ - $(top_builddir)/tests/POA/Generic_Servant/libGeneric_Servant.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/tests/POA/Reference_Counted_Servant/run_test.pl b/tests/POA/Reference_Counted_Servant/run_test.pl index c5500e776e9..06f56876a2e 100755 --- a/tests/POA/Reference_Counted_Servant/run_test.pl +++ b/tests/POA/Reference_Counted_Servant/run_test.pl @@ -13,7 +13,7 @@ $iorbase = "poa.ior"; my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; -$server->AddLibPath ('../Generic_Servant/.'); +$server->AddLibPath ('../Generic_Servant/.'); $client->AddLibPath ('../Generic_Servant/.'); $oneway = ""; diff --git a/tests/POA/Reference_Counted_Servant/server.cpp b/tests/POA/Reference_Counted_Servant/server.cpp index 6203b6bd76d..73ec73fae99 100644 --- a/tests/POA/Reference_Counted_Servant/server.cpp +++ b/tests/POA/Reference_Counted_Servant/server.cpp @@ -1,33 +1,28 @@ -// $Id$ - -// ================================================================ -// -// = LIBRARY -// TAO/tests/POA/Reference_Counted_Servant -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// This example shows how to use reference counted servants to -// automatically manage dynamic memory for servants. -// Stubs/Skeletons and client code is available in -// ../Generic_Servant. -// -// = AUTHOR -// Irfan Pyarali -// -// ================================================================ + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * This example shows how to use reference counted servants to + * automatically manage dynamic memory for servants. + * Stubs/Skeletons and client code is available in + * ../Generic_Servant. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "ace/Get_Opt.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" -ACE_RCSID(Reference_Counted_Servant, server, "$Id$") - - // This is to remove "inherits via dominance" warnings from MSVC. - // MSVC is being a little too paranoid. +// This is to remove "inherits via dominance" warnings from MSVC. +// MSVC is being a little too paranoid. #if defined (_MSC_VER) # pragma warning (disable : 4250) #endif /* _MSC_VER */ @@ -36,9 +31,9 @@ class reference_counted_test_i : public virtual test_i { public: + /// Constructor - takes a POA and a value parameter reference_counted_test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - // Constructor - takes a POA and a value parameter }; reference_counted_test_i::reference_counted_test_i (CORBA::ORB_ptr orb, diff --git a/tests/POA/Reference_Counting/Makefile.am b/tests/POA/Reference_Counting/Makefile.am deleted file mode 100644 index 3197dbec12c..00000000000 --- a/tests/POA/Reference_Counting/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.Reference_Counting_Server.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - HelloC.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.cpp \ - HelloS.h \ - HelloS.inl - -CLEANFILES = \ - Hello-stamp \ - HelloC.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.cpp \ - HelloS.h \ - HelloS.inl - -HelloC.cpp HelloC.h HelloC.inl HelloS.cpp HelloS.h HelloS.inl: Hello-stamp - -Hello-stamp: $(srcdir)/Hello.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Hello.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - HelloC.cpp \ - HelloS.cpp \ - test.cpp \ - HelloC.h \ - HelloC.inl \ - HelloS.h \ - HelloS.inl - -server_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/POA/Reference_Counting/test.cpp b/tests/POA/Reference_Counting/test.cpp index acb7b8941ac..8631f9e284a 100644 --- a/tests/POA/Reference_Counting/test.cpp +++ b/tests/POA/Reference_Counting/test.cpp @@ -2,10 +2,6 @@ #include "HelloS.h" -ACE_RCSID (Reference_Counting, - test, - "$Id$") - class Hello_impl : virtual public POA_Hello { diff --git a/tests/POA/RootPOA/Makefile.am b/tests/POA/RootPOA/Makefile.am deleted file mode 100644 index e9988e682df..00000000000 --- a/tests/POA/RootPOA/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.RootPOA_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = RootPOA - -RootPOA_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -RootPOA_SOURCES = \ - RootPOA.cpp - -RootPOA_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/POA/RootPOA/RootPOA.cpp b/tests/POA/RootPOA/RootPOA.cpp index d3ffbe7e2c1..be973d012ad 100644 --- a/tests/POA/RootPOA/RootPOA.cpp +++ b/tests/POA/RootPOA/RootPOA.cpp @@ -1,22 +1,18 @@ -// $Id$ -//======================================================================== -// -// = LIBRARY -// TAO/tests/POA/RootPOA -// -// -// = FILENAME -// RootPOA.cpp -// -// = DESCRIPTION -// This program gets the name of the Root POA and prints it out on -// the standard output. -// -// = AUTHOR -// Irfan Pyarali -// -//========================================================================= +//============================================================================= +/** + * @file RootPOA.cpp + * + * $Id$ + * + * This program gets the name of the Root POA and prints it out on + * the standard output. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "tao/PortableServer/PortableServer.h" @@ -24,10 +20,6 @@ #include "ace/Log_Msg.h" -ACE_RCSID (RootPOA, - RootPOA, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/tests/POA/Single_Threaded_POA/Makefile.am b/tests/POA/Single_Threaded_POA/Makefile.am deleted file mode 100644 index 32bf8155472..00000000000 --- a/tests/POA/Single_Threaded_POA/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.POA_Single_Threaded_POA.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) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = Single_Threaded_POA - -Single_Threaded_POA_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Single_Threaded_POA_SOURCES = \ - Single_Threaded_POA.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Single_Threaded_POA_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/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp index 80da9e7ac83..504889b7319 100644 --- a/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp +++ b/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp @@ -1,23 +1,20 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/POA/Single_Threaded_POA -// -// = FILENAME -// Single_Threaded_POA.cpp -// -// = DESCRIPTION -// This program tests to make sure that two threads cannot call -// servants in a single threaded POA simultaneously. At the same -// time, it makes sure that a servant can call itself or other -// servants in the same POA while in an upcall. -// -// = AUTHOR -// Irfan Pyarali -// -//========================================================================= + +//============================================================================= +/** + * @file Single_Threaded_POA.cpp + * + * $Id$ + * + * This program tests to make sure that two threads cannot call + * servants in a single threaded POA simultaneously. At the same + * time, it makes sure that a servant can call itself or other + * servants in the same POA while in an upcall. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "testS.h" #include "ace/Task.h" diff --git a/tests/POA/TIE/Makefile.am b/tests/POA/TIE/Makefile.am deleted file mode 100644 index 13a1a7ef9c9..00000000000 --- a/tests/POA/TIE/Makefile.am +++ /dev/null @@ -1,112 +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.POA_TIE_IDL.am - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.cpp \ - testS.h \ - testS.inl \ - testS_T.cpp \ - testS_T.h - -testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -GT $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.POA_TIE_Client.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 = \ - client.cpp \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_EXCEPTIONS - -## Makefile.POA_TIE_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_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/POA/TIE/client.cpp b/tests/POA/TIE/client.cpp index 6c9f8fd6a06..c572f480427 100644 --- a/tests/POA/TIE/client.cpp +++ b/tests/POA/TIE/client.cpp @@ -1,18 +1,17 @@ -// $Id$ - -//=========================================================================== -// -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// This is a simple client implementation. -// -// = AUTHOR -// Irfan Pyarali -// -//=========================================================================== + +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * This is a simple client implementation. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "ace/streams.h" #include "ace/Get_Opt.h" @@ -20,8 +19,6 @@ #include "testC.h" #include "ace/OS_NS_string.h" -ACE_RCSID(TIE, client, "$Id$") - static ACE_TCHAR *IOR[7] = { 0, 0, 0, 0, 0, 0, 0 }; static int iterations = 1; diff --git a/tests/POA/TIE/server.cpp b/tests/POA/TIE/server.cpp index f603f839bd6..95491670ee4 100644 --- a/tests/POA/TIE/server.cpp +++ b/tests/POA/TIE/server.cpp @@ -1,18 +1,17 @@ -// $Id$ - -// ========================================================================= -// = LIBRARY -// TAO/tests/POA/TIE -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// In this example, -// -// = AUTHOR -// Irfan Pyarali -// ========================================================================= + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * In this example, + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "ace/streams.h" #include "ace/SString.h" @@ -20,8 +19,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/Get_Opt.h" -ACE_RCSID(TIE, server, "$Id$") - const ACE_TCHAR *ior_1 = ACE_TEXT ("ior_1"); const ACE_TCHAR *ior_2 = ACE_TEXT ("ior_2"); const ACE_TCHAR *ior_3 = ACE_TEXT ("ior_3"); diff --git a/tests/POA/TIE/test_i.cpp b/tests/POA/TIE/test_i.cpp index 8fc84b1abae..016e58330fa 100644 --- a/tests/POA/TIE/test_i.cpp +++ b/tests/POA/TIE/test_i.cpp @@ -1,22 +1,19 @@ -// $Id$ -//=========================================================================== -// -// -// = FILENAME -// test_i.cpp -// -// = DESCRIPTION -// This is a simple test servant implementation -// -// = AUTHOR -// Irfan Pyarali -// -//=========================================================================== +//============================================================================= +/** + * @file test_i.cpp + * + * $Id$ + * + * This is a simple test servant implementation + * + * + * @author Irfan Pyarali + */ +//============================================================================= -#include "test_i.h" -ACE_RCSID(TIE, test_i, "$Id$") +#include "test_i.h" // Constructor Tie_i::Tie_i (CORBA::Long value) diff --git a/tests/POA/TIE/test_i.h b/tests/POA/TIE/test_i.h index 3450c129f8a..534b44c29f5 100644 --- a/tests/POA/TIE/test_i.h +++ b/tests/POA/TIE/test_i.h @@ -1,20 +1,19 @@ // -*- C++ -*- -// -// $Id$ //============================================================================= -// -// = FILENAME -// test_i.h -// -// = DESCRIPTION -// Defines implementation classes for the interfaces -// -// = AUTHOR -// Irfan Pyarali -// +/** + * @file test_i.h + * + * $Id$ + * + * Defines implementation classes for the interfaces + * + * + * @author Irfan Pyarali + */ //============================================================================= + #include "testS.h" class Tie_i @@ -51,8 +50,8 @@ protected: CORBA::Long value_; + /// Default poa associated with this servant PortableServer::POA_var poa_; - // Default poa associated with this servant }; class Outer_i @@ -76,8 +75,8 @@ public: CORBA::Long value_; + /// Default poa associated with this servant PortableServer::POA_var poa_; - // Default poa associated with this servant }; class Inner_i @@ -101,8 +100,8 @@ public: CORBA::Long value_; + /// Default poa associated with this servant PortableServer::POA_var poa_; - // Default poa associated with this servant }; }; }; diff --git a/tests/POA/wait_for_completion/Makefile.am b/tests/POA/wait_for_completion/Makefile.am deleted file mode 100644 index 8f2ea1832a1..00000000000 --- a/tests/POA/wait_for_completion/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.POA_Wait_For_Completion.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) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = wait_for_completion - -wait_for_completion_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -wait_for_completion_SOURCES = \ - testC.cpp \ - testS.cpp \ - wait_for_completion.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -wait_for_completion_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/POA/wait_for_completion/wait_for_completion.cpp b/tests/POA/wait_for_completion/wait_for_completion.cpp index c91fbc51fc9..c4a9224f105 100644 --- a/tests/POA/wait_for_completion/wait_for_completion.cpp +++ b/tests/POA/wait_for_completion/wait_for_completion.cpp @@ -1,20 +1,17 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/POA/wait_for_completion -// -// = FILENAME -// wait_for_completion.cpp -// -// = DESCRIPTION -// This program tests the wait_for_completion feature of a POA. -// -// = AUTHOR -// Irfan Pyarali -// -//========================================================================= + +//============================================================================= +/** + * @file wait_for_completion.cpp + * + * $Id$ + * + * This program tests the wait_for_completion feature of a POA. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "testS.h" diff --git a/tests/Parallel_Connect_Strategy/Makefile.am b/tests/Parallel_Connect_Strategy/Makefile.am deleted file mode 100644 index abf2f9d3ed2..00000000000 --- a/tests/Parallel_Connect_Strategy/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.Parallel_Connect_Strategy_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.Parallel_Connect_Strategy_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 \ - Test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Parallel_Connect_Strategy_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 \ - TestS.cpp \ - Test_i.cpp \ - server.cpp \ - Test_i.h - -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/tests/Parallel_Connect_Strategy/blocked.conf b/tests/Parallel_Connect_Strategy/blocked.conf index 2feddbe2302..47c294272c1 100644 --- a/tests/Parallel_Connect_Strategy/blocked.conf +++ b/tests/Parallel_Connect_Strategy/blocked.conf @@ -1,3 +1,5 @@ +# $Id$ + # test for using the blocked connect strategy static Client_Strategy_Factory "-ORBConnectStrategy Blocked" diff --git a/tests/Parallel_Connect_Strategy/client.cpp b/tests/Parallel_Connect_Strategy/client.cpp index 4d9e11a5c5a..3e96f955529 100644 --- a/tests/Parallel_Connect_Strategy/client.cpp +++ b/tests/Parallel_Connect_Strategy/client.cpp @@ -5,8 +5,6 @@ #include "ace/High_Res_Timer.h" #include "tao/ORB_Core.h" -ACE_RCSID(Hello, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int kill_server = 0; bool sanity_timeout = false; @@ -49,7 +47,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/tests/Parallel_Connect_Strategy/reactive.conf b/tests/Parallel_Connect_Strategy/reactive.conf index 0317f1c624c..4b6370b4daf 100644 --- a/tests/Parallel_Connect_Strategy/reactive.conf +++ b/tests/Parallel_Connect_Strategy/reactive.conf @@ -1,3 +1,5 @@ +# $Id$ + # test for using the blocked connect strategy static Client_Strategy_Factory "-ORBConnectStrategy Reactive" diff --git a/tests/Parallel_Connect_Strategy/server.cpp b/tests/Parallel_Connect_Strategy/server.cpp index 048f78895a2..ee7c20180f5 100644 --- a/tests/Parallel_Connect_Strategy/server.cpp +++ b/tests/Parallel_Connect_Strategy/server.cpp @@ -5,10 +5,6 @@ #include "ace/OS_NS_stdio.h" #include "tao/IORTable/IORTable.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -33,7 +29,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/tests/Param_Test/Makefile.am b/tests/Param_Test/Makefile.am deleted file mode 100644 index 428806e483c..00000000000 --- a/tests/Param_Test/Makefile.am +++ /dev/null @@ -1,264 +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.Param_Test_Idl.am - -BUILT_SOURCES = \ - param_testC.cpp \ - param_testC.h \ - param_testC.inl \ - param_testS.cpp \ - param_testS.h \ - param_testS.inl - -CLEANFILES = \ - param_test-stamp \ - param_testC.cpp \ - param_testC.h \ - param_testC.inl \ - param_testS.cpp \ - param_testS.h \ - param_testS.inl - -param_testC.cpp param_testC.h param_testC.inl param_testS.cpp param_testS.h param_testS.inl: param_test-stamp - -param_test-stamp: $(srcdir)/param_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/param_test.idl - @touch $@ - -noinst_HEADERS = \ - param_test.idl - -## Makefile.Param_Test_Anyop.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += anyop - -anyop_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -anyop_SOURCES = \ - anyop.cpp \ - param_testC.cpp \ - any.h \ - bd_array_seq.h \ - bd_long_seq.h \ - bd_short_seq.h \ - bd_str_seq.h \ - bd_string.h \ - bd_struct_seq.h \ - bd_wstr_seq.h \ - bd_wstring.h \ - big_union.h \ - client.h \ - complex_any.h \ - driver.h \ - except.h \ - fixed_array.h \ - fixed_struct.h \ - helper.h \ - multdim_array.h \ - nested_struct.h \ - objref.h \ - objref_struct.h \ - options.h \ - param_test_i.h \ - recursive_struct.h \ - recursive_union.h \ - results.h \ - short.h \ - small_union.h \ - tests.h \ - typecode.h \ - ub_any_seq.h \ - ub_array_seq.h \ - ub_long_seq.h \ - ub_objref_seq.h \ - ub_short_seq.h \ - ub_str_seq.h \ - ub_string.h \ - ub_struct_seq.h \ - ub_wstr_seq.h \ - ub_wstring.h \ - ulonglong.h \ - var_array.h \ - var_struct.h - -anyop_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Codeset.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.Param_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 = \ - any.cpp \ - bd_array_seq.cpp \ - bd_long_seq.cpp \ - bd_short_seq.cpp \ - bd_str_seq.cpp \ - bd_string.cpp \ - bd_struct_seq.cpp \ - bd_wstr_seq.cpp \ - bd_wstring.cpp \ - big_union.cpp \ - client.cpp \ - complex_any.cpp \ - driver.cpp \ - except.cpp \ - fixed_array.cpp \ - fixed_struct.cpp \ - helper.cpp \ - multdim_array.cpp \ - nested_struct.cpp \ - objref.cpp \ - objref_struct.cpp \ - options.cpp \ - param_testC.cpp \ - recursive_struct.cpp \ - recursive_union.cpp \ - results.cpp \ - short.cpp \ - small_union.cpp \ - typecode.cpp \ - ub_any_seq.cpp \ - ub_array_seq.cpp \ - ub_long_seq.cpp \ - ub_objref_seq.cpp \ - ub_short_seq.cpp \ - ub_str_seq.cpp \ - ub_string.cpp \ - ub_struct_seq.cpp \ - ub_wstr_seq.cpp \ - ub_wstring.cpp \ - ulonglong.cpp \ - var_array.cpp \ - var_struct.cpp \ - any.h \ - bd_array_seq.h \ - bd_long_seq.h \ - bd_short_seq.h \ - bd_str_seq.h \ - bd_string.h \ - bd_struct_seq.h \ - bd_wstr_seq.h \ - bd_wstring.h \ - big_union.h \ - client.h \ - complex_any.h \ - driver.h \ - except.h \ - fixed_array.h \ - fixed_struct.h \ - helper.h \ - multdim_array.h \ - nested_struct.h \ - objref.h \ - objref_struct.h \ - options.h \ - recursive_struct.h \ - recursive_union.h \ - results.h \ - short.h \ - small_union.h \ - typecode.h \ - ub_any_seq.h \ - ub_array_seq.h \ - ub_long_seq.h \ - ub_objref_seq.h \ - ub_short_seq.h \ - ub_str_seq.h \ - ub_string.h \ - ub_struct_seq.h \ - ub_wstr_seq.h \ - ub_wstring.h \ - ulonglong.h \ - var_array.h \ - var_struct.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_Codeset.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.Param_Test_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - param_testC.cpp \ - param_testS.cpp \ - param_test_i.cpp \ - server.cpp \ - param_test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Codeset.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/tests/Param_Test/any.cpp b/tests/Param_Test/any.cpp index 8153e6b1df6..31468c2ceee 100644 --- a/tests/Param_Test/any.cpp +++ b/tests/Param_Test/any.cpp @@ -1,29 +1,22 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// any.cpp -// -// = DESCRIPTION -// tests Anys -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file any.cpp + * + * $Id$ + * + * tests Anys + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "any.h" #include "tao/debug.h" -ACE_RCSID (Param_Test, - any, - "$Id$") - // ************************************************************************ // Test_Any // ************************************************************************ diff --git a/tests/Param_Test/any.h b/tests/Param_Test/any.h index 45358671fc4..5f999f95bfc 100644 --- a/tests/Param_Test/any.h +++ b/tests/Param_Test/any.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// any.h -// -// = DESCRIPTION -// Tests Anys -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file any.h + * + * $Id$ + * + * Tests Anys + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_ANY_H #define PARAM_TEST_ANY_H @@ -27,11 +24,11 @@ class Test_Any { public: + /// ctor Test_Any (void); - // ctor + /// dtor ~Test_Any (void); - // dtor enum { @@ -47,51 +44,51 @@ public: ANY_LAST_TEST_ITEM }; + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// Coffee object used to test Any with object. Coffee_var cobj_; - // Coffee object used to test Any with object. + /// test counter. static size_t counter; - // test counter. + /// in parameter CORBA::Any in_; - // in parameter + /// inout parameter CORBA::Any inout_; - // inout parameter + /// out parameter CORBA::Any_var out_; - // out parameter + /// return value CORBA::Any_var ret_; - // return value }; #endif /* PARAM_TEST_ANY_H */ diff --git a/tests/Param_Test/anyop.cpp b/tests/Param_Test/anyop.cpp index 04e391c457d..006d174f24e 100644 --- a/tests/Param_Test/anyop.cpp +++ b/tests/Param_Test/anyop.cpp @@ -1,19 +1,14 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// anyop.cpp -// -// = DESCRIPTION -// -// = AUTHORS -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file anyop.cpp + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #include "param_testC.h" @@ -27,10 +22,6 @@ #include "ace/Get_Opt.h" -ACE_RCSID (Param_Test, - anyop, - "$Id$") - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { @@ -190,8 +181,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::Double o; - if (!(any >>= o) - || i != o) + if (!(any >>= o) || !ACE::is_equal (i, o)) { ACE_DEBUG ((LM_DEBUG, "Failure for CORBA::Double (%f,%f)\n", @@ -272,9 +262,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) || o->c != i->c || o->s != i->s || o->o != i->o - || o->f != i->f + || !ACE::is_equal (o->f, i->f) || o->b != i->b - || o->d != i->d) + || !ACE::is_equal (o->d, i->d)) { ACE_DEBUG ((LM_DEBUG, "Failure for Fixed_Struct " @@ -288,9 +278,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) || o->c != i->c || o->s != i->s || o->o != i->o - || o->f != i->f + || !ACE::is_equal (o->f, i->f) || o->b != i->b - || o->d != i->d) + || !ACE::is_equal (o->d, i->d)) { ACE_DEBUG ((LM_DEBUG, "Failure for Fixed_Struct " diff --git a/tests/Param_Test/bd_array_seq.cpp b/tests/Param_Test/bd_array_seq.cpp index 18f09817c80..b394fcad4a2 100644 --- a/tests/Param_Test/bd_array_seq.cpp +++ b/tests/Param_Test/bd_array_seq.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// bd_array_seq.cpp -// -// = DESCRIPTION -// tests bounded array sequences -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file bd_array_seq.cpp + * + * $Id$ + * + * tests bounded array sequences + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> + */ +//============================================================================= + #include "helper.h" #include "bd_array_seq.h" -ACE_RCSID (Param_Test, - bd_array_seq, - "$Id$") - const CORBA::ULong MAX_ARRAYSEQ_LEN = 1; // ************************************************************************ diff --git a/tests/Param_Test/bd_array_seq.h b/tests/Param_Test/bd_array_seq.h index 5c0c29c5e0f..1cbb42e1129 100644 --- a/tests/Param_Test/bd_array_seq.h +++ b/tests/Param_Test/bd_array_seq.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// bd_array_seq.h -// -// = DESCRIPTION -// Tests bounded array sequence -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file bd_array_seq.h + * + * $Id$ + * + * Tests bounded array sequence + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> + */ +//============================================================================= + #ifndef PARAM_TEST_BOUNDED_ARRAY_SEQUENCE_H #define PARAM_TEST_BOUNDED_ARRAY_SEQUENCE_H @@ -28,60 +25,60 @@ class Test_Bounded_Array_Sequence { public: + /// ctor Test_Bounded_Array_Sequence (void); - // ctor + /// dtor ~Test_Bounded_Array_Sequence (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. protected: + /// compare CORBA::Boolean compare (const Param_Test::Bounded_ArraySeq &s1, const Param_Test::Bounded_ArraySeq &s2); - // compare + /// print individual sequence void print_sequence (const Param_Test::Bounded_ArraySeq &s); - // print individual sequence private: + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::Bounded_ArraySeq in_; - // in parameter // these need memory management + /// inout parameter Param_Test::Bounded_ArraySeq_var inout_; - // inout parameter + /// out parameter Param_Test::Bounded_ArraySeq_var out_; - // out parameter + /// return value Param_Test::Bounded_ArraySeq_var ret_; - // return value }; #endif /* PARAM_TEST_BOUNDED_ARRAY_SEQUENCE_H */ diff --git a/tests/Param_Test/bd_long_seq.cpp b/tests/Param_Test/bd_long_seq.cpp index c4ab4067cae..5b047e073b0 100644 --- a/tests/Param_Test/bd_long_seq.cpp +++ b/tests/Param_Test/bd_long_seq.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// bd_long_seq.cpp -// -// = DESCRIPTION -// tests bounded long sequences -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file bd_long_seq.cpp + * + * $Id$ + * + * tests bounded long sequences + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "bd_long_seq.h" -ACE_RCSID (Param_Test, - bd_long_seq, - "$Id$") - // ************************************************************************ // Test_Bounded_Long_Sequence // ************************************************************************ diff --git a/tests/Param_Test/bd_long_seq.h b/tests/Param_Test/bd_long_seq.h index caaae1236e3..aa2978f6f4d 100644 --- a/tests/Param_Test/bd_long_seq.h +++ b/tests/Param_Test/bd_long_seq.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// bd_long_seq.h -// -// = DESCRIPTION -// Tests bounded long sequences -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file bd_long_seq.h + * + * $Id$ + * + * Tests bounded long sequences + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_BOUNDED_LONG_SEQUENCE_H #define PARAM_TEST_BOUNDED_LONG_SEQUENCE_H @@ -28,51 +25,51 @@ class Test_Bounded_Long_Sequence { public: + /// ctor Test_Bounded_Long_Sequence (void); - // ctor + /// dtor ~Test_Bounded_Long_Sequence (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::Bounded_Long_Seq_var in_; - // in parameter + /// inout parameter Param_Test::Bounded_Long_Seq_var inout_; - // inout parameter + /// out parameter Param_Test::Bounded_Long_Seq_var out_; - // out parameter + /// return value Param_Test::Bounded_Long_Seq_var ret_; - // return value }; #endif /* PARAM_TEST_BOUNDED_LONG_SEQUENCE_H */ diff --git a/tests/Param_Test/bd_short_seq.cpp b/tests/Param_Test/bd_short_seq.cpp index 60363f53431..08899259432 100644 --- a/tests/Param_Test/bd_short_seq.cpp +++ b/tests/Param_Test/bd_short_seq.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// bd_short_seq.cpp -// -// = DESCRIPTION -// tests bounded short sequences -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file bd_short_seq.cpp + * + * $Id$ + * + * tests bounded short sequences + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "bd_short_seq.h" -ACE_RCSID (Param_Test, - bd_short_seq, - "$Id$") - // ************************************************************************ // Test_Bounded_Short_Sequence // ************************************************************************ diff --git a/tests/Param_Test/bd_short_seq.h b/tests/Param_Test/bd_short_seq.h index 9794e21de32..1ca0b16bc65 100644 --- a/tests/Param_Test/bd_short_seq.h +++ b/tests/Param_Test/bd_short_seq.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// bd_short_seq.h -// -// = DESCRIPTION -// Tests bounded short sequence -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file bd_short_seq.h + * + * $Id$ + * + * Tests bounded short sequence + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_BOUNDED_SHORT_SEQUENCE_H #define PARAM_TEST_BOUNDED_SHORT_SEQUENCE_H @@ -28,51 +25,51 @@ class Test_Bounded_Short_Sequence { public: + /// ctor Test_Bounded_Short_Sequence (void); - // ctor + /// dtor ~Test_Bounded_Short_Sequence (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::Bounded_Short_Seq_var in_; - // in parameter + /// inout parameter Param_Test::Bounded_Short_Seq_var inout_; - // inout parameter + /// out parameter Param_Test::Bounded_Short_Seq_var out_; - // out parameter + /// return value Param_Test::Bounded_Short_Seq_var ret_; - // return value }; #endif /* PARAM_TEST_BOUNDED_SHORT_SEQUENCE_H */ diff --git a/tests/Param_Test/bd_str_seq.cpp b/tests/Param_Test/bd_str_seq.cpp index 968ebaaa976..b6bab477d37 100644 --- a/tests/Param_Test/bd_str_seq.cpp +++ b/tests/Param_Test/bd_str_seq.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// bd_str_seq.cpp -// -// = DESCRIPTION -// tests bounded string sequences -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file bd_str_seq.cpp + * + * $Id$ + * + * tests bounded string sequences + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "bd_str_seq.h" -ACE_RCSID (Param_Test, - bd_str_seq, - "$Id$") - // ************************************************************************ // Test_Bounded_String_Sequence // ************************************************************************ diff --git a/tests/Param_Test/bd_str_seq.h b/tests/Param_Test/bd_str_seq.h index 2abe9954fb6..9e9994fefab 100644 --- a/tests/Param_Test/bd_str_seq.h +++ b/tests/Param_Test/bd_str_seq.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// bd_str_seq.h -// -// = DESCRIPTION -// Tests bounded sequences of strings -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file bd_str_seq.h + * + * $Id$ + * + * Tests bounded sequences of strings + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_BOUNDED_STRING_SEQUENCE_H #define PARAM_TEST_BOUNDED_STRING_SEQUENCE_H @@ -28,51 +25,51 @@ class Test_Bounded_String_Sequence { public: + /// ctor Test_Bounded_String_Sequence (void); - // ctor + /// dtor ~Test_Bounded_String_Sequence (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::Bounded_StrSeq_var in_; - // in parameter + /// inout parameter Param_Test::Bounded_StrSeq_var inout_; - // inout parameter + /// out parameter Param_Test::Bounded_StrSeq_var out_; - // out parameter + /// return value Param_Test::Bounded_StrSeq_var ret_; - // return value }; #endif /* PARAM_TEST_BOUNDED_STRING_SEQUENCE_H */ diff --git a/tests/Param_Test/bd_string.cpp b/tests/Param_Test/bd_string.cpp index 36a6aba5130..ace0459c1a9 100644 --- a/tests/Param_Test/bd_string.cpp +++ b/tests/Param_Test/bd_string.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// bd_string.cpp -// -// = DESCRIPTION -// tests bounded strings -// -// = AUTHORS -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file bd_string.cpp + * + * $Id$ + * + * tests bounded strings + * + * + * @author Carlos O'Ryan + */ +//============================================================================= + #include "helper.h" #include "bd_string.h" -ACE_RCSID (Param_Test, - bd_string, - "$Id$") - // ************************************************************************ // Test_Bounded_String // ************************************************************************ diff --git a/tests/Param_Test/bd_string.h b/tests/Param_Test/bd_string.h index 8019f18aecb..156dea3e0a2 100644 --- a/tests/Param_Test/bd_string.h +++ b/tests/Param_Test/bd_string.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// bd_string.h -// -// = DESCRIPTION -// Tests bounded string -// -// = AUTHORS -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file bd_string.h + * + * $Id$ + * + * Tests bounded string + * + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef PARAM_TEST_BOUNDED_STRING_H #define PARAM_TEST_BOUNDED_STRING_H @@ -27,51 +24,51 @@ class Test_Bounded_String { public: + /// ctor Test_Bounded_String (void); - // ctor + /// dtor ~Test_Bounded_String (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter char *in_; - // in parameter + /// inout parameter char *inout_; - // inout parameter + /// out parameter char *out_; - // out parameter + /// return value char *ret_; - // return value }; #endif /* PARAM_TEST_BOUNDED_STRING_H */ diff --git a/tests/Param_Test/bd_struct_seq.cpp b/tests/Param_Test/bd_struct_seq.cpp index 2c1318e45d0..2e7aa0cc9d5 100644 --- a/tests/Param_Test/bd_struct_seq.cpp +++ b/tests/Param_Test/bd_struct_seq.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// bd_struct_seq.cpp -// -// = DESCRIPTION -// tests bounded struct sequences -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file bd_struct_seq.cpp + * + * $Id$ + * + * tests bounded struct sequences + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "bd_struct_seq.h" -ACE_RCSID (Param_Test, - bd_struct_seq, - "$Id$") - const CORBA::ULong MAX_STRUCTSEQ_LEN = 1; // ************************************************************************ @@ -190,9 +183,9 @@ Test_Bounded_Struct_Sequence::compare (const Param_Test::Bounded_StructSeq &s1, || vs1.c != vs2.c || vs1.s != vs2.s || vs1.o != vs2.o - || vs1.f != vs2.f + || !ACE::is_equal (vs1.f, vs2.f) || vs1.b != vs2.b - || vs1.d != vs2.d ) + || !ACE::is_equal (vs1.d, vs2.d)) return 0; } diff --git a/tests/Param_Test/bd_struct_seq.h b/tests/Param_Test/bd_struct_seq.h index dc640977d8f..576fde32ae7 100644 --- a/tests/Param_Test/bd_struct_seq.h +++ b/tests/Param_Test/bd_struct_seq.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// bd_struct_seq.h -// -// = DESCRIPTION -// Tests bounded struct sequence -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file bd_struct_seq.h + * + * $Id$ + * + * Tests bounded struct sequence + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_BOUNDED_STRUCT_SEQUENCE_H #define PARAM_TEST_BOUNDED_STRUCT_SEQUENCE_H @@ -28,60 +25,60 @@ class Test_Bounded_Struct_Sequence { public: + /// ctor Test_Bounded_Struct_Sequence (void); - // ctor + /// dtor ~Test_Bounded_Struct_Sequence (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. protected: + /// compare CORBA::Boolean compare (const Param_Test::Bounded_StructSeq &s1, const Param_Test::Bounded_StructSeq &s2); - // compare + /// print individual sequence void print_sequence (const Param_Test::Bounded_StructSeq &s); - // print individual sequence private: + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::Bounded_StructSeq in_; - // in parameter // these need memory management + /// inout parameter Param_Test::Bounded_StructSeq_var inout_; - // inout parameter + /// out parameter Param_Test::Bounded_StructSeq_var out_; - // out parameter + /// return value Param_Test::Bounded_StructSeq_var ret_; - // return value }; #endif /* PARAM_TEST_BOUNDED_STRUCT_SEQUENCE_H */ diff --git a/tests/Param_Test/bd_wstr_seq.cpp b/tests/Param_Test/bd_wstr_seq.cpp index 12b9a01ff52..49542b3a0a1 100644 --- a/tests/Param_Test/bd_wstr_seq.cpp +++ b/tests/Param_Test/bd_wstr_seq.cpp @@ -1,29 +1,22 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// bd_wstr_seq.cpp -// -// = DESCRIPTION -// tests bounded wide string sequences -// -// = AUTHORS -// Jeff Parsons -// -// ============================================================================ + +//============================================================================= +/** + * @file bd_wstr_seq.cpp + * + * $Id$ + * + * tests bounded wide string sequences + * + * + * @author Jeff Parsons + */ +//============================================================================= + #include "helper.h" #include "bd_wstr_seq.h" #include "ace/OS_NS_wchar.h" -ACE_RCSID (Param_Test, - bd_wstr_seq, - "$Id$") - // ************************************************************************ // Test_Bounded_WString_Sequence // ************************************************************************ diff --git a/tests/Param_Test/bd_wstr_seq.h b/tests/Param_Test/bd_wstr_seq.h index 0f0c6b9f7e6..1cec415071e 100644 --- a/tests/Param_Test/bd_wstr_seq.h +++ b/tests/Param_Test/bd_wstr_seq.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// bd_wstr_seq.h -// -// = DESCRIPTION -// Tests bounded sequences of wide strings -// -// = AUTHORS -// Jeff Parsons -// -// ============================================================================ + +//============================================================================= +/** + * @file bd_wstr_seq.h + * + * $Id$ + * + * Tests bounded sequences of wide strings + * + * + * @author Jeff Parsons + */ +//============================================================================= + #ifndef PARAM_TEST_BOUNDED_WSTRING_SEQUENCE_H #define PARAM_TEST_BOUNDED_WSTRING_SEQUENCE_H @@ -28,51 +25,51 @@ class Test_Bounded_WString_Sequence { public: + /// ctor Test_Bounded_WString_Sequence (void); - // ctor + /// dtor ~Test_Bounded_WString_Sequence (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::Bounded_WStrSeq_var in_; - // in parameter + /// inout parameter Param_Test::Bounded_WStrSeq_var inout_; - // inout parameter + /// out parameter Param_Test::Bounded_WStrSeq_var out_; - // out parameter + /// return value Param_Test::Bounded_WStrSeq_var ret_; - // return value }; #endif /* PARAM_TEST_BOUNDED_WSTRING_SEQUENCE_H */ diff --git a/tests/Param_Test/bd_wstring.cpp b/tests/Param_Test/bd_wstring.cpp index 4ce873cce40..3f99a121445 100644 --- a/tests/Param_Test/bd_wstring.cpp +++ b/tests/Param_Test/bd_wstring.cpp @@ -1,29 +1,22 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// bd_wstring.cpp -// -// = DESCRIPTION -// tests bounded wide strings -// -// = AUTHORS -// Jeff Parsons -// -// ============================================================================ + +//============================================================================= +/** + * @file bd_wstring.cpp + * + * $Id$ + * + * tests bounded wide strings + * + * + * @author Jeff Parsons + */ +//============================================================================= + #include "helper.h" #include "bd_wstring.h" #include "ace/OS_NS_wchar.h" -ACE_RCSID (Param_Test, - bd_wstring, - "$Id$") - // ************************************************************************ // Test_Bounded_WString // ************************************************************************ diff --git a/tests/Param_Test/bd_wstring.h b/tests/Param_Test/bd_wstring.h index 4e7719f272a..ae10a6f65d6 100644 --- a/tests/Param_Test/bd_wstring.h +++ b/tests/Param_Test/bd_wstring.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// bd_wstring.h -// -// = DESCRIPTION -// Tests bounded wide string -// -// = AUTHORS -// Jeff Parsons -// -// ============================================================================ + +//============================================================================= +/** + * @file bd_wstring.h + * + * $Id$ + * + * Tests bounded wide string + * + * + * @author Jeff Parsons + */ +//============================================================================= + #ifndef PARAM_TEST_BOUNDED_WSTRING_H #define PARAM_TEST_BOUNDED_WSTRING_H @@ -27,51 +24,51 @@ class Test_Bounded_WString { public: + /// ctor Test_Bounded_WString (void); - // ctor + /// dtor ~Test_Bounded_WString (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter CORBA::WChar *in_; - // in parameter + /// inout parameter CORBA::WChar *inout_; - // inout parameter + /// out parameter CORBA::WChar *out_; - // out parameter + /// return value CORBA::WChar *ret_; - // return value }; #endif /* PARAM_TEST_BOUNDED_WSTRING_H */ diff --git a/tests/Param_Test/big_union.cpp b/tests/Param_Test/big_union.cpp index 5b7cc1121ff..929acbbe2bd 100644 --- a/tests/Param_Test/big_union.cpp +++ b/tests/Param_Test/big_union.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// big_union.cpp -// -// = DESCRIPTION -// tests Big_Unions -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file big_union.cpp + * + * $Id$ + * + * tests Big_Unions + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "big_union.h" -ACE_RCSID (Param_Test, - big_union, - "$Id$") - // ************************************************************************ // Test_Big_Union // ************************************************************************ @@ -130,7 +123,7 @@ Test_Big_Union::reset_parameters (void) case 3: { Param_Test::short_array x; - + for (int i = 0; i < 32; ++i) { x[i] = gen->gen_short (); @@ -320,7 +313,7 @@ Test_Big_Union::check_validity (void) CORBA::Long inout = this->inout_.the_long (); CORBA::Long out = this->out_->the_long (); CORBA::Long ret = this->ret_->the_long (); - + if (in != out || in != inout || in != ret) { return 0; @@ -337,7 +330,7 @@ Test_Big_Union::check_validity (void) this->out_->another_array (); Param_Test::short_array_slice* ret_array = this->ret_->another_array (); - + for (int i = 0; i != 32; ++i) { if (in_array[i] != inout_array[i] @@ -355,7 +348,7 @@ Test_Big_Union::check_validity (void) const char* inout = this->inout_.the_string (); const char* out = this->out_->the_string (); const char* ret = this->ret_->the_string (); - + if (ACE_OS::strcmp (in,out) || ACE_OS::strcmp (in,inout) || ACE_OS::strcmp (in,ret)) @@ -402,7 +395,7 @@ Test_Big_Union::check_validity (void) CORBA::Short inout_short; CORBA::Short out_short; CORBA::Short ret_short; - + if (!(in >>= in_short) || !(inout >>= inout_short) || !(out >>= out_short) @@ -425,7 +418,7 @@ Test_Big_Union::check_validity (void) CORBA::Octet inout = this->inout_.the_octet (); CORBA::Octet out = this->out_->the_octet (); CORBA::Octet ret = this->ret_->the_octet (); - + if (in != out || in != inout || in != ret) { return 0; @@ -438,7 +431,7 @@ Test_Big_Union::check_validity (void) CORBA::Char inout = this->inout_.the_char (); CORBA::Char out = this->out_->the_char (); CORBA::Char ret = this->ret_->the_char (); - + if (in != out || in != inout || in != ret) { return 0; @@ -451,7 +444,7 @@ Test_Big_Union::check_validity (void) CORBA::Boolean inout = this->inout_.the_boolean (); CORBA::Boolean out = this->out_->the_boolean (); CORBA::Boolean ret = this->ret_->the_boolean (); - + if (in != out || in != inout || in != ret) { return 0; @@ -493,7 +486,7 @@ Test_Big_Union::check_validity (void) } CORBA::ULong len = in.seq.length (); - + for (CORBA::ULong i = 0; i != len; ++i) { if (ACE_OS::strcmp (in.seq[i], @@ -523,23 +516,23 @@ Test_Big_Union::check_validity (void) && in.c == inout.c && in.s == inout.s && in.o == inout.o - && in.f == inout.f + && ACE::is_equal (in.f, inout.f) && in.b == inout.b - && in.d == inout.d) + && ACE::is_equal (in.d, inout.d)) || !(in.l == out.l && in.c == out.c && in.s == out.s && in.o == out.o - && in.f == out.f + && ACE::is_equal (in.f, out.f) && in.b == out.b - && in.d == out.d) + && ACE::is_equal (in.d, out.d)) || !(in.l == ret.l && in.c == ret.c && in.s == ret.s && in.o == ret.o - && in.f == ret.f + && ACE::is_equal (in.f, ret.f) && in.b == ret.b - && in.d == ret.d)) + && ACE::is_equal (in.d, ret.d))) { return 0; } diff --git a/tests/Param_Test/big_union.h b/tests/Param_Test/big_union.h index fc304337279..429705fb282 100644 --- a/tests/Param_Test/big_union.h +++ b/tests/Param_Test/big_union.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// big_union.h -// -// = DESCRIPTION -// Tests Anys -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file big_union.h + * + * $Id$ + * + * Tests Anys + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_BIG_UNION_H #define PARAM_TEST_BIG_UNION_H @@ -27,61 +24,61 @@ class Test_Big_Union { public: + /// ctor Test_Big_Union (void); - // ctor + /// dtor ~Test_Big_Union (void); - // dtor enum { BIG_UNION_N_BRANCHES = 12 }; + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// Coffee object used to test Big_Union with object. Coffee_var cobj_; - // Coffee object used to test Big_Union with object. + /// test counter. static size_t counter; - // test counter. + /// in parameter Param_Test::Big_Union in_; - // in parameter + /// inout parameter Param_Test::Big_Union inout_; - // inout parameter + /// out parameter Param_Test::Big_Union_var out_; - // out parameter + /// return value Param_Test::Big_Union_var ret_; - // return value }; #endif /* PARAM_TEST_BIG_UNION_H */ diff --git a/tests/Param_Test/client.cpp b/tests/Param_Test/client.cpp index 87324854779..1745c426aa7 100644 --- a/tests/Param_Test/client.cpp +++ b/tests/Param_Test/client.cpp @@ -1,21 +1,18 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// This file contains the implementation of the client-side of the -// Param_Test application. -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * This file contains the implementation of the client-side of the + * Param_Test application. + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef CLIENT_CPP #define CLIENT_CPP @@ -24,11 +21,7 @@ #include "results.h" #include "client.h" -ACE_RCSID (Param_Test, - client, - "$Id$") - -// Constructor.p +// Constructor. template <class T> Param_Test_Client<T>::Param_Test_Client (CORBA::ORB_ptr orb, Param_Test_ptr objref, diff --git a/tests/Param_Test/client.h b/tests/Param_Test/client.h index 8e9e0ec58d7..05bcee0d1e0 100644 --- a/tests/Param_Test/client.h +++ b/tests/Param_Test/client.h @@ -1,21 +1,17 @@ -// -*- c++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// client.h -// -// = DESCRIPTION -// Header file for the Param_Test client application. -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file client.h + * + * $Id$ + * + * Header file for the Param_Test client application. + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_CLIENT_H #define PARAM_TEST_CLIENT_H @@ -25,18 +21,20 @@ #include "param_testC.h" #include "results.h" +/** + * @class Param_Test_Client + * + * @brief Param_Test_Client + * + * This class declares an interface to run the example client for + * Param_Test CORBA server. All the complexity for initializing + * the client is hidden in the class. Just the run () interface + * is needed. The template class does the specific work of making + * the request of the desired data type + */ template <class T> class Param_Test_Client { - // = TITLE - // Param_Test_Client - // - // = DESCRIPTION - // This class declares an interface to run the example client for - // Param_Test CORBA server. All the complexity for initializing - // the client is hidden in the class. Just the run () interface - // is needed. The template class does the specific work of making - // the request of the desired data type public: typedef T TEST_OBJECT; @@ -47,24 +45,24 @@ public: ~Param_Test_Client (void); + /// run the SII test int run_sii_test (void); - // run the SII test + /// run the DII test int run_dii_test (void); - // run the DII test private: + /// underlying ORB CORBA::ORB_ptr orb_; - // underlying ORB + /// param test object reference Param_Test_ptr param_test_; - // param test object reference + /// object doing the actual work TEST_OBJECT *test_object_; - // object doing the actual work + /// results Results results_; - // results }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/tests/Param_Test/complex_any.cpp b/tests/Param_Test/complex_any.cpp index efabe515361..4520c5e5e31 100644 --- a/tests/Param_Test/complex_any.cpp +++ b/tests/Param_Test/complex_any.cpp @@ -1,29 +1,24 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// complex_any.cpp -// -// = DESCRIPTION -// tests complex Anys -// -// = AUTHORS -// Aniruddha Gokhale, Jeff Parsons, Frank Buschmann -// -// ============================================================================ +//============================================================================= +/** + * @file complex_any.cpp + * + * $Id$ + * + * tests complex Anys + * + * + * @author Aniruddha Gokhale + * @author Jeff Parsons + * @author Frank Buschmann + */ +//============================================================================= + #include "helper.h" #include "complex_any.h" #include "tao/debug.h" -ACE_RCSID (Param_Test, - complex_any, - "$Id$") - const int LEVEL_2_LENGTH = 5; const int LEVEL_3_LENGTH = 3; diff --git a/tests/Param_Test/complex_any.h b/tests/Param_Test/complex_any.h index 7eb861c2223..2d8ed898466 100644 --- a/tests/Param_Test/complex_any.h +++ b/tests/Param_Test/complex_any.h @@ -1,20 +1,19 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// complex_any.h -// -// = DESCRIPTION -// Tests complex Anys -// -// = AUTHORS -// Aniruddha Gokhale, Jeff Parsons, Frank Buschmann -// -// ============================================================================ + +//============================================================================= +/** + * @file complex_any.h + * + * $Id$ + * + * Tests complex Anys + * + * + * @author Aniruddha Gokhale + * @author Jeff Parsons + * @author Frank Buschmann + */ +//============================================================================= + #ifndef PARAM_TEST_COMPLEX_ANY_H #define PARAM_TEST_COMPLEX_ANY_H @@ -27,58 +26,58 @@ class Test_Complex_Any { public: + /// ctor Test_Complex_Any (void); - // ctor + /// dtor ~Test_Complex_Any (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// test counter. static size_t counter; - // test counter. + /// in parameter CORBA::Any in_; - // in parameter + /// inout parameter CORBA::Any inout_; - // inout parameter + /// out parameter CORBA::Any_var out_; - // out parameter + /// return value CORBA::Any_var ret_; - // return value + /// Compares the sequence extracted from in_ to one of the others. CORBA::Boolean comp_engine (const CORBA::AnySeq *in_seq, const CORBA::AnySeq *comp_seq); - // Compares the sequence extracted from in_ to one of the others. }; #endif /* PARAM_TEST_COMPLEX_ANY_H */ diff --git a/tests/Param_Test/driver.cpp b/tests/Param_Test/driver.cpp index 228e6f61316..1217a092551 100644 --- a/tests/Param_Test/driver.cpp +++ b/tests/Param_Test/driver.cpp @@ -1,20 +1,17 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// driver.cpp -// -// = DESCRIPTION -// Driver program -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ +//============================================================================= +/** + * @file driver.cpp + * + * $Id$ + * + * Driver program + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "client.h" #include "driver.h" @@ -22,10 +19,6 @@ #include "tests.h" #include "ace/Get_Opt.h" -ACE_RCSID (Param_Test, - driver, - "$Id$") - // This function runs the test (main program) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) diff --git a/tests/Param_Test/driver.h b/tests/Param_Test/driver.h index 73f054c6765..df6ab513691 100644 --- a/tests/Param_Test/driver.h +++ b/tests/Param_Test/driver.h @@ -1,21 +1,17 @@ -// -*- c++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// driver.h -// -// = DESCRIPTION -// Header file for the driver program. The driver is a singleton. -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file driver.h + * + * $Id$ + * + * Header file for the driver program. The driver is a singleton. + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef DRIVER_H #define DRIVER_H @@ -23,30 +19,32 @@ #include "options.h" #include "param_testC.h" +/** + * @class Driver + * + * @brief Driver + * + * Driver program for the client + */ class Driver { - // = TITLE - // Driver - // - // = DESCRIPTION - // Driver program for the client public: // = Constructor and destructor. Driver (void); ~Driver (void); + /// Initialize the driver object int init (int argc, ACE_TCHAR **argv); - // Initialize the driver object + /// Execute client example code. int run (void); - // Execute client example code. private: + /// underlying ORB (we do not own it) CORBA::ORB_var orb_; - // underlying ORB (we do not own it) + /// object reference (we do not own it) Param_Test_var objref_; - // object reference (we do not own it) }; #endif /* !defined */ diff --git a/tests/Param_Test/except.cpp b/tests/Param_Test/except.cpp index 6e349cd191e..decc97863f3 100644 --- a/tests/Param_Test/except.cpp +++ b/tests/Param_Test/except.cpp @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// except.cpp -// -// = DESCRIPTION -// tests exception -// -// = AUTHORS -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file except.cpp + * + * $Id$ + * + * tests exception + * + * + * @author Carlos O'Ryan + */ +//============================================================================= + #include "helper.h" #include "except.h" @@ -22,10 +19,6 @@ #include "tao/DynamicInterface/Unknown_User_Exception.h" -ACE_RCSID (Param_Test, - except, - "$Id$") - // ************************************************************************ // Test_Exception // ************************************************************************ diff --git a/tests/Param_Test/except.h b/tests/Param_Test/except.h index b8bf8c3e9e4..acfd4b1d1cc 100644 --- a/tests/Param_Test/except.h +++ b/tests/Param_Test/except.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// except.h -// -// = DESCRIPTION -// Tests system and user exceptions -// -// = AUTHORS -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file except.h + * + * $Id$ + * + * Tests system and user exceptions + * + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef PARAM_TEST_EXCEPTION_H #define PARAM_TEST_EXCEPTION_H @@ -24,54 +21,54 @@ class Test_Exception { public: + /// ctor Test_Exception (void); - // ctor + /// dtor ~Test_Exception (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter CORBA::ULong in_; - // in parameter + /// inout parameter CORBA::ULong inout_; - // inout parameter + /// out parameter CORBA::ULong out_; - // out parameter + /// return value CORBA::ULong ret_; - // return value + /// Current iterations. CORBA::ULong iterations_; - // Current iterations. }; #endif /* PARAM_TEST_EXCEPTION_H */ diff --git a/tests/Param_Test/fixed_array.cpp b/tests/Param_Test/fixed_array.cpp index c976b0b690b..ebec9775c7a 100644 --- a/tests/Param_Test/fixed_array.cpp +++ b/tests/Param_Test/fixed_array.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// fixed_array.cpp -// -// = DESCRIPTION -// tests fixed size arrays -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file fixed_array.cpp + * + * $Id$ + * + * tests fixed size arrays + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "fixed_array.h" -ACE_RCSID (Param_Test, - fixed_array, - "$Id$") - // ************************************************************************ // Test_Fixed_Array // ************************************************************************ diff --git a/tests/Param_Test/fixed_array.h b/tests/Param_Test/fixed_array.h index 4e69fe59287..ff4626a020b 100644 --- a/tests/Param_Test/fixed_array.h +++ b/tests/Param_Test/fixed_array.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// fixed_array.h -// -// = DESCRIPTION -// Tests fixed size array -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file fixed_array.h + * + * $Id$ + * + * Tests fixed size array + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_FIXED_ARRAY_H #define PARAM_TEST_FIXED_ARRAY_H @@ -27,58 +24,58 @@ class Test_Fixed_Array { public: + /// ctor Test_Fixed_Array (void); - // ctor + /// dtor ~Test_Fixed_Array (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// compare arrays CORBA::Boolean compare (const Param_Test::Fixed_Array_slice *a1, const Param_Test::Fixed_Array_slice *a2); - // compare arrays + /// print an array void print (const Param_Test::Fixed_Array_slice *a); - // print an array + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::Fixed_Array in_; - // in parameter + /// inout parameter Param_Test::Fixed_Array inout_; - // inout parameter + /// out parameter Param_Test::Fixed_Array out_; - // out parameter + /// return value Param_Test::Fixed_Array_var ret_; - // return value }; #endif /* PARAM_TEST_FIXED_ARRAY_H */ diff --git a/tests/Param_Test/fixed_struct.cpp b/tests/Param_Test/fixed_struct.cpp index fee2186e8a8..b2c4e67281b 100644 --- a/tests/Param_Test/fixed_struct.cpp +++ b/tests/Param_Test/fixed_struct.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// fixed_struct.cpp -// -// = DESCRIPTION -// tests fixed sized structs -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file fixed_struct.cpp + * + * $Id$ + * + * tests fixed sized structs + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "fixed_struct.h" -ACE_RCSID (Param_Test, - fixed_struct, - "$Id$") - // ************************************************************************ // Test_Fixed_Struct // ************************************************************************ @@ -128,23 +121,23 @@ Test_Fixed_Struct::check_validity (void) this->in_.c == this->inout_.c && this->in_.s == this->inout_.s && this->in_.o == this->inout_.o && - this->in_.f == this->inout_.f && + ACE::is_equal (this->in_.f, this->inout_.f) && this->in_.b == this->inout_.b && - this->in_.d == this->inout_.d && + ACE::is_equal (this->in_.d, this->inout_.d) && this->in_.l == this->out_.l && this->in_.c == this->out_.c && this->in_.s == this->out_.s && this->in_.o == this->out_.o && - this->in_.f == this->out_.f && + ACE::is_equal (this->in_.f, this->out_.f) && this->in_.b == this->out_.b && - this->in_.d == this->out_.d && + ACE::is_equal (this->in_.d, this->out_.d) && this->in_.l == this->ret_.l && this->in_.c == this->ret_.c && this->in_.s == this->ret_.s && this->in_.o == this->ret_.o && - this->in_.f == this->ret_.f && + ACE::is_equal (this->in_.f, this->ret_.f) && this->in_.b == this->ret_.b && - this->in_.d == this->ret_.d) + ACE::is_equal (this->in_.d, this->ret_.d)) return 1; else return 0; diff --git a/tests/Param_Test/fixed_struct.h b/tests/Param_Test/fixed_struct.h index 07836d0cd7e..fc4bf1115bb 100644 --- a/tests/Param_Test/fixed_struct.h +++ b/tests/Param_Test/fixed_struct.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// fixed_struct.h -// -// = DESCRIPTION -// Tests fixed size structs -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file fixed_struct.h + * + * $Id$ + * + * Tests fixed size structs + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_FIXED_STRUCT_H #define PARAM_TEST_FIXED_STRUCT_H @@ -27,51 +24,51 @@ class Test_Fixed_Struct { public: + /// ctor Test_Fixed_Struct (void); - // ctor + /// dtor ~Test_Fixed_Struct (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::Fixed_Struct in_; - // in parameter + /// inout parameter Param_Test::Fixed_Struct inout_; - // inout parameter + /// out parameter Param_Test::Fixed_Struct out_; - // out parameter + /// return value Param_Test::Fixed_Struct ret_; - // return value }; #endif /* PARAM_TEST_FIXED_STRUCT_H */ diff --git a/tests/Param_Test/helper.cpp b/tests/Param_Test/helper.cpp index 260879b6ce4..2aee194703e 100644 --- a/tests/Param_Test/helper.cpp +++ b/tests/Param_Test/helper.cpp @@ -1,31 +1,24 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// helper.cpp -// -// = DESCRIPTION -// Defines a helper class that can generate values for the parameters used -// for the Param_Test example -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file helper.cpp + * + * $Id$ + * + * Defines a helper class that can generate values for the parameters used + * for the Param_Test example + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "ace/OS_NS_ctype.h" const CORBA::ULong TEST_BUFSIZE = 128; -ACE_RCSID (Param_Test, - helper, - "$Id$") - Generator::Generator (void) { } diff --git a/tests/Param_Test/helper.h b/tests/Param_Test/helper.h index b8c9c8b14d0..41deb1a44e8 100644 --- a/tests/Param_Test/helper.h +++ b/tests/Param_Test/helper.h @@ -1,21 +1,18 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// helper.h -// -// = DESCRIPTION -// Defines a helper class that can generate values for the parameters used -// for the Param_Test example -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file helper.h + * + * $Id$ + * + * Defines a helper class that can generate values for the parameters used + * for the Param_Test example + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef HELPER_H #define HELPER_H @@ -27,11 +24,11 @@ class Generator { public: + /// constructor Generator (void); - // constructor + /// destructor ~Generator (void); - // destructor CORBA::Short gen_short (void); CORBA::Long gen_long (void); diff --git a/tests/Param_Test/multdim_array.cpp b/tests/Param_Test/multdim_array.cpp index 5dea1681124..3df45926ae9 100644 --- a/tests/Param_Test/multdim_array.cpp +++ b/tests/Param_Test/multdim_array.cpp @@ -1,27 +1,22 @@ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// multidim_array.cpp -// -// = DESCRIPTION -// tests multidimensional fixed size arrays -// -// = AUTHORS -// Bala -// -// ============================================================================ + +//============================================================================= +/** + * @file multdim_array.cpp + * + * $Id$ + * + * tests multidimensional fixed size arrays + * + * + * @author Bala + */ +//============================================================================= + #include "helper.h" #include "multdim_array.h" -ACE_RCSID (Param_Test, - multdim_array, - "$Id$") - // ************************************************************************ // Test_Multdim_Array // ************************************************************************ diff --git a/tests/Param_Test/multdim_array.h b/tests/Param_Test/multdim_array.h index 0539bf803e7..b275ef78145 100644 --- a/tests/Param_Test/multdim_array.h +++ b/tests/Param_Test/multdim_array.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// multdim_array.h -// -// = DESCRIPTION -// Tests multi dimensional array -// -// = AUTHORS -// Bala -// -// ============================================================================ + +//============================================================================= +/** + * @file multdim_array.h + * + * $Id$ + * + * Tests multi dimensional array + * + * + * @author Bala + */ +//============================================================================= + #ifndef PARAM_TEST_MULTDIM_ARRAY_H #define PARAM_TEST_MULTDIM_ARRAY_H @@ -27,58 +24,58 @@ class Test_Multdim_Array { public: + /// ctor Test_Multdim_Array (void); - // ctor + /// dtor ~Test_Multdim_Array (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// compare arrays CORBA::Boolean compare (const Param_Test::Multdim_Array_slice *a1, const Param_Test::Multdim_Array_slice *a2); - // compare arrays + /// print an array void print (const Param_Test::Multdim_Array_slice *a); - // print an array + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::Multdim_Array_var in_; - // in parameter + /// inout parameter Param_Test::Multdim_Array_var inout_; - // inout parameter + /// out parameter Param_Test::Multdim_Array_var out_; - // out parameter + /// return value Param_Test::Multdim_Array_var ret_; - // return value }; #endif /* PARAM_TEST_MULTDIM_ARRAY_H */ diff --git a/tests/Param_Test/nested_struct.cpp b/tests/Param_Test/nested_struct.cpp index 5c93d78c007..e8a8805109e 100644 --- a/tests/Param_Test/nested_struct.cpp +++ b/tests/Param_Test/nested_struct.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// nested_struct.cpp -// -// = DESCRIPTION -// tests nested structs -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file nested_struct.cpp + * + * $Id$ + * + * tests nested structs + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "nested_struct.h" -ACE_RCSID (Param_Test, - nested_struct, - "$Id$") - // ************************************************************************ // Test_Nested_Struct // ************************************************************************ diff --git a/tests/Param_Test/nested_struct.h b/tests/Param_Test/nested_struct.h index a22145e958c..10044dfd3e0 100644 --- a/tests/Param_Test/nested_struct.h +++ b/tests/Param_Test/nested_struct.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// nested_struct.h -// -// = DESCRIPTION -// Tests nested structures -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file nested_struct.h + * + * $Id$ + * + * Tests nested structures + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_NESTED_STRUCT_H #define PARAM_TEST_NESTED_STRUCT_H @@ -28,52 +25,52 @@ class Test_Nested_Struct { public: + /// ctor Test_Nested_Struct (void); - // ctor + /// dtor ~Test_Nested_Struct (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::Nested_Struct in_; - // in parameter // these need memory management + /// inout parameter Param_Test::Nested_Struct_var inout_; - // inout parameter + /// out parameter Param_Test::Nested_Struct_var out_; - // out parameter + /// return value Param_Test::Nested_Struct_var ret_; - // return value }; #endif /* PARAM_TEST_NESTED_STRUCT_H */ diff --git a/tests/Param_Test/objref.cpp b/tests/Param_Test/objref.cpp index 3bdde5b4cb5..4d35cecd7ac 100644 --- a/tests/Param_Test/objref.cpp +++ b/tests/Param_Test/objref.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// objref.cpp -// -// = DESCRIPTION -// tests object references -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file objref.cpp + * + * $Id$ + * + * tests object references + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "objref.h" -ACE_RCSID (Param_Test, - objref, - "$Id$") - // ************************************************************************ // Test_ObjRef // ************************************************************************ diff --git a/tests/Param_Test/objref.h b/tests/Param_Test/objref.h index a6d491eb90e..bcbbc908007 100644 --- a/tests/Param_Test/objref.h +++ b/tests/Param_Test/objref.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// objref.h -// -// = DESCRIPTION -// Tests object references -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file objref.h + * + * $Id$ + * + * Tests object references + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_OBJREF_H #define PARAM_TEST_OBJREF_H @@ -27,51 +24,51 @@ class Test_ObjRef { public: + /// ctor Test_ObjRef (void); - // ctor + /// dtor ~Test_ObjRef (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter Coffee_var in_; - // in parameter + /// inout parameter Coffee_var inout_; - // inout parameter + /// out parameter Coffee_var out_; - // out parameter + /// return value Coffee_var ret_; - // return value }; #endif /* PARAM_TEST_OBJREF_H */ diff --git a/tests/Param_Test/objref_struct.cpp b/tests/Param_Test/objref_struct.cpp index b5dc1e676ad..bb9bc19af57 100644 --- a/tests/Param_Test/objref_struct.cpp +++ b/tests/Param_Test/objref_struct.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// objref_struct.cpp -// -// = DESCRIPTION -// test structures containing object references. -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file objref_struct.cpp + * + * $Id$ + * + * test structures containing object references. + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "objref_struct.h" -ACE_RCSID (Param_Test, - objref_struct, - "$Id$") - // ************************************************************************ // Test_Objref_Struct // ************************************************************************ diff --git a/tests/Param_Test/objref_struct.h b/tests/Param_Test/objref_struct.h index e9f7164f903..0f8335c0506 100644 --- a/tests/Param_Test/objref_struct.h +++ b/tests/Param_Test/objref_struct.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// objref_struct.h -// -// = DESCRIPTION -// Tests variable sized structures -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file objref_struct.h + * + * $Id$ + * + * Tests variable sized structures + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_OBJREF_STRUCT_H #define PARAM_TEST_OBJREF_STRUCT_H @@ -28,52 +25,52 @@ class Test_Objref_Struct { public: + /// ctor Test_Objref_Struct (void); - // ctor + /// dtor ~Test_Objref_Struct (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::Objref_Struct in_; - // in parameter // these need memory management + /// inout parameter Param_Test::Objref_Struct_var inout_; - // inout parameter + /// out parameter Param_Test::Objref_Struct_var out_; - // out parameter + /// return value Param_Test::Objref_Struct_var ret_; - // return value }; #endif /* PARAM_TEST_OBJREF_STRUCT_H */ diff --git a/tests/Param_Test/options.cpp b/tests/Param_Test/options.cpp index 08ed4d5205e..1193e8a64d0 100644 --- a/tests/Param_Test/options.cpp +++ b/tests/Param_Test/options.cpp @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// options.cpp -// -// = DESCRIPTION -// Options for the Param_Test application -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file options.cpp + * + * $Id$ + * + * Options for the Param_Test application + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "options.h" #include "tao/debug.h" @@ -24,11 +21,7 @@ #include "ace/OS_NS_fcntl.h" #include "ace/Log_Msg.h" -ACE_RCSID (Param_Test, - options, - "$Id$") - -// Constructor.p +// Constructor. Options::Options (void) : ior_ (CORBA::string_dup ("file://test.ior")), test_type_ (Options::NO_TEST), diff --git a/tests/Param_Test/options.h b/tests/Param_Test/options.h index 07ae447ca70..ca17dcba529 100644 --- a/tests/Param_Test/options.h +++ b/tests/Param_Test/options.h @@ -1,21 +1,17 @@ -// -*- c++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// options.h -// -// = DESCRIPTION -// Options for the Param_Test application -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file options.h + * + * $Id$ + * + * Options for the Param_Test application + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef OPTIONS_H #define OPTIONS_H @@ -80,54 +76,54 @@ public: DII }; + /// constructor Options (void); - // constructor + /// destructor ~Options (void); - // destructor + /// Parses the arguments passed on the command line. int parse_args (int argc, ACE_TCHAR **argv); - // Parses the arguments passed on the command line. + /// return the IOR for the servant char const * param_test_ior (void) const; - // return the IOR for the servant + /// what test to run TEST_TYPE test_type (void); - // what test to run + /// whether to use SII or DII INVOKE_TYPE invoke_type (void); - // whether to use SII or DII + /// number of times to run the test CORBA::ULong loop_count (void); - // number of times to run the test + /// whether debug option is on or not CORBA::Boolean debug (void) const; - // whether debug option is on or not + /// If we should request the server to shutdown. CORBA::Boolean shutdown (void) const; - // If we should request the server to shutdown. private: + /// Function to read the servant IOR from a file. int read_ior (ACE_TCHAR *filename); - // Function to read the servant IOR from a file. + /// IOR for the servant CORBA::String_var ior_; - // IOR for the servant + /// what test to run TEST_TYPE test_type_; - // what test to run + /// whether SII or DII INVOKE_TYPE invoke_type_; - // whether SII or DII + /// Number of times to do the "test_*" operations. CORBA::ULong loop_count_; - // Number of times to do the "test_*" operations. + /// debugging output values CORBA::Boolean debug_; - // debugging output values + /// server shutdown flag. CORBA::Boolean shutdown_; - // server shutdown flag. }; typedef ACE_Singleton<Options, TAO_SYNCH_RECURSIVE_MUTEX> OPTIONS; diff --git a/tests/Param_Test/param_test.idl b/tests/Param_Test/param_test.idl index 98222150819..2fbfafcf778 100644 --- a/tests/Param_Test/param_test.idl +++ b/tests/Param_Test/param_test.idl @@ -1,23 +1,19 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// params.idl -// -// = DESCRIPTION -// This IDL description is used to test all the parameter passing modes (in, -// inout, out, and return) for a number of IDL data types. The goal is to -// verify the correctness of the generated stubs and skeletons, and the -// the marshaling engine of TAO. -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file param_test.idl + * + * $Id$ + * + * This IDL description is used to test all the parameter passing modes (in, + * inout, out, and return) for a number of IDL data types. The goal is to + * verify the correctness of the generated stubs and skeletons, and the + * the marshaling engine of TAO. + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include <orb.idl> #include "tao/AnyTypeCode/AnySeq.pidl" @@ -265,7 +261,7 @@ interface Param_Test inout unsigned long s2, out unsigned long s3) raises (Ooops); - + typedef short short_array[32]; union Big_Union switch (short) @@ -339,7 +335,7 @@ interface Param_Test // Recursive structs. Contains a sequence of itself. struct Recursive_Struct; typedef sequence<Recursive_Struct> RecStructSeq; - + struct Recursive_Struct { long x; @@ -355,7 +351,7 @@ interface Param_Test // recursive union. union nested_rec_union; typedef sequence<nested_rec_union> NestedSeq; - + union nested_rec_union switch (short) { case 0: long value; @@ -364,7 +360,7 @@ interface Param_Test union Recursive_Union; typedef sequence<Recursive_Union> RecUnionSeq; - + union Recursive_Union switch (short) { case 0: RecUnionSeq rec_member; diff --git a/tests/Param_Test/param_test_i.cpp b/tests/Param_Test/param_test_i.cpp index f0b9a3ee916..aa822a4f573 100644 --- a/tests/Param_Test/param_test_i.cpp +++ b/tests/Param_Test/param_test_i.cpp @@ -1,17 +1,14 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// param_test_i.cpp -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file param_test_i.cpp + * + * $Id$ + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "param_test_i.h" @@ -20,10 +17,6 @@ #include "ace/OS_NS_wchar.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Param_Test, - param_test_i, - "$Id$") - // ********* class Coffee_i **************** // Constructor diff --git a/tests/Param_Test/param_test_i.h b/tests/Param_Test/param_test_i.h index 321df2bb9b3..478253046dd 100644 --- a/tests/Param_Test/param_test_i.h +++ b/tests/Param_Test/param_test_i.h @@ -1,17 +1,14 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// param_test_i.h -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file param_test_i.h + * + * $Id$ + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_I_H #define PARAM_TEST_I_H @@ -23,77 +20,81 @@ class Coffee_i : public POA_Coffee { public: + /// constructor Coffee_i (const char *name); - // constructor + /// destructor ~Coffee_i (void); - // destructor // =methods for the attribute + /// get attribute virtual Coffee::Desc * description (void); - // get attribute + /// set attribute virtual void description (const Coffee::Desc &description); - // set attribute private: + /// my description CORBA::String_var name_; - // my description }; // the implementation of the Param_test interface +/** + * @class Param_Test_i + * + * @brief Param_Test_i + * + * Implementation of the Param_Test test suite. + */ class Param_Test_i : public POA_Param_Test { - // = TITLE - // Param_Test_i - // = DESCRIPTION - // Implementation of the Param_Test test suite. public: + /// Constructor Param_Test_i (const char *coffee_name, CORBA::ORB_ptr orb); - // Constructor + /// Destructor ~Param_Test_i (void); - // Destructor + /// test for shorts virtual CORBA::Short test_short (CORBA::Short s1, CORBA::Short &s2, CORBA::Short_out s3); - // test for shorts + /// test for unsigned long long virtual CORBA::ULongLong test_ulonglong (CORBA::ULongLong s1, CORBA::ULongLong &s2, CORBA::ULongLong_out s3); - // test for unsigned long long + /// test for unbounded strings virtual char *test_unbounded_string (const char *s1, char *&s2, CORBA::String_out s3); - // test for unbounded strings + /// test for bounded strings virtual char *test_bounded_string (const char *s1, char *&s2, CORBA::String_out s3); - // test for bounded strings + /// test for unbounded wstrings virtual CORBA::WChar *test_unbounded_wstring (const CORBA::WChar *ws1, CORBA::WChar *&ws2, CORBA::WString_out ws3); - // test for unbounded wstrings + /// test for bounded wstrings virtual CORBA::WChar *test_bounded_wstring (const CORBA::WChar *ws1, CORBA::WChar *&ws2, CORBA::WString_out ws3); - // test for bounded wstrings + /// test for fixed structures virtual Param_Test::Fixed_Struct test_fixed_struct (const Param_Test::Fixed_Struct &s1, Param_Test::Fixed_Struct &s2, Param_Test::Fixed_Struct_out s3); - // test for fixed structures // = Start of sequences tests... + /// = End of sequences tests.... virtual CORBA::LongSeq * test_long_sequence ( const CORBA::LongSeq & s1, CORBA::LongSeq & s2, @@ -158,64 +159,63 @@ public: const CORBA::AnySeq & s1, CORBA::AnySeq & s2, CORBA::AnySeq_out s3); - // = End of sequences tests.... + /// test for variable structs virtual Param_Test::Var_Struct * test_var_struct (const Param_Test::Var_Struct &s1, Param_Test::Var_Struct &s2, Param_Test::Var_Struct_out s3); - // test for variable structs + /// test for nested structs virtual Param_Test::Nested_Struct * test_nested_struct (const Param_Test::Nested_Struct &s1, Param_Test::Nested_Struct &s2, Param_Test::Nested_Struct_out s3); - // test for nested structs + /// test for recursive structs virtual Param_Test::Recursive_Struct * test_recursive_struct (const Param_Test::Recursive_Struct &rs1, Param_Test::Recursive_Struct &rs2, Param_Test::Recursive_Struct_out rs3); - // test for recursive structs virtual Param_Test::Objref_Struct * test_objref_struct (const Param_Test::Objref_Struct &s1, Param_Test::Objref_Struct &s2, Param_Test::Objref_Struct_out s3); + /// make a coffee object virtual Coffee_ptr make_coffee (void); - // make a coffee object + /// test for object references virtual Coffee_ptr test_objref (Coffee_ptr o1, Coffee_ptr &o2, Coffee_out o3); - // test for object references + /// test for typecodes virtual CORBA::TypeCode_ptr test_typecode (CORBA::TypeCode_ptr t1, CORBA::TypeCode_ptr &o2, CORBA::TypeCode_out o3); - // test for typecodes + /// test for Anys virtual CORBA::Any * test_any (const CORBA::Any &a1, CORBA::Any &a2, CORBA::Any_out a3); - // test for Anys + /// test for fixed size arrays virtual Param_Test::Fixed_Array_slice * test_fixed_array (const Param_Test::Fixed_Array a1, Param_Test::Fixed_Array a2, Param_Test::Fixed_Array_out a3); - // test for fixed size arrays + /// test for arrays of variable types virtual Param_Test::Var_Array_slice * test_var_array (const Param_Test::Var_Array a1, Param_Test::Var_Array a2, Param_Test::Var_Array_out a3); - // test for arrays of variable types virtual CORBA::ULong test_exception (CORBA::ULong s1, CORBA::ULong& s2, @@ -251,17 +251,19 @@ public: private: + /// Remember out ORB. CORBA::ORB_var orb_; - // Remember out ORB. + /// the coffee object reference we maintain Coffee_i obj_; - // the coffee object reference we maintain + /** + * Called by test_exception. This will avoid the compiler + * warning that test_exception is throwing an exception + * not in its THROW_SPEC, but still test TAO's + * conversion of such an exception to UNKNOWN. + */ void throw_badboy (void); - // Called by test_exception. This will avoid the compiler - // warning that test_exception is throwing an exception - // not in its THROW_SPEC, but still test TAO's - // conversion of such an exception to UNKNOWN. }; #endif /* PARAM_TEST_I_H */ diff --git a/tests/Param_Test/recursive_struct.cpp b/tests/Param_Test/recursive_struct.cpp index 8558d1ac351..e6bcb00611a 100644 --- a/tests/Param_Test/recursive_struct.cpp +++ b/tests/Param_Test/recursive_struct.cpp @@ -1,26 +1,20 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// recursive_struct.cpp -// -// = DESCRIPTION -// test structure that contains a sequence of itself -// -// = AUTHORS -// Aniruddha Gokhale, Jeff Parsons -// -// ============================================================================ -#include "recursive_struct.h" +//============================================================================= +/** + * @file recursive_struct.cpp + * + * $Id$ + * + * test structure that contains a sequence of itself + * + * + * @author Aniruddha Gokhale + * @author Jeff Parsons + */ +//============================================================================= + -ACE_RCSID (Param_Test, - recursive_struct, - "$Id$") +#include "recursive_struct.h" const CORBA::ULong MAX_DEPTH = 5; const CORBA::ULong MAX_SEQ_LENGTH = 3; diff --git a/tests/Param_Test/recursive_struct.h b/tests/Param_Test/recursive_struct.h index 77d1ee7dabc..89aaf25746b 100644 --- a/tests/Param_Test/recursive_struct.h +++ b/tests/Param_Test/recursive_struct.h @@ -1,20 +1,18 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// recursive_struct.h -// -// = DESCRIPTION -// Tests a structure that contains a sequence of itself -// -// = AUTHORS -// Aniruddha Gokhale, Jeff Parsons -// -// ============================================================================ + +//============================================================================= +/** + * @file recursive_struct.h + * + * $Id$ + * + * Tests a structure that contains a sequence of itself + * + * + * @author Aniruddha Gokhale + * @author Jeff Parsons + */ +//============================================================================= + #ifndef PARAM_TEST_RECURSIVE_STRUCT_H #define PARAM_TEST_RECURSIVE_STRUCT_H @@ -29,61 +27,61 @@ class Test_Recursive_Struct { public: + /// ctor Test_Recursive_Struct (void); - // ctor + /// dtor ~Test_Recursive_Struct (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::Recursive_Struct in_; - // in parameter // these need memory management + /// inout parameter Param_Test::Recursive_Struct_var inout_; - // inout parameter + /// out parameter Param_Test::Recursive_Struct_var out_; - // out parameter + /// return value Param_Test::Recursive_Struct_var ret_; - // return value + /// helper function for init_parameters void deep_init (Param_Test::Recursive_Struct &rs, Generator *gen, CORBA::ULong level); - // helper function for init_parameters + /// helper function for check_validity CORBA::Boolean deep_check (const Param_Test::Recursive_Struct &in_struct, const Param_Test::Recursive_Struct &test_struct); - // helper function for check_validity }; #endif /* PARAM_TEST_RECURSIVE_STRUCT_H */ diff --git a/tests/Param_Test/recursive_union.cpp b/tests/Param_Test/recursive_union.cpp index 6bf47a98a78..8353cabdde8 100644 --- a/tests/Param_Test/recursive_union.cpp +++ b/tests/Param_Test/recursive_union.cpp @@ -1,26 +1,19 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// recursive_union.cpp -// -// = DESCRIPTION -// test union that contains a sequence of itself -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> -// -// ============================================================================ -#include "recursive_union.h" +//============================================================================= +/** + * @file recursive_union.cpp + * + * $Id$ + * + * test union that contains a sequence of itself + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> + */ +//============================================================================= + -ACE_RCSID (Param_Test, - recursive_union, - "$Id$") +#include "recursive_union.h" const CORBA::ULong MAX_DEPTH = 3; const CORBA::ULong MAX_SEQ_LENGTH = 2; diff --git a/tests/Param_Test/recursive_union.h b/tests/Param_Test/recursive_union.h index 6f41e85292c..995a0c49c17 100644 --- a/tests/Param_Test/recursive_union.h +++ b/tests/Param_Test/recursive_union.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// recursive_union.h -// -// = DESCRIPTION -// Tests a union that contains a sequence of itself -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file recursive_union.h + * + * $Id$ + * + * Tests a union that contains a sequence of itself + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> + */ +//============================================================================= + #ifndef PARAM_TEST_RECURSIVE_UNION_H #define PARAM_TEST_RECURSIVE_UNION_H @@ -29,68 +26,68 @@ class Test_Recursive_Union { public: + /// ctor Test_Recursive_Union (void); - // ctor + /// dtor ~Test_Recursive_Union (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::Recursive_Union in_; - // in parameter // these need memory management + /// inout parameter Param_Test::Recursive_Union_var inout_; - // inout parameter + /// out parameter Param_Test::Recursive_Union_var out_; - // out parameter + /// return value Param_Test::Recursive_Union_var ret_; - // return value void deep_init (Param_Test::Recursive_Union &u, Generator *gen, CORBA::ULong level); + /// helper functions for init_parameters void deep_init_nested (Param_Test::nested_rec_union &nu, Generator *gen, CORBA::ULong level); - // helper functions for init_parameters CORBA::Boolean deep_check (const Param_Test::Recursive_Union &in_union, const Param_Test::Recursive_Union &test_union); + /// helper functions for check_validity CORBA::Boolean deep_check_nested (const Param_Test::nested_rec_union &in, const Param_Test::nested_rec_union &test); - // helper functions for check_validity }; #endif /* PARAM_TEST_RECURSIVE_UNION_H */ diff --git a/tests/Param_Test/results.cpp b/tests/Param_Test/results.cpp index 101e607c389..179a4adef02 100644 --- a/tests/Param_Test/results.cpp +++ b/tests/Param_Test/results.cpp @@ -1,29 +1,22 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// results.cpp -// -// = DESCRIPTION -// Printing the results -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file results.cpp + * + * $Id$ + * + * Printing the results + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "results.h" #include "tao/debug.h" #include "ace/Log_Msg.h" -ACE_RCSID (Param_Test, - results, - "results.cpp,v 1.8 1999/06/23 14:50:14 parsons Exp") - Results::Results (void) { } diff --git a/tests/Param_Test/results.h b/tests/Param_Test/results.h index e04e26e5f3c..65c490debd4 100644 --- a/tests/Param_Test/results.h +++ b/tests/Param_Test/results.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// results.h -// -// = DESCRIPTION -// Printing the results -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file results.h + * + * $Id$ + * + * Printing the results + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef RESULTS_H #define RESULTS_H @@ -38,51 +35,51 @@ TAO_END_VERSIONED_NAMESPACE_DECL class Results { public: + /// ctor Results (void); - // ctor + /// destructor ~Results (void); - // destructor + /// prints the time stats void print_stats (void); - // prints the time stats + /// print the exception void print_exception (const char *call_name); - // print the exception + /// start timing void start_timer (void); - // start timing + /// stop timing void stop_timer (void); - // stop timing + /// return call count CORBA::ULong call_count (void); - // return call count + /// set the call count void call_count (CORBA::ULong); - // set the call count + /// return the error count CORBA::ULong error_count (void); - // return the error count + /// set error count void error_count (CORBA::ULong); - // set error count + /// set the number of times the test will be run void iterations (CORBA::ULong iters); - // set the number of times the test will be run private: + /// # of calls made to functions CORBA::ULong call_count_; - // # of calls made to functions + /// # of errors incurred in the lifetime of the application. CORBA::ULong error_count_; - // # of errors incurred in the lifetime of the application. + /// for timing the test ACE_Profile_Timer timer_; - // for timing the test + /// holds the elapsed time for each iteration ACE_Profile_Timer::ACE_Elapsed_Time *elapsed_time_; - // holds the elapsed time for each iteration }; #endif /* RESULTS_H */ diff --git a/tests/Param_Test/server.cpp b/tests/Param_Test/server.cpp index 69208f2f2f3..757cb9b435c 100644 --- a/tests/Param_Test/server.cpp +++ b/tests/Param_Test/server.cpp @@ -1,17 +1,14 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// server.cpp -// -// = AUTHOR -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "param_test_i.h" #include "tao/Codeset/Codeset.h" @@ -20,10 +17,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Param_Test, - server, - "$Id$") - // Parses the command line arguments and returns an error status. static FILE *ior_output_file = 0; static const ACE_TCHAR *ior_output_filename = ACE_TEXT("test.ior"); diff --git a/tests/Param_Test/short.cpp b/tests/Param_Test/short.cpp index b6975dfe98e..6bf5cacc815 100644 --- a/tests/Param_Test/short.cpp +++ b/tests/Param_Test/short.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// short.cpp -// -// = DESCRIPTION -// tests shorts -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file short.cpp + * + * $Id$ + * + * tests shorts + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "short.h" -ACE_RCSID (Param_Test, - short, - "$Id$") - // ************************************************************************ // Test_Short // ************************************************************************ diff --git a/tests/Param_Test/short.h b/tests/Param_Test/short.h index 2396e70663f..c4f3025a71b 100644 --- a/tests/Param_Test/short.h +++ b/tests/Param_Test/short.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// short.h -// -// = DESCRIPTION -// Tests shorts -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file short.h + * + * $Id$ + * + * Tests shorts + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_SHORT_H #define PARAM_TEST_SHORT_H @@ -27,51 +24,51 @@ class Test_Short { public: + /// ctor Test_Short (void); - // ctor + /// dtor ~Test_Short (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter CORBA::Short in_; - // in parameter + /// inout parameter CORBA::Short inout_; - // inout parameter + /// out parameter CORBA::Short out_; - // out parameter + /// return value CORBA::Short ret_; - // return value }; #endif /* PARAM_TEST_SHORT_H */ diff --git a/tests/Param_Test/small_union.cpp b/tests/Param_Test/small_union.cpp index 2947a1221f0..173476c4041 100644 --- a/tests/Param_Test/small_union.cpp +++ b/tests/Param_Test/small_union.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// small_union.cpp -// -// = DESCRIPTION -// tests Small_Unions -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file small_union.cpp + * + * $Id$ + * + * tests Small_Unions + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "small_union.h" -ACE_RCSID (Param_Test, - small_union, - "$Id$") - // ************************************************************************ // Test_Small_Union // ************************************************************************ diff --git a/tests/Param_Test/small_union.h b/tests/Param_Test/small_union.h index 8e3b1834cab..ad19888c6d7 100644 --- a/tests/Param_Test/small_union.h +++ b/tests/Param_Test/small_union.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// small_union.h -// -// = DESCRIPTION -// Tests Anys -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file small_union.h + * + * $Id$ + * + * Tests Anys + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_SMALL_UNION_H #define PARAM_TEST_SMALL_UNION_H @@ -27,57 +24,57 @@ class Test_Small_Union { public: + /// ctor Test_Small_Union (void); - // ctor + /// dtor ~Test_Small_Union (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// Coffee object used to test Small_Union with object. Coffee_var cobj_; - // Coffee object used to test Small_Union with object. + /// test counter. static size_t counter; - // test counter. + /// in parameter Param_Test::Small_Union in_; - // in parameter + /// inout parameter Param_Test::Small_Union inout_; - // inout parameter + /// out parameter Param_Test::Small_Union_var out_; - // out parameter + /// return value Param_Test::Small_Union_var ret_; - // return value }; #endif /* PARAM_TEST_SMALL_UNION_H */ diff --git a/tests/Param_Test/tests.h b/tests/Param_Test/tests.h index c042cad74fa..4c1f4627ffb 100644 --- a/tests/Param_Test/tests.h +++ b/tests/Param_Test/tests.h @@ -1,20 +1,17 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// tests.h -// -// = DESCRIPTION -// All the test objects header files included here -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ +//============================================================================= +/** + * @file tests.h + * + * $Id$ + * + * All the test objects header files included here + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef TESTS_H #define TESTS_H diff --git a/tests/Param_Test/typecode.cpp b/tests/Param_Test/typecode.cpp index d9477651899..4eb26c38662 100644 --- a/tests/Param_Test/typecode.cpp +++ b/tests/Param_Test/typecode.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// typecode.cpp -// -// = DESCRIPTION -// tests typecodes -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file typecode.cpp + * + * $Id$ + * + * tests typecodes + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "typecode.h" -ACE_RCSID (Param_Test, - typecode, - "$Id$") - // ************************************************************************ // Test_TypeCode // ************************************************************************ diff --git a/tests/Param_Test/typecode.h b/tests/Param_Test/typecode.h index 1b4a2183f50..0f35979fa1f 100644 --- a/tests/Param_Test/typecode.h +++ b/tests/Param_Test/typecode.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// typecode.h -// -// = DESCRIPTION -// Tests typecodes -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file typecode.h + * + * $Id$ + * + * Tests typecodes + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_TYPECODE_H #define PARAM_TEST_TYPECODE_H @@ -27,55 +24,55 @@ class Test_TypeCode { public: + /// ctor Test_TypeCode (void); - // ctor + /// dtor ~Test_TypeCode (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// place for selected typecode to stay during time + /// between init_parameters () and reset_parameters (). CORBA::TypeCode_var tc_holder_; - // place for selected typecode to stay during time - // between init_parameters () and reset_parameters (). + /// operation name char *opname_; - // operation name + /// in parameter CORBA::TypeCode_var in_; - // in parameter + /// inout parameter CORBA::TypeCode_var inout_; - // inout parameter + /// out parameter CORBA::TypeCode_var out_; - // out parameter + /// return value CORBA::TypeCode_var ret_; - // return value }; #endif /* PARAM_TEST_TYPECODE_H */ diff --git a/tests/Param_Test/ub_any_seq.cpp b/tests/Param_Test/ub_any_seq.cpp index abf567fc524..0c5b7c823b4 100644 --- a/tests/Param_Test/ub_any_seq.cpp +++ b/tests/Param_Test/ub_any_seq.cpp @@ -1,29 +1,22 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_any_seq.cpp -// -// = DESCRIPTION -// tests unbounded Any sequences -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_any_seq.cpp + * + * $Id$ + * + * tests unbounded Any sequences + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "ub_any_seq.h" #include "tao/debug.h" -ACE_RCSID (Param_Test, - ub_any_seq, - "$Id$") - const CORBA::ULong TEST_SEQ_LENGTH = 5; const CORBA::ULong NUM_TEST_TYPES = 4; diff --git a/tests/Param_Test/ub_any_seq.h b/tests/Param_Test/ub_any_seq.h index c5431e8314c..4256a5e1f23 100644 --- a/tests/Param_Test/ub_any_seq.h +++ b/tests/Param_Test/ub_any_seq.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_any_seq.h -// -// = DESCRIPTION -// Tests unbounded Any sequences -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_any_seq.h + * + * $Id$ + * + * Tests unbounded Any sequences + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_UNBOUNDED_ANY_SEQUENCE_H #define PARAM_TEST_UNBOUNDED_ANY_SEQUENCE_H @@ -27,59 +24,59 @@ class Test_AnySeq { public: + /// ctor Test_AnySeq (void); - // ctor + /// dtor ~Test_AnySeq (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. protected: + /// compare CORBA::Boolean compare (const CORBA::AnySeq &s1, const Param_Test::StructSeq &s2); - // compare + /// print individual sequence void print_sequence (const CORBA::AnySeq &s); - // print individual sequence private: + /// operation name char *opname_; - // operation name + /// in parameter CORBA::AnySeq_var in_; - // in parameter + /// inout parameter CORBA::AnySeq_var inout_; - // inout parameter + /// out parameter CORBA::AnySeq_var out_; - // out parameter + /// return value CORBA::AnySeq_var ret_; - // return value }; #endif /* PARAM_TEST_UNBOUNDED_ANY_SEQUENCE_H */ diff --git a/tests/Param_Test/ub_array_seq.cpp b/tests/Param_Test/ub_array_seq.cpp index 821163fe4a7..20ceaf2992b 100644 --- a/tests/Param_Test/ub_array_seq.cpp +++ b/tests/Param_Test/ub_array_seq.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_array_seq.cpp -// -// = DESCRIPTION -// tests unbounded array sequences -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_array_seq.cpp + * + * $Id$ + * + * tests unbounded array sequences + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> + */ +//============================================================================= + #include "helper.h" #include "ub_array_seq.h" -ACE_RCSID (Param_Test, - ub_array_seq, - "$Id$") - // ************************************************************************ // Test_Array_Sequence // ************************************************************************ diff --git a/tests/Param_Test/ub_array_seq.h b/tests/Param_Test/ub_array_seq.h index 258c2531567..c12cbbe29f6 100644 --- a/tests/Param_Test/ub_array_seq.h +++ b/tests/Param_Test/ub_array_seq.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_array_seq.h -// -// = DESCRIPTION -// Tests unbounded array sequence -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_array_seq.h + * + * $Id$ + * + * Tests unbounded array sequence + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> + */ +//============================================================================= + #ifndef PARAM_TEST_UNBOUNED_ARRAY_SEQUENCE_H #define PARAM_TEST_UNBOUNED_ARRAY_SEQUENCE_H @@ -28,60 +25,60 @@ class Test_Array_Sequence { public: + /// ctor Test_Array_Sequence (void); - // ctor + /// dtor ~Test_Array_Sequence (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. protected: + /// compare CORBA::Boolean compare (const Param_Test::ArraySeq &s1, const Param_Test::ArraySeq &s2); - // compare + /// print individual sequence void print_sequence (const Param_Test::ArraySeq &s); - // print individual sequence private: + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::ArraySeq in_; - // in parameter // these need memory management + /// inout parameter Param_Test::ArraySeq_var inout_; - // inout parameter + /// out parameter Param_Test::ArraySeq_var out_; - // out parameter + /// return value Param_Test::ArraySeq_var ret_; - // return value }; diff --git a/tests/Param_Test/ub_long_seq.cpp b/tests/Param_Test/ub_long_seq.cpp index 698c50e153b..7e1fd4ff6dd 100644 --- a/tests/Param_Test/ub_long_seq.cpp +++ b/tests/Param_Test/ub_long_seq.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_long_seq.cpp -// -// = DESCRIPTION -// tests unbounded long sequences -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_long_seq.cpp + * + * $Id$ + * + * tests unbounded long sequences + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "ub_long_seq.h" -ACE_RCSID (Param_Test, - ub_long_seq, - "$Id$") - // ************************************************************************ // Test_Long_Sequence // ************************************************************************ diff --git a/tests/Param_Test/ub_long_seq.h b/tests/Param_Test/ub_long_seq.h index 4787743e140..2025d919676 100644 --- a/tests/Param_Test/ub_long_seq.h +++ b/tests/Param_Test/ub_long_seq.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_long_seq.h -// -// = DESCRIPTION -// Tests unbounded long sequences -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_long_seq.h + * + * $Id$ + * + * Tests unbounded long sequences + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_UNBOUNDED_LONG_SEQUENCE_H #define PARAM_TEST_UNBOUNDED_LONG_SEQUENCE_H @@ -28,51 +25,51 @@ class Test_Long_Sequence { public: + /// ctor Test_Long_Sequence (void); - // ctor + /// dtor ~Test_Long_Sequence (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter CORBA::LongSeq_var in_; - // in parameter + /// inout parameter CORBA::LongSeq_var inout_; - // inout parameter + /// out parameter CORBA::LongSeq_var out_; - // out parameter + /// return value CORBA::LongSeq_var ret_; - // return value }; #endif /* PARAM_TEST_UNBOUNDED_LONG_SEQUENCE_H */ diff --git a/tests/Param_Test/ub_objref_seq.cpp b/tests/Param_Test/ub_objref_seq.cpp index 8f796313893..561a210bdae 100644 --- a/tests/Param_Test/ub_objref_seq.cpp +++ b/tests/Param_Test/ub_objref_seq.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_objref_seq.cpp -// -// = DESCRIPTION -// tests unbounded objref sequences -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_objref_seq.cpp + * + * $Id$ + * + * tests unbounded objref sequences + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "ub_objref_seq.h" -ACE_RCSID (Param_Test, - ub_objref_seq, - "$Id$") - // ************************************************************************ // Test_ObjRef_Sequence // ************************************************************************ diff --git a/tests/Param_Test/ub_objref_seq.h b/tests/Param_Test/ub_objref_seq.h index 21f3639dd08..f21cf35d34f 100644 --- a/tests/Param_Test/ub_objref_seq.h +++ b/tests/Param_Test/ub_objref_seq.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_objref_seq.h -// -// = DESCRIPTION -// Tests unbounded sequences of object references -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_objref_seq.h + * + * $Id$ + * + * Tests unbounded sequences of object references + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_UNBOUNDED_OBJREF_SEQUENCE_H #define PARAM_TEST_UNBOUNDED_OBJREF_SEQUENCE_H @@ -28,59 +25,59 @@ class Test_ObjRef_Sequence { public: + /// ctor Test_ObjRef_Sequence (void); - // ctor + /// dtor ~Test_ObjRef_Sequence (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. protected: + /// compare CORBA::Boolean compare (const Param_Test::Coffee_Mix &s1, const Param_Test::Coffee_Mix &s2); - // compare + /// print individual sequence void print_sequence (const Param_Test::Coffee_Mix &s); - // print individual sequence private: + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::Coffee_Mix in_; - // in parameter // these need memory management + /// inout parameter Param_Test::Coffee_Mix_var inout_; - // inout parameter + /// out parameter Param_Test::Coffee_Mix_var out_; - // out parameter + /// return value Param_Test::Coffee_Mix_var ret_; - // return value }; #endif /* PARAM_TEST_UNBOUNDED_OBJREF_SEQUENCE_H */ diff --git a/tests/Param_Test/ub_short_seq.cpp b/tests/Param_Test/ub_short_seq.cpp index 3319e89c703..8cbecfbf23b 100644 --- a/tests/Param_Test/ub_short_seq.cpp +++ b/tests/Param_Test/ub_short_seq.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_short_seq.cpp -// -// = DESCRIPTION -// tests unbounded short sequences -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_short_seq.cpp + * + * $Id$ + * + * tests unbounded short sequences + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "ub_short_seq.h" -ACE_RCSID (Param_Test, - ub_short_seq, - "$Id$") - // ************************************************************************ // Test_Short_Sequence // ************************************************************************ diff --git a/tests/Param_Test/ub_short_seq.h b/tests/Param_Test/ub_short_seq.h index a200873eadd..e69f052f50c 100644 --- a/tests/Param_Test/ub_short_seq.h +++ b/tests/Param_Test/ub_short_seq.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_short_seq.h -// -// = DESCRIPTION -// Tests unbounded short sequence -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_short_seq.h + * + * $Id$ + * + * Tests unbounded short sequence + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_UNBOUNDED_SHORT_SEQUENCE_H #define PARAM_TEST_UNBOUNDED_SHORT_SEQUENCE_H @@ -28,51 +25,51 @@ class Test_Short_Sequence { public: + /// ctor Test_Short_Sequence (void); - // ctor + /// dtor ~Test_Short_Sequence (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter CORBA::ShortSeq_var in_; - // in parameter + /// inout parameter CORBA::ShortSeq_var inout_; - // inout parameter + /// out parameter CORBA::ShortSeq_var out_; - // out parameter + /// return value CORBA::ShortSeq_var ret_; - // return value }; #endif /* PARAM_TEST_UNBOUNDED_SHORT_SEQUENCE_H */ diff --git a/tests/Param_Test/ub_str_seq.cpp b/tests/Param_Test/ub_str_seq.cpp index db7eead2aa5..889f49a0e64 100644 --- a/tests/Param_Test/ub_str_seq.cpp +++ b/tests/Param_Test/ub_str_seq.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_str_seq.cpp -// -// = DESCRIPTION -// tests unbounded string sequences -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_str_seq.cpp + * + * $Id$ + * + * tests unbounded string sequences + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "ub_str_seq.h" -ACE_RCSID (Param_Test, - ub_str_seq, - "$Id$") - // ************************************************************************ // Test_String_Sequence // ************************************************************************ diff --git a/tests/Param_Test/ub_str_seq.h b/tests/Param_Test/ub_str_seq.h index b58373550da..516a5425a5a 100644 --- a/tests/Param_Test/ub_str_seq.h +++ b/tests/Param_Test/ub_str_seq.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_str_seq.h -// -// = DESCRIPTION -// Tests sequences of strings -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_str_seq.h + * + * $Id$ + * + * Tests sequences of strings + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_UNBOUNDED_STRING_SEQUENCE_H #define PARAM_TEST_UNBOUNDED_STRING_SEQUENCE_H @@ -28,51 +25,51 @@ class Test_String_Sequence { public: + /// ctor Test_String_Sequence (void); - // ctor + /// dtor ~Test_String_Sequence (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter CORBA::StringSeq_var in_; - // in parameter + /// inout parameter CORBA::StringSeq_var inout_; - // inout parameter + /// out parameter CORBA::StringSeq_var out_; - // out parameter + /// return value CORBA::StringSeq_var ret_; - // return value }; #endif /* PARAM_TEST_UNBOUNDED_STRING_SEQUENCE_H */ diff --git a/tests/Param_Test/ub_string.cpp b/tests/Param_Test/ub_string.cpp index ae253a1e54b..1d00e993d15 100644 --- a/tests/Param_Test/ub_string.cpp +++ b/tests/Param_Test/ub_string.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_string.cpp -// -// = DESCRIPTION -// tests unbounded strings -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_string.cpp + * + * $Id$ + * + * tests unbounded strings + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "ub_string.h" -ACE_RCSID (Param_Test, - ub_string, - "$Id$") - // ************************************************************************ // Test_Unbounded_String // ************************************************************************ diff --git a/tests/Param_Test/ub_string.h b/tests/Param_Test/ub_string.h index 834c4bfbcb2..753f35d7983 100644 --- a/tests/Param_Test/ub_string.h +++ b/tests/Param_Test/ub_string.h @@ -1,20 +1,16 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// unbounded_string.h -// -// = DESCRIPTION -// Tests unbounded string -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_string.h + * + * $Id$ + * + * Tests unbounded string + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= #ifndef PARAM_TEST_UNBOUNDED_STRING_H #define PARAM_TEST_UNBOUNDED_STRING_H @@ -27,51 +23,51 @@ class Test_Unbounded_String { public: + /// ctor Test_Unbounded_String (void); - // ctor + /// dtor ~Test_Unbounded_String (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter char *in_; - // in parameter + /// inout parameter char *inout_; - // inout parameter + /// out parameter char *out_; - // out parameter + /// return value char *ret_; - // return value }; #endif /* PARAM_TEST_UNBOUNDED_STRING_H */ diff --git a/tests/Param_Test/ub_struct_seq.cpp b/tests/Param_Test/ub_struct_seq.cpp index 633862bf044..4535cb61991 100644 --- a/tests/Param_Test/ub_struct_seq.cpp +++ b/tests/Param_Test/ub_struct_seq.cpp @@ -1,28 +1,22 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_struct_seq.cpp -// -// = DESCRIPTION -// tests unbounded struct sequences -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ +// -*- C++ -*- + +//============================================================================= +/** + * @file ub_struct_seq.cpp + * + * $Id$ + * + * tests unbounded struct sequences + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "ub_struct_seq.h" -ACE_RCSID (Param_Test, - ub_struct_seq, - "$Id$") - // ************************************************************************ // Test_Struct_Sequence // ************************************************************************ @@ -183,9 +177,9 @@ Test_Struct_Sequence::compare (const Param_Test::StructSeq &s1, || vs1.c != vs2.c || vs1.s != vs2.s || vs1.o != vs2.o - || vs1.f != vs2.f + || !ACE::is_equal (vs1.f, vs2.f) || vs1.b != vs2.b - || vs1.d != vs2.d ) + || !ACE::is_equal (vs1.d, vs2.d)) return 0; } diff --git a/tests/Param_Test/ub_struct_seq.h b/tests/Param_Test/ub_struct_seq.h index 7459c7892f1..2e8a5a3fe71 100644 --- a/tests/Param_Test/ub_struct_seq.h +++ b/tests/Param_Test/ub_struct_seq.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_struct_seq.h -// -// = DESCRIPTION -// Tests unbounded struct sequence -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_struct_seq.h + * + * $Id$ + * + * Tests unbounded struct sequence + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_UNBOUNED_STRUCT_SEQUENCE_H #define PARAM_TEST_UNBOUNED_STRUCT_SEQUENCE_H @@ -28,60 +25,60 @@ class Test_Struct_Sequence { public: + /// ctor Test_Struct_Sequence (void); - // ctor + /// dtor ~Test_Struct_Sequence (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. protected: + /// compare CORBA::Boolean compare (const Param_Test::StructSeq &s1, const Param_Test::StructSeq &s2); - // compare + /// print individual sequence void print_sequence (const Param_Test::StructSeq &s); - // print individual sequence private: + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::StructSeq in_; - // in parameter // these need memory management + /// inout parameter Param_Test::StructSeq_var inout_; - // inout parameter + /// out parameter Param_Test::StructSeq_var out_; - // out parameter + /// return value Param_Test::StructSeq_var ret_; - // return value }; @@ -89,60 +86,60 @@ private: class Test_Unbounded_Struct_Sequence { public: + /// ctor Test_Unbounded_Struct_Sequence (void); - // ctor + /// dtor ~Test_Unbounded_Struct_Sequence (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. protected: + /// compare CORBA::Boolean compare (const Param_Test::PathSpec &s1, const Param_Test::PathSpec &s2); - // compare + /// print individual sequence void print_sequence (const Param_Test::PathSpec &s); - // print individual sequence private: + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::PathSpec in_; - // in parameter // these need memory management + /// inout parameter Param_Test::PathSpec_var inout_; - // inout parameter + /// out parameter Param_Test::PathSpec_var out_; - // out parameter + /// return value Param_Test::PathSpec_var ret_; - // return value }; diff --git a/tests/Param_Test/ub_wstr_seq.cpp b/tests/Param_Test/ub_wstr_seq.cpp index 5761f22f962..7e768fff7de 100644 --- a/tests/Param_Test/ub_wstr_seq.cpp +++ b/tests/Param_Test/ub_wstr_seq.cpp @@ -1,29 +1,22 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_wstr_seq.cpp -// -// = DESCRIPTION -// tests unbounded wide string sequences -// -// = AUTHORS -// Jeff Parsons -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_wstr_seq.cpp + * + * $Id$ + * + * tests unbounded wide string sequences + * + * + * @author Jeff Parsons + */ +//============================================================================= + #include "helper.h" #include "ub_wstr_seq.h" #include "ace/OS_NS_wchar.h" -ACE_RCSID (Param_Test, - ub_wstr_seq, - "$Id$") - // ************************************************************************ // Test_WString_Sequence // ************************************************************************ diff --git a/tests/Param_Test/ub_wstr_seq.h b/tests/Param_Test/ub_wstr_seq.h index 5351240f41c..8e5254d366f 100644 --- a/tests/Param_Test/ub_wstr_seq.h +++ b/tests/Param_Test/ub_wstr_seq.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_wstr_seq.h -// -// = DESCRIPTION -// Tests sequences of wide strings -// -// = AUTHORS -// Jeff Parsons -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_wstr_seq.h + * + * $Id$ + * + * Tests sequences of wide strings + * + * + * @author Jeff Parsons + */ +//============================================================================= + #ifndef PARAM_TEST_UNBOUNDED_WSTRING_SEQUENCE_H #define PARAM_TEST_UNBOUNDED_WSTRING_SEQUENCE_H @@ -28,51 +25,51 @@ class Test_WString_Sequence { public: + /// ctor Test_WString_Sequence (void); - // ctor + /// dtor ~Test_WString_Sequence (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter CORBA::WStringSeq_var in_; - // in parameter + /// inout parameter CORBA::WStringSeq_var inout_; - // inout parameter + /// out parameter CORBA::WStringSeq_var out_; - // out parameter + /// return value CORBA::WStringSeq_var ret_; - // return value }; #endif /* PARAM_TEST_UNBOUNDED_WSTRING_SEQUENCE_H */ diff --git a/tests/Param_Test/ub_wstring.cpp b/tests/Param_Test/ub_wstring.cpp index fe1d49c4f69..370e9738381 100644 --- a/tests/Param_Test/ub_wstring.cpp +++ b/tests/Param_Test/ub_wstring.cpp @@ -1,29 +1,22 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_wstring.cpp -// -// = DESCRIPTION -// tests unbounded wide strings -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_wstring.cpp + * + * $Id$ + * + * tests unbounded wide strings + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> + */ +//============================================================================= + #include "helper.h" #include "ub_wstring.h" #include "ace/OS_NS_wchar.h" -ACE_RCSID (Param_Test, - ub_wstring, - "$Id$") - // ************************************************************************ // Test_Unbounded_WString // ************************************************************************ diff --git a/tests/Param_Test/ub_wstring.h b/tests/Param_Test/ub_wstring.h index 0c11b453c98..66c38ee3769 100644 --- a/tests/Param_Test/ub_wstring.h +++ b/tests/Param_Test/ub_wstring.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ub_wstring.h -// -// = DESCRIPTION -// Tests unbounded wide string -// -// = AUTHORS -// Jeff Parsons <parsons@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file ub_wstring.h + * + * $Id$ + * + * Tests unbounded wide string + * + * + * @author Jeff Parsons <parsons@cs.wustl.edu> + */ +//============================================================================= + #ifndef PARAM_TEST_UNBOUNDED_WSTRING_H #define PARAM_TEST_UNBOUNDED_WSTRING_H @@ -27,51 +24,51 @@ class Test_Unbounded_WString { public: + /// ctor Test_Unbounded_WString (void); - // ctor + /// dtor ~Test_Unbounded_WString (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter CORBA::WChar *in_; - // in parameter + /// inout parameter CORBA::WChar *inout_; - // inout parameter + /// out parameter CORBA::WChar *out_; - // out parameter + /// return value CORBA::WChar *ret_; - // return value }; #endif /* PARAM_TEST_UNBOUNDED_WSTRING_H */ diff --git a/tests/Param_Test/ulonglong.cpp b/tests/Param_Test/ulonglong.cpp index 3098bf9f256..0156640958f 100644 --- a/tests/Param_Test/ulonglong.cpp +++ b/tests/Param_Test/ulonglong.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ulonglong.cpp -// -// = DESCRIPTION -// tests 64 bit longs -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file ulonglong.cpp + * + * $Id$ + * + * tests 64 bit longs + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "ulonglong.h" -ACE_RCSID (Param_Test, - ulonglong, - "$Id$") - Test_ULongLong::Test_ULongLong (void) : opname_ (CORBA::string_dup ("test_ulonglong")) { diff --git a/tests/Param_Test/ulonglong.h b/tests/Param_Test/ulonglong.h index c143ef00a70..e88464cf28f 100644 --- a/tests/Param_Test/ulonglong.h +++ b/tests/Param_Test/ulonglong.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// ulonglong.h -// -// = DESCRIPTION -// Tests 64bit unsigned longs. -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file ulonglong.h + * + * $Id$ + * + * Tests 64bit unsigned longs. + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_ULONGLONG_H #define PARAM_TEST_ULONGLONG_H @@ -24,51 +21,51 @@ class Test_ULongLong { public: + /// ctor Test_ULongLong (void); - // ctor + /// dtor ~Test_ULongLong (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter CORBA::ULongLong in_; - // in parameter + /// inout parameter CORBA::ULongLong inout_; - // inout parameter + /// out parameter CORBA::ULongLong out_; - // out parameter + /// return value CORBA::ULongLong ret_; - // return value }; #endif /* PARAM_TEST_ULONGLONG_H */ diff --git a/tests/Param_Test/var_array.cpp b/tests/Param_Test/var_array.cpp index 01ba3ae9af5..daf31451008 100644 --- a/tests/Param_Test/var_array.cpp +++ b/tests/Param_Test/var_array.cpp @@ -1,28 +1,21 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// var_array.cpp -// -// = DESCRIPTION -// tests fixed size arrays -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file var_array.cpp + * + * $Id$ + * + * tests fixed size arrays + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "var_array.h" -ACE_RCSID (Param_Test, - var_array, - "$Id$") - // ************************************************************************ // Test_Var_Array // ************************************************************************ diff --git a/tests/Param_Test/var_array.h b/tests/Param_Test/var_array.h index 1a9b4e5c08f..863345610a6 100644 --- a/tests/Param_Test/var_array.h +++ b/tests/Param_Test/var_array.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// var_array.h -// -// = DESCRIPTION -// Tests arrays whose base types are of variable size -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file var_array.h + * + * $Id$ + * + * Tests arrays whose base types are of variable size + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_VAR_ARRAY_H #define PARAM_TEST_VAR_ARRAY_H @@ -27,58 +24,58 @@ class Test_Var_Array { public: + /// ctor Test_Var_Array (void); - // ctor + /// dtor ~Test_Var_Array (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// compare arrays CORBA::Boolean compare (const Param_Test::Var_Array_slice *a1, const Param_Test::Var_Array_slice *a2); - // compare arrays + /// print an array void print (const Param_Test::Var_Array_slice *a); - // print an array + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::Var_Array in_; - // in parameter + /// inout parameter Param_Test::Var_Array inout_; - // inout parameter + /// out parameter Param_Test::Var_Array_var out_; - // out parameter + /// return value Param_Test::Var_Array_var ret_; - // return value }; #endif /* PARAM_TEST_VAR_ARRAY_H */ diff --git a/tests/Param_Test/var_struct.cpp b/tests/Param_Test/var_struct.cpp index 5bf90ad5044..4dddf7fbfdf 100644 --- a/tests/Param_Test/var_struct.cpp +++ b/tests/Param_Test/var_struct.cpp @@ -1,28 +1,21 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// var_struct.cpp -// -// = DESCRIPTION -// test variable sized structures -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ +//============================================================================= +/** + * @file var_struct.cpp + * + * $Id$ + * + * test variable sized structures + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #include "helper.h" #include "var_struct.h" -ACE_RCSID (Param_Test, - var_struct, - "$Id$") - // ************************************************************************ // Test_Var_Struct // ************************************************************************ @@ -153,9 +146,9 @@ CORBA::Boolean Test_Var_Struct::check_validity (void) { CORBA::Boolean flag = 0; - if (this->in_.dbl == this->inout_->dbl && - this->in_.dbl == this->out_->dbl && - this->in_.dbl == this->ret_->dbl && + if (ACE::is_equal (this->in_.dbl, this->inout_->dbl) && + ACE::is_equal (this->in_.dbl, this->out_->dbl) && + ACE::is_equal (this->in_.dbl, this->ret_->dbl) && (!ACE_OS::strcmp (this->in_.dummy1, this->inout_->dummy1)) && (!ACE_OS::strcmp (this->in_.dummy1, this->out_->dummy1)) && (!ACE_OS::strcmp (this->in_.dummy1, this->ret_->dummy1)) && diff --git a/tests/Param_Test/var_struct.h b/tests/Param_Test/var_struct.h index 79f15ff4ded..dcc2f16d0c8 100644 --- a/tests/Param_Test/var_struct.h +++ b/tests/Param_Test/var_struct.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Param_Test -// -// = FILENAME -// var_struct.h -// -// = DESCRIPTION -// Tests variable sized structures -// -// = AUTHORS -// Aniruddha Gokhale -// -// ============================================================================ + +//============================================================================= +/** + * @file var_struct.h + * + * $Id$ + * + * Tests variable sized structures + * + * + * @author Aniruddha Gokhale + */ +//============================================================================= + #ifndef PARAM_TEST_VAR_STRUCT_H #define PARAM_TEST_VAR_STRUCT_H @@ -28,52 +25,52 @@ class Test_Var_Struct { public: + /// ctor Test_Var_Struct (void); - // ctor + /// dtor ~Test_Var_Struct (void); - // dtor + /// run the SII test int run_sii_test (Param_Test_ptr objref); - // run the SII test + /// return operation name const char *opname (void) const; - // return operation name + /// set values for parameters int init_parameters (Param_Test_ptr objref); - // set values for parameters + /// reset values for CORBA int reset_parameters (void); - // reset values for CORBA + /// check if results are valid CORBA::Boolean check_validity (void); - // check if results are valid + /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); - // check if results are valid. This is used for DII results + /// print all the values void print_values (void); - // print all the values + /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); - // invoke DII request with appropriate exception handling. private: + /// operation name char *opname_; - // operation name + /// in parameter Param_Test::Var_Struct in_; - // in parameter // these need memory management + /// inout parameter Param_Test::Var_Struct_var inout_; - // inout parameter + /// out parameter Param_Test::Var_Struct_var out_; - // out parameter + /// return value Param_Test::Var_Struct_var ret_; - // return value }; #endif /* PARAM_TEST_VAR_STRUCT_H */ diff --git a/tests/Permanent_Forward/Makefile.am b/tests/Permanent_Forward/Makefile.am deleted file mode 100644 index 06863c3a49e..00000000000 --- a/tests/Permanent_Forward/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.Permanent_Forward_StubTest.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = StubTest - -StubTest_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -StubTest_SOURCES = \ - StubTest.cpp - -StubTest_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.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/Permanent_Forward/StubTest.cpp b/tests/Permanent_Forward/StubTest.cpp index a2cacd867ff..f013183931e 100644 --- a/tests/Permanent_Forward/StubTest.cpp +++ b/tests/Permanent_Forward/StubTest.cpp @@ -29,10 +29,6 @@ : ACE_VERSIONED_NAMESPACE_NAME::__ace_assert(__FILE__, __LINE__, ACE_TEXT_CHAR_TO_TCHAR (#X))) #endif -ACE_RCSID (Permanent_Forward, - StubTest, - "$Id$") - static bool is_endpoint (TAO_Profile *profile, const char *host, unsigned short port) { diff --git a/tests/Policies/Makefile.am b/tests/Policies/Makefile.am deleted file mode 100644 index b7e1a866ee2..00000000000 --- a/tests/Policies/Makefile.am +++ /dev/null @@ -1,84 +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) - - -## Makefile.Policies_Manipulation.am - -if BUILD_CORBA_MESSAGING -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 = Manipulation - -Manipulation_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Manipulation_SOURCES = \ - Manipulation.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Manipulation_LDADD = \ - $(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_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 - -## 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/Policies/Manipulation.cpp b/tests/Policies/Manipulation.cpp index becfd63d8ef..2feb981f76d 100644 --- a/tests/Policies/Manipulation.cpp +++ b/tests/Policies/Manipulation.cpp @@ -11,8 +11,6 @@ #include "ace/Task.h" #include "ace/OS_NS_time.h" -ACE_RCSID(Policies, Manipulation, "$Id$") - int nthreads = 5; int niterations = 100; @@ -41,7 +39,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; } @@ -63,7 +61,7 @@ public: // The thread entry point. private: - void perform_iteration (ACE_RANDR_TYPE &seed, + void perform_iteration (unsigned int *seed, CORBA::PolicyList_var &policies, CORBA::PolicyManager_ptr policy_manager, CORBA::PolicyCurrent_ptr policy_current); @@ -140,7 +138,7 @@ Manipulation::Manipulation (CORBA::ORB_ptr orb, } void -Manipulation::perform_iteration (ACE_RANDR_TYPE &seed, +Manipulation::perform_iteration (unsigned int *seed, CORBA::PolicyList_var &policies, CORBA::PolicyManager_ptr policy_manager, CORBA::PolicyCurrent_ptr policy_current) @@ -281,11 +279,11 @@ Manipulation::svc (void) try { #ifndef ACE_LACKS_LONGLONG_T - ACE_RANDR_TYPE seed = - static_cast<ACE_RANDR_TYPE> (ACE_OS::gethrtime ()); + unsigned int seed = + static_cast<unsigned int> (ACE_OS::gethrtime ()); #else - ACE_RANDR_TYPE seed = - static_cast<ACE_RANDR_TYPE> (ACE_OS::gethrtime().lo()); + unsigned int seed = + static_cast<unsigned int> (ACE_OS::gethrtime().lo()); #endif CORBA::Object_var object = this->orb_->resolve_initial_references ("ORBPolicyManager"); @@ -302,7 +300,7 @@ Manipulation::svc (void) for (int i = 0; i != this->niterations_; ++i) { CORBA::PolicyList_var policies; - this->perform_iteration (seed, + this->perform_iteration (&seed, policies, policy_manager.in (), policy_current.in ()); diff --git a/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp b/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp index 61d0ffc5046..38371695a84 100644 --- a/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp +++ b/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp @@ -13,12 +13,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" - -ACE_RCSID (AMI, - Client_Interceptor, - "$Id$") - - unsigned long Echo_Client_Request_Interceptor::request_count = 0; unsigned long Echo_Client_Request_Interceptor::reply_count = 0; unsigned long Echo_Client_Request_Interceptor::other_count = 0; diff --git a/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp index 9e3115b5d4e..e438dcc3690 100644 --- a/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp @@ -9,8 +9,6 @@ #include "Client_ORBInitializer.h" #include "Client_Interceptor.h" -ACE_RCSID(Portable_Interceptor_AMI, Client_ORBInitializer, "$Id$") - Client_ORBInitializer::Client_ORBInitializer () { } diff --git a/tests/Portable_Interceptors/AMI/Echo.cpp b/tests/Portable_Interceptors/AMI/Echo.cpp index 2f644181f4d..0d0b75a8b93 100644 --- a/tests/Portable_Interceptors/AMI/Echo.cpp +++ b/tests/Portable_Interceptors/AMI/Echo.cpp @@ -7,8 +7,6 @@ */ #include "Echo.h" -ACE_RCSID(Portable_Interceptors_AMI, Echo, "$Id$") - Echo::Echo(CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) { diff --git a/tests/Portable_Interceptors/AMI/Echo_Handler.cpp b/tests/Portable_Interceptors/AMI/Echo_Handler.cpp index 61f218c4c0c..1f2fc079948 100644 --- a/tests/Portable_Interceptors/AMI/Echo_Handler.cpp +++ b/tests/Portable_Interceptors/AMI/Echo_Handler.cpp @@ -7,12 +7,6 @@ */ #include "Echo_Handler.h" - -ACE_RCSID (AMI, - Echo_Handler, - "$Id$") - - Echo_Handler::Echo_Handler(void) : replies_ (0) { diff --git a/tests/Portable_Interceptors/AMI/Makefile.am b/tests/Portable_Interceptors/AMI/Makefile.am deleted file mode 100644 index 762f6d7f170..00000000000 --- a/tests/Portable_Interceptors/AMI/Makefile.am +++ /dev/null @@ -1,146 +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.PI_AMI_Idl.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -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) -GC $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.PI_AMI_Client.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_Interceptor.cpp \ - Client_ORBInitializer.cpp \ - Echo_Handler.cpp \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - Client_Interceptor.h \ - Client_ORBInitializer.h \ - Echo_Handler.h - -client_LDADD = \ - $(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_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## Makefile.PI_AMI_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Echo.cpp \ - Server_Interceptor.cpp \ - Server_ORBInitializer.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Echo.h \ - Server_Interceptor.h \ - Server_ORBInitializer.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.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_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING -endif BUILD_AMI - -## 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/Portable_Interceptors/AMI/Server_Interceptor.cpp b/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp index 1d56f937708..3839b1c0046 100644 --- a/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp +++ b/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp @@ -11,12 +11,6 @@ #include "tao/OctetSeqC.h" #include "ace/OS_NS_string.h" - -ACE_RCSID (AMI, - Server_Interceptor, - "$Id$") - - Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) { } diff --git a/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp index 4fc70427165..95528d118c6 100644 --- a/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp @@ -9,10 +9,6 @@ #include "Server_ORBInitializer.h" #include "Server_Interceptor.h" -ACE_RCSID (AMI, - Server_ORBInitializer, - "$Id$") - Server_ORBInitializer::Server_ORBInitializer (void) { } diff --git a/tests/Portable_Interceptors/AMI/client.cpp b/tests/Portable_Interceptors/AMI/client.cpp index 4e20b64cfa9..b156ee49c15 100644 --- a/tests/Portable_Interceptors/AMI/client.cpp +++ b/tests/Portable_Interceptors/AMI/client.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "Echo_Handler.h" #include "Client_ORBInitializer.h" #include "Client_Interceptor.h" @@ -8,11 +10,6 @@ #include "ace/Log_Msg.h" #include <iostream> -ACE_RCSID (AMI, - client, - "$Id$") - - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); static int exit_status = 0; const unsigned long ITERATIONS = 100; @@ -39,7 +36,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/tests/Portable_Interceptors/AMI/server.cpp b/tests/Portable_Interceptors/AMI/server.cpp index 3a17e6a96c3..b02337b54a6 100644 --- a/tests/Portable_Interceptors/AMI/server.cpp +++ b/tests/Portable_Interceptors/AMI/server.cpp @@ -1,17 +1,11 @@ +// $Id$ + #include "Echo.h" #include "Server_ORBInitializer.h" - #include "tao/ORBInitializer_Registry.h" - #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" - -ACE_RCSID (Portable_Interceptors, - AMI, - "$Id$") - - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -36,7 +30,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/tests/Portable_Interceptors/AdvSlot/Makefile.am b/tests/Portable_Interceptors/AdvSlot/Makefile.am deleted file mode 100644 index bb138ee2388..00000000000 --- a/tests/Portable_Interceptors/AdvSlot/Makefile.am +++ /dev/null @@ -1,105 +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.AdvSlot_Idl.am - -BUILT_SOURCES = \ - StateTransferC.cpp \ - StateTransferC.h \ - StateTransferC.inl \ - StateTransferS.cpp \ - StateTransferS.h \ - StateTransferS.inl - -CLEANFILES = \ - StateTransfer-stamp \ - StateTransferC.cpp \ - StateTransferC.h \ - StateTransferC.inl \ - StateTransferS.cpp \ - StateTransferS.h \ - StateTransferS.inl - -StateTransferC.cpp StateTransferC.h StateTransferC.inl StateTransferS.cpp StateTransferS.h StateTransferS.inl: StateTransfer-stamp - -StateTransfer-stamp: $(srcdir)/StateTransfer.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/StateTransfer.idl - @touch $@ - -noinst_HEADERS = \ - StateTransfer.idl - -## Makefile.AdvSlot_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - StateTransferC.cpp \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.AdvSlot_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - StateTransferC.cpp \ - StateTransferS.cpp \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/Portable_Interceptors/AdvSlot/server.cpp b/tests/Portable_Interceptors/AdvSlot/server.cpp index 119ecb8bbe8..007d6fca674 100644 --- a/tests/Portable_Interceptors/AdvSlot/server.cpp +++ b/tests/Portable_Interceptors/AdvSlot/server.cpp @@ -40,7 +40,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/tests/Portable_Interceptors/AdvSlotDblCpy/Makefile.am b/tests/Portable_Interceptors/AdvSlotDblCpy/Makefile.am deleted file mode 100644 index b8eaade1b8c..00000000000 --- a/tests/Portable_Interceptors/AdvSlotDblCpy/Makefile.am +++ /dev/null @@ -1,105 +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.AdvSlotDblCpy_Idl.am - -BUILT_SOURCES = \ - InvokeMeC.cpp \ - InvokeMeC.h \ - InvokeMeC.inl \ - InvokeMeS.cpp \ - InvokeMeS.h \ - InvokeMeS.inl - -CLEANFILES = \ - InvokeMe-stamp \ - InvokeMeC.cpp \ - InvokeMeC.h \ - InvokeMeC.inl \ - InvokeMeS.cpp \ - InvokeMeS.h \ - InvokeMeS.inl - -InvokeMeC.cpp InvokeMeC.h InvokeMeC.inl InvokeMeS.cpp InvokeMeS.h InvokeMeS.inl: InvokeMe-stamp - -InvokeMe-stamp: $(srcdir)/InvokeMe.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/InvokeMe.idl - @touch $@ - -noinst_HEADERS = \ - InvokeMe.idl - -## Makefile.AdvSlotDblCpy_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - InvokeMeC.cpp \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.AdvSlotDblCpy_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - InvokeMeC.cpp \ - InvokeMeS.cpp \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp b/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp index c13845c7f9c..1ca2da2cf21 100644 --- a/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp +++ b/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp @@ -42,7 +42,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/tests/Portable_Interceptors/AdvSlotExt/Makefile.am b/tests/Portable_Interceptors/AdvSlotExt/Makefile.am deleted file mode 100644 index d97219bdbc7..00000000000 --- a/tests/Portable_Interceptors/AdvSlotExt/Makefile.am +++ /dev/null @@ -1,105 +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.AdvSlotExt_Idl.am - -BUILT_SOURCES = \ - StateTransferC.cpp \ - StateTransferC.h \ - StateTransferC.inl \ - StateTransferS.cpp \ - StateTransferS.h \ - StateTransferS.inl - -CLEANFILES = \ - StateTransfer-stamp \ - StateTransferC.cpp \ - StateTransferC.h \ - StateTransferC.inl \ - StateTransferS.cpp \ - StateTransferS.h \ - StateTransferS.inl - -StateTransferC.cpp StateTransferC.h StateTransferC.inl StateTransferS.cpp StateTransferS.h StateTransferS.inl: StateTransfer-stamp - -StateTransfer-stamp: $(srcdir)/StateTransfer.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/StateTransfer.idl - @touch $@ - -noinst_HEADERS = \ - StateTransfer.idl - -## Makefile.AdvSlotExt_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - StateTransferC.cpp \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.AdvSlotExt_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - StateTransferC.cpp \ - StateTransferS.cpp \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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/tests/Portable_Interceptors/AdvSlotExt/server.cpp b/tests/Portable_Interceptors/AdvSlotExt/server.cpp index d64b3d63c9d..adcaa021347 100644 --- a/tests/Portable_Interceptors/AdvSlotExt/server.cpp +++ b/tests/Portable_Interceptors/AdvSlotExt/server.cpp @@ -36,7 +36,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/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp index d6c1ed13d55..7556789e871 100644 --- a/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp @@ -1,14 +1,10 @@ // -*- C++ -*- -// // $Id$ -// #include "Client_ORBInitializer.h" #include "client_interceptors.h" #include "Interceptor_Type.h" -ACE_RCSID (Benchmark, Client_ORBInitializer, "$Id$") - Client_ORBInitializer::Client_ORBInitializer (int interceptor_type) : interceptor_type_ (interceptor_type) { diff --git a/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp b/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp index d92a5761c36..5ecdecaeba5 100644 --- a/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp +++ b/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp @@ -1,12 +1,8 @@ // -*- C++ -*- -// // $Id$ -// #include "Interceptor_Type.h" -#include "ace/OS_String.h" - -ACE_RCSID (Benchmark, Interceptor_Type, "$Id$") +#include "ace/OS_NS_string.h" void get_interceptor_type (int argc, ACE_TCHAR *argv[], int &interceptor_type) diff --git a/tests/Portable_Interceptors/Benchmark/Makefile.am b/tests/Portable_Interceptors/Benchmark/Makefile.am deleted file mode 100644 index d1f42075650..00000000000 --- a/tests/Portable_Interceptors/Benchmark/Makefile.am +++ /dev/null @@ -1,130 +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.PI_Benchmark_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) $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.PI_Benchmark_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - Interceptor_Type.cpp \ - client.cpp \ - client_interceptors.cpp \ - marker.cpp \ - testC.cpp \ - Client_ORBInitializer.h \ - Interceptor_Type.h \ - client_interceptors.h \ - marker.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.PI_Benchmark_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Interceptor_Type.cpp \ - Server_ORBInitializer.cpp \ - marker.cpp \ - server.cpp \ - server_interceptors.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Interceptor_Type.h \ - Server_ORBInitializer.h \ - marker.h \ - server_interceptors.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_INTERCEPTORS -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/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp index 47a9da3516c..afb0b9d78f7 100644 --- a/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp @@ -1,16 +1,10 @@ // -*- C++ -*- -// // $Id$ -// #include "Server_ORBInitializer.h" #include "Interceptor_Type.h" #include "server_interceptors.h" -ACE_RCSID (Benchmark, - Server_ORBInitializer, - "$Id$") - Server_ORBInitializer::Server_ORBInitializer (int interceptor_type) : interceptor_type_ (interceptor_type) { diff --git a/tests/Portable_Interceptors/Benchmark/client.cpp b/tests/Portable_Interceptors/Benchmark/client.cpp index 6eef1cd21d9..be1ad8ab0fd 100644 --- a/tests/Portable_Interceptors/Benchmark/client.cpp +++ b/tests/Portable_Interceptors/Benchmark/client.cpp @@ -11,10 +11,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_errno.h" -ACE_RCSID (Benchmark, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int niterations = 5; int register_interceptor = 1; diff --git a/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp b/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp index dc2eefb25f2..476a46d1dd4 100644 --- a/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp +++ b/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp @@ -7,10 +7,6 @@ #include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" -ACE_RCSID (Benchmark, - client_interceptors, - "$Id$") - const CORBA::ULong request_ctx_id = 0xdead; //const CORBA::ULong reply_ctx_id = 0xbeef; // Never used. diff --git a/tests/Portable_Interceptors/Benchmark/server.cpp b/tests/Portable_Interceptors/Benchmark/server.cpp index c84b894a241..a80e5756488 100644 --- a/tests/Portable_Interceptors/Benchmark/server.cpp +++ b/tests/Portable_Interceptors/Benchmark/server.cpp @@ -9,8 +9,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Benchmark, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int register_interceptor = 1; @@ -35,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/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp b/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp index 9464721742f..f4635a5725c 100644 --- a/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp +++ b/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp @@ -7,10 +7,6 @@ #include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" -ACE_RCSID (Benchmark, - server_interceptors, - "$Id$") - const CORBA::ULong request_ctx_id = 0xdead; //const CORBA::ULong reply_ctx_id = 0xbeef; // Never used. diff --git a/tests/Portable_Interceptors/Benchmark/test.idl b/tests/Portable_Interceptors/Benchmark/test.idl index 734ad8e5301..577a19bddc5 100644 --- a/tests/Portable_Interceptors/Benchmark/test.idl +++ b/tests/Portable_Interceptors/Benchmark/test.idl @@ -1,21 +1,17 @@ -// -*- IDL -*- -// -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Portable_Interceptors -// -// = FILENAME -// test.idl -// -// = DESCRIPTION -// Simple IDL file to test portable interceptor support. -// -// = AUTHORS -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// ============================================================================ + +//============================================================================= +/** + * @file test.idl + * + * $Id$ + * + * Simple IDL file to test portable interceptor support. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + module Test_Interceptors { diff --git a/tests/Portable_Interceptors/Benchmark/test_i.cpp b/tests/Portable_Interceptors/Benchmark/test_i.cpp index c4b676c7d06..59c01162ab9 100644 --- a/tests/Portable_Interceptors/Benchmark/test_i.cpp +++ b/tests/Portable_Interceptors/Benchmark/test_i.cpp @@ -4,8 +4,6 @@ #include "marker.h" #include "ace/OS_NS_string.h" -ACE_RCSID(Benchmark, test_i, "$Id$") - Secure_Vault_i::Secure_Vault_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Portable_Interceptors/Benchmark/test_i.h b/tests/Portable_Interceptors/Benchmark/test_i.h index f6e15213c34..989976d0e32 100644 --- a/tests/Portable_Interceptors/Benchmark/test_i.h +++ b/tests/Portable_Interceptors/Benchmark/test_i.h @@ -1,36 +1,36 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Portable_Interceptors/Benchmark -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Nanbor Wang -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Nanbor Wang + */ +//============================================================================= + #ifndef TAO_INTERCEPTOR_TEST_I_H #define TAO_INTERCEPTOR_TEST_I_H #include "testS.h" +/** + * @class Secure_Vault_i + * + * Implements the Secure_Vault interface in test.idl + */ class Secure_Vault_i : public POA_Test_Interceptors::Secure_Vault { - // = DESCRIPTION - // Implements the Secure_Vault interface in test.idl public: + /// ctor Secure_Vault_i (CORBA::ORB_ptr orb); - // ctor virtual CORBA::Short ready (void); + /// Passwd sent in the service context list virtual void authenticate (const char * user); - // Passwd sent in the service context list virtual CORBA::Long update_records (CORBA::Long id, const Test_Interceptors::Secure_Vault::Record & val); @@ -38,8 +38,8 @@ public: virtual void shutdown (void); private: + /// The ORB pointer (for shutdown.) CORBA::ORB_var orb_; - // The ORB pointer (for shutdown.) }; #endif /* TAO_INTERCEPTOR_TEST_I_H */ diff --git a/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp index 2a0776226f0..778c95a2df9 100644 --- a/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp @@ -1,13 +1,9 @@ // -*- C++ -*- -// // $Id$ -// #include "Client_ORBInitializer.h" #include "client_interceptor.h" -ACE_RCSID (Service_Context_Manipulation, Client_ORBInitializer, "$Id$") - Client_ORBInitializer::Client_ORBInitializer (void) { } diff --git a/tests/Portable_Interceptors/Bug_1559/Makefile.am b/tests/Portable_Interceptors/Bug_1559/Makefile.am deleted file mode 100644 index 5d112b0ccaa..00000000000 --- a/tests/Portable_Interceptors/Bug_1559/Makefile.am +++ /dev/null @@ -1,122 +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_1559_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_1559_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - client.cpp \ - client_interceptor.cpp \ - testC.cpp \ - Client_ORBInitializer.h \ - client_interceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.Bug_1559_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Server_ORBInitializer.cpp \ - server.cpp \ - server_interceptor.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - server_interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_INTERCEPTORS -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/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp index b39d4b07273..d76f6edc043 100644 --- a/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp @@ -1,14 +1,8 @@ // -*- C++ -*- -// // $Id$ -// #include "Server_ORBInitializer.h" -ACE_RCSID (Bug_1559, - Server_ORBInitializer, - "$Id$") - Server_ORBInitializer::Server_ORBInitializer (void) { } diff --git a/tests/Portable_Interceptors/Bug_1559/client.cpp b/tests/Portable_Interceptors/Bug_1559/client.cpp index c7f335decc8..c7672a26863 100644 --- a/tests/Portable_Interceptors/Bug_1559/client.cpp +++ b/tests/Portable_Interceptors/Bug_1559/client.cpp @@ -5,8 +5,6 @@ #include "Client_ORBInitializer.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID(Interceptors, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp b/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp index 2538c5dc5c2..6744b086064 100644 --- a/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp +++ b/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp @@ -6,10 +6,6 @@ #include "tao/ORB_Constants.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Bug_1559, - client_interceptor, - "$Id$") - const IOP::ServiceId service_id = 0xdeadbeef; const char *request_msg = "REQUEST message"; const char *reply_msg = "REPLY message"; diff --git a/tests/Portable_Interceptors/Bug_1559/server.cpp b/tests/Portable_Interceptors/Bug_1559/server.cpp index ad934d1d728..e7af8982051 100644 --- a/tests/Portable_Interceptors/Bug_1559/server.cpp +++ b/tests/Portable_Interceptors/Bug_1559/server.cpp @@ -6,10 +6,6 @@ #include "Server_ORBInitializer.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (Service_Context_Manipulation, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -33,7 +29,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/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp b/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp index dff89a0c69e..152ccde0295 100644 --- a/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp +++ b/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp @@ -6,10 +6,6 @@ #include "tao/ORB_Constants.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Bug_1559, - server_interceptor, - "$Id$") - const IOP::ServiceId service_id = 0xdeadbeef; const char *request_msg = "REQUEST message"; const char *reply_msg = "REPLY message"; diff --git a/tests/Portable_Interceptors/Bug_1559/test.idl b/tests/Portable_Interceptors/Bug_1559/test.idl index 79a06a14351..2e858b32098 100644 --- a/tests/Portable_Interceptors/Bug_1559/test.idl +++ b/tests/Portable_Interceptors/Bug_1559/test.idl @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Interceptors -// -// = FILENAME -// test.idl -// -// = DESCRIPTION -// Simple IDL file to test portable interceptor support. -// -// = AUTHORS -// Nanbor Wang <nanbor@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file test.idl + * + * $Id$ + * + * Simple IDL file to test portable interceptor support. + * + * + * @author Nanbor Wang <nanbor@cs.wustl.edu> + */ +//============================================================================= + module Test_Interceptors { diff --git a/tests/Portable_Interceptors/Bug_1559/test_i.cpp b/tests/Portable_Interceptors/Bug_1559/test_i.cpp index 0d201962ba4..75d61f3827e 100644 --- a/tests/Portable_Interceptors/Bug_1559/test_i.cpp +++ b/tests/Portable_Interceptors/Bug_1559/test_i.cpp @@ -2,11 +2,6 @@ #include "test_i.h" -ACE_RCSID (Service_Context_Manipulation, - test_i, - "$Id$") - - Visual_i::Visual_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp index ea422a7f284..e578f750ae8 100644 --- a/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp @@ -1,12 +1,8 @@ // -*- C++ -*- -// // $Id$ -// #include "Client_ORBInitializer.h" -ACE_RCSID (Bug_2088, Client_ORBInitializer, "$Id$") - Client_ORBInitializer::Client_ORBInitializer (void) : pre_init_called (false), post_init_called (false) diff --git a/tests/Portable_Interceptors/Bug_2088/Makefile.am b/tests/Portable_Interceptors/Bug_2088/Makefile.am deleted file mode 100644 index 4ecbd165473..00000000000 --- a/tests/Portable_Interceptors/Bug_2088/Makefile.am +++ /dev/null @@ -1,51 +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_2088_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - client.cpp \ - Client_ORBInitializer.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -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/Portable_Interceptors/Bug_2088/client.cpp b/tests/Portable_Interceptors/Bug_2088/client.cpp index 2fc166203f6..1eab0d806a8 100644 --- a/tests/Portable_Interceptors/Bug_2088/client.cpp +++ b/tests/Portable_Interceptors/Bug_2088/client.cpp @@ -4,8 +4,6 @@ #include "Client_ORBInitializer.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID(Interceptors, client, "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/tests/Portable_Interceptors/Bug_2133/Hello.cpp b/tests/Portable_Interceptors/Bug_2133/Hello.cpp index 7b9497529ec..430c542a0a3 100644 --- a/tests/Portable_Interceptors/Bug_2133/Hello.cpp +++ b/tests/Portable_Interceptors/Bug_2133/Hello.cpp @@ -1,9 +1,6 @@ -// // $Id$ -// -#include "Hello.h" -ACE_RCSID(Hello, Hello, "Hello.cpp,v 1.3 2002/01/29 20:21:07 okellogg Exp") +#include "Hello.h" Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/tests/Portable_Interceptors/Bug_2133/Makefile.am b/tests/Portable_Interceptors/Bug_2133/Makefile.am deleted file mode 100644 index bad868e5b6e..00000000000 --- a/tests/Portable_Interceptors/Bug_2133/Makefile.am +++ /dev/null @@ -1,111 +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_2133_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 -Sp $(srcdir)/Test.idl - @touch $@ - -noinst_HEADERS = \ - Test.idl - -## Makefile.Bug_2133_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - ClientORBInitializer.cpp \ - ClientRequest_Interceptor.cpp \ - TestC.cpp \ - client.cpp \ - ClientORBInitializer.h \ - ClientRequest_Interceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2133_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h - -server_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/Portable_Interceptors/Bug_2133/client.cpp b/tests/Portable_Interceptors/Bug_2133/client.cpp index d75ca74b237..50dd18fa608 100644 --- a/tests/Portable_Interceptors/Bug_2133/client.cpp +++ b/tests/Portable_Interceptors/Bug_2133/client.cpp @@ -6,9 +6,6 @@ #include "ClientORBInitializer.h" #include "tao/ORBInitializer_Registry.h" - -ACE_RCSID(Hello, client, "client.cpp,v 1.5 2002/01/29 20:21:07 okellogg Exp") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int @@ -33,7 +30,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/tests/Portable_Interceptors/Bug_2133/server.cpp b/tests/Portable_Interceptors/Bug_2133/server.cpp index 95d61429e99..2017e62d471 100644 --- a/tests/Portable_Interceptors/Bug_2133/server.cpp +++ b/tests/Portable_Interceptors/Bug_2133/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Hello, - server, - "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +28,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/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp index 405d64c01a2..c11f53f3fee 100644 --- a/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp @@ -1,13 +1,9 @@ // -*- C++ -*- -// // $Id$ -// #include "Client_ORBInitializer.h" #include "client_interceptor.h" -ACE_RCSID (Bug_2510_Regression, Client_ORBInitializer, "$Id$") - Client_ORBInitializer::Client_ORBInitializer (void) { } diff --git a/tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am b/tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am deleted file mode 100644 index 5f6c038bf27..00000000000 --- a/tests/Portable_Interceptors/Bug_2510_Regression/Makefile.am +++ /dev/null @@ -1,122 +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_2510_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_2510_Regression_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - client.cpp \ - client_interceptor.cpp \ - testC.cpp \ - Client_ORBInitializer.h \ - client_interceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.Bug_2510_Regression_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Server_ORBInitializer.cpp \ - server.cpp \ - server_interceptor.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - server_interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_INTERCEPTORS -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/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp index 7820c79abef..182d056edba 100644 --- a/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp @@ -1,15 +1,9 @@ // -*- C++ -*- -// // $Id$ -// #include "Server_ORBInitializer.h" extern PortableInterceptor::SlotId slotId; -ACE_RCSID (Bug_2510, - Server_ORBInitializer, - "$Id$") - Server_ORBInitializer::Server_ORBInitializer (void) { } diff --git a/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp b/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp index 71f8f39bd63..3b0965ad24b 100644 --- a/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp +++ b/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp @@ -7,8 +7,6 @@ #include "Client_ORBInitializer.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID(Bug_2510_Regression, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp b/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp index 2c261b4fbef..5c27180d963 100644 --- a/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp +++ b/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp @@ -6,10 +6,6 @@ #include "tao/ORB_Constants.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Bug_2510_Regression, - client_interceptor, - "$Id$") - const IOP::ServiceId service_id = 0x08154711; const char * const request_msg = "TEST 0123456789 TEST"; diff --git a/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp b/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp index 2ee6f70d78a..9061a527d11 100644 --- a/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp +++ b/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp @@ -6,10 +6,6 @@ #include "tao/ORBInitializer_Registry.h" #include "Server_ORBInitializer.h" -ACE_RCSID (Bug_2510_Regression, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -33,7 +29,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/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp b/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp index 896c5da8d12..97e8b1004c2 100644 --- a/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp +++ b/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp @@ -1,15 +1,10 @@ -// test_i.cpp,v 1.1 2003/08/27 22:43:35 edwardgt Exp +// $Id$ #include "test_i.h" #include "tao/PI/PI.h" extern PortableInterceptor::SlotId slotId; -ACE_RCSID (Bug_2510_Regression, - test_i, - "$Id$") - - Visual_i::Visual_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp index c055c72e632..b67fbb88829 100644 --- a/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "Client_ORBInitializer.h" -ACE_RCSID (Redirection, - Client_ORBInitializer, - "$Id$") - #if TAO_HAS_INTERCEPTORS == 1 #include "Client_Request_Interceptor.h" diff --git a/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp b/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp index e4a740cb650..2e00425798a 100644 --- a/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp +++ b/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "Client_Request_Interceptor.h" #include "testC.h" @@ -7,10 +8,6 @@ #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Redirection, - Client_Request_Interceptor, - "$Id$") - Client_Request_Interceptor::Client_Request_Interceptor ( const char *orb_id, const char *first_forward_str, const char *second_forward_str) @@ -58,7 +55,7 @@ Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) { ++this->exception_count_; - ACE_DEBUG ((LM_DEBUG, "received exception %d\n", + ACE_DEBUG ((LM_DEBUG, "received exception %d\n", this->exception_count_)); if (CORBA::is_nil (this->orb_.in ())) { diff --git a/tests/Portable_Interceptors/Bug_3079/Makefile.am b/tests/Portable_Interceptors/Bug_3079/Makefile.am deleted file mode 100644 index 8756201dd5a..00000000000 --- a/tests/Portable_Interceptors/Bug_3079/Makefile.am +++ /dev/null @@ -1,128 +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_3079_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_3079_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - Client_Request_Interceptor.cpp \ - client.cpp \ - testC.cpp \ - Client_ORBInitializer.h \ - Client_Request_Interceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.Bug_3079_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - CrashPoint.cpp \ - Server_ORBInitializer.cpp \ - Server_Request_Interceptor.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - CrashPoint.h \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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_INTERCEPTORS -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/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp index 33fb284f0c2..8a83f147441 100644 --- a/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "Server_ORBInitializer.h" -ACE_RCSID (Redirection, - Server_ORBInitializer, - "$Id$") - #if TAO_HAS_INTERCEPTORS == 1 #include "Server_Request_Interceptor.h" diff --git a/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp b/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp index 3123772c7cb..52449966d7f 100644 --- a/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp +++ b/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp @@ -1,14 +1,11 @@ // -*- C++ -*- +// $Id$ #include "Server_Request_Interceptor.h" #include "tao/ORB_Constants.h" #include "ace/Log_Msg.h" #include "CrashPoint.h" -ACE_RCSID (Redirection, - Server_Request_Interceptor, - "$Id$") - Server_Request_Interceptor::Server_Request_Interceptor (void) : request_count_ (0) { diff --git a/tests/Portable_Interceptors/Bug_3079/client.cpp b/tests/Portable_Interceptors/Bug_3079/client.cpp index 7a89cf657e4..04ac47995c7 100644 --- a/tests/Portable_Interceptors/Bug_3079/client.cpp +++ b/tests/Portable_Interceptors/Bug_3079/client.cpp @@ -1,14 +1,11 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "testC.h" #include "Client_ORBInitializer.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (Redirection, - client, - "$Id$") - const ACE_TCHAR *ior1 = 0; const ACE_TCHAR *ior2 = 0; const ACE_TCHAR *ior3 = 0; diff --git a/tests/Portable_Interceptors/Bug_3079/run_test.pl b/tests/Portable_Interceptors/Bug_3079/run_test.pl index a0f0d93247b..def26a31c2c 100755 --- a/tests/Portable_Interceptors/Bug_3079/run_test.pl +++ b/tests/Portable_Interceptors/Bug_3079/run_test.pl @@ -36,7 +36,7 @@ $client->DeleteFile ($iorbase3); $SV1 = $server1->CreateProcess ("server", "-o $server1_iorfile -c 1 -n 1 -s 1"); $SV2 = $server2->CreateProcess ("server", "-o $server2_iorfile -n 2 -s 2"); $SV3 = $server3->CreateProcess ("server", "-o $server3_iorfile -n 3 -s 3"); -$CL = $client->CreateProcess ("client", +$CL = $client->CreateProcess ("client", "-p file://$client_iorfile1 -f file://$client_iorfile2 -s file://$client_iorfile3"); $status = 0; diff --git a/tests/Portable_Interceptors/Bug_3079/server.cpp b/tests/Portable_Interceptors/Bug_3079/server.cpp index 971d5faf2e8..d04d4dcca49 100644 --- a/tests/Portable_Interceptors/Bug_3079/server.cpp +++ b/tests/Portable_Interceptors/Bug_3079/server.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "test_i.h" @@ -8,10 +9,6 @@ #include "ace/OS_NS_stdio.h" #include "CrashPoint.h" -ACE_RCSID (Redirection, - server, - "$Id$") - const ACE_TCHAR *ior_file = 0; int number = 0; int server_number = 0; diff --git a/tests/Portable_Interceptors/Bug_3079/test_i.cpp b/tests/Portable_Interceptors/Bug_3079/test_i.cpp index 189b2447c94..a845f0270e1 100644 --- a/tests/Portable_Interceptors/Bug_3079/test_i.cpp +++ b/tests/Portable_Interceptors/Bug_3079/test_i.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "test_i.h" -ACE_RCSID (Redirection, - test_i, - "$Id$") - test_i::test_i (CORBA::Short num, CORBA::ORB_ptr orb) : number_ (num), diff --git a/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.cpp index 8390121b3b2..ba1070b0cd5 100644 --- a/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Bug_3080/Client_ORBInitializer.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "Client_ORBInitializer.h" -ACE_RCSID (Redirection, - Client_ORBInitializer, - "$Id$") - #if TAO_HAS_INTERCEPTORS == 1 #include "Client_Request_Interceptor.h" diff --git a/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp b/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp index a1644b2892d..e0c6aaeedea 100644 --- a/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp +++ b/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp @@ -1,13 +1,10 @@ // -*- C++ -*- +// $Id$ #include "Client_Request_Interceptor.h" #include "testC.h" #include "ace/Log_Msg.h" -ACE_RCSID (Redirection, - Client_Request_Interceptor, - "$Id$") - Client_Request_Interceptor::Client_Request_Interceptor (void) : request_count_ (0), receive_exception_count_ (0) diff --git a/tests/Portable_Interceptors/Bug_3080/Makefile.am b/tests/Portable_Interceptors/Bug_3080/Makefile.am deleted file mode 100644 index 706ee4dec6a..00000000000 --- a/tests/Portable_Interceptors/Bug_3080/Makefile.am +++ /dev/null @@ -1,114 +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_3080_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_3080_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - Client_Request_Interceptor.cpp \ - client.cpp \ - testC.cpp \ - Client_ORBInitializer.h \ - Client_Request_Interceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.Bug_3080_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_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/Portable_Interceptors/Bug_3080/client.cpp b/tests/Portable_Interceptors/Bug_3080/client.cpp index c6ed9e61acf..488ff0e88f1 100644 --- a/tests/Portable_Interceptors/Bug_3080/client.cpp +++ b/tests/Portable_Interceptors/Bug_3080/client.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "testC.h" @@ -6,10 +7,6 @@ #include "Client_Request_Interceptor.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (Redirection, - client, - "$Id$") - const ACE_TCHAR *ior1 = 0; int diff --git a/tests/Portable_Interceptors/Bug_3080/server.cpp b/tests/Portable_Interceptors/Bug_3080/server.cpp index 733e167e137..2f461dd4d16 100644 --- a/tests/Portable_Interceptors/Bug_3080/server.cpp +++ b/tests/Portable_Interceptors/Bug_3080/server.cpp @@ -1,13 +1,10 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" #include "test_i.h" -ACE_RCSID (Redirection, - server, - "$Id$") - const ACE_TCHAR *ior_file = 0; int diff --git a/tests/Portable_Interceptors/Bug_3080/test_i.cpp b/tests/Portable_Interceptors/Bug_3080/test_i.cpp index 189b2447c94..a845f0270e1 100644 --- a/tests/Portable_Interceptors/Bug_3080/test_i.cpp +++ b/tests/Portable_Interceptors/Bug_3080/test_i.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "test_i.h" -ACE_RCSID (Redirection, - test_i, - "$Id$") - test_i::test_i (CORBA::Short num, CORBA::ORB_ptr orb) : number_ (num), diff --git a/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp index f42b8ca4578..15b949a6996 100644 --- a/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "Client_ORBInitializer.h" -ACE_RCSID (Redirection, - Client_ORBInitializer, - "$Id$") - #if TAO_HAS_INTERCEPTORS == 1 #include "Client_Request_Interceptor.h" diff --git a/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp b/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp index 2db30bce0d9..df6b2fa9a8f 100644 --- a/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp +++ b/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "Client_Request_Interceptor.h" #include "testC.h" @@ -6,10 +7,6 @@ extern bool interceptor_invoked; -ACE_RCSID (Redirection, - Client_Request_Interceptor, - "$Id$") - Client_Request_Interceptor::Client_Request_Interceptor ( const char *orb_id, const char *forward_str) @@ -63,8 +60,8 @@ Client_Request_Interceptor::receive_exception ( this->orb_id_.in ()); } - ACE_DEBUG ((LM_DEBUG, - "Client_Request_Interceptor::receive_exception (%s)\n", + ACE_DEBUG ((LM_DEBUG, + "Client_Request_Interceptor::receive_exception (%s)\n", ri->received_exception_id ())); if (ACE_OS::strcmp (ri->received_exception_id (), diff --git a/tests/Portable_Interceptors/Bug_3582/client.cpp b/tests/Portable_Interceptors/Bug_3582/client.cpp index ffa6087e66d..31689d1c388 100644 --- a/tests/Portable_Interceptors/Bug_3582/client.cpp +++ b/tests/Portable_Interceptors/Bug_3582/client.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" @@ -6,10 +7,6 @@ #include "Client_ORBInitializer.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (Redirection, - client, - "$Id$") - const ACE_TCHAR *ior1 = 0; bool interceptor_invoked = false; diff --git a/tests/Portable_Interceptors/Bug_3582/server.cpp b/tests/Portable_Interceptors/Bug_3582/server.cpp index ec367253e1c..a849a628e61 100644 --- a/tests/Portable_Interceptors/Bug_3582/server.cpp +++ b/tests/Portable_Interceptors/Bug_3582/server.cpp @@ -1,13 +1,10 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "test_i.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Redirection, - server, - "$Id$") - const ACE_TCHAR *ior_file = 0; int number = 0; diff --git a/tests/Portable_Interceptors/Bug_3582/test.idl b/tests/Portable_Interceptors/Bug_3582/test.idl index 1332b6d98b2..4eaa929ca10 100644 --- a/tests/Portable_Interceptors/Bug_3582/test.idl +++ b/tests/Portable_Interceptors/Bug_3582/test.idl @@ -8,7 +8,7 @@ module RTTest interface test { /// Return the number assigned to the current object. For - /// example, object one will return "1," + /// example, object one will return "1," short number (); oneway void shutdown (); diff --git a/tests/Portable_Interceptors/Bug_3582/test_i.cpp b/tests/Portable_Interceptors/Bug_3582/test_i.cpp index 189b2447c94..a845f0270e1 100644 --- a/tests/Portable_Interceptors/Bug_3582/test_i.cpp +++ b/tests/Portable_Interceptors/Bug_3582/test_i.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "test_i.h" -ACE_RCSID (Redirection, - test_i, - "$Id$") - test_i::test_i (CORBA::Short num, CORBA::ORB_ptr orb) : number_ (num), diff --git a/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp b/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp index 0447b0286f6..c9fb4b2e48d 100644 --- a/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp +++ b/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp @@ -1,13 +1,9 @@ -// // $Id$ -// #include "Client_Task.h" #include "testC.h" #include "interceptors.h" -ACE_RCSID(Muxing, Client_Task, "$Id$") - Client_Task::Client_Task (const ACE_TCHAR *ior, CORBA::ORB_ptr corb, ACE_Thread_Manager *thr_mgr) diff --git a/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp b/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp index 45692c0f273..0c8b1be11c7 100644 --- a/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp +++ b/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp @@ -34,7 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) // This is a hack but that is okay! return 0; } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Portable_Interceptors/Collocated/Dynamic/Makefile.am b/tests/Portable_Interceptors/Collocated/Dynamic/Makefile.am deleted file mode 100644 index 8b649c336ce..00000000000 --- a/tests/Portable_Interceptors/Collocated/Dynamic/Makefile.am +++ /dev/null @@ -1,93 +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) - - -## Makefile.PI_Dynamic_Collocated.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -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 = Collocated_Test - -Collocated_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocated_Test_SOURCES = \ - Client_Task.cpp \ - Collocated_Test.cpp \ - Echo_Collocated_ORBInitializer.cpp \ - Server_Task.cpp \ - interceptors.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Client_Task.h \ - Echo_Collocated_ORBInitializer.h \ - Server_Task.h \ - interceptors.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ - test_i.h - -Collocated_Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_INTERCEPTORS -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/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp index 3af152af5d4..ffaf78aae2c 100644 --- a/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp +++ b/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp @@ -1,17 +1,11 @@ -// // $Id$ -// + #include "Server_Task.h" #include "test_i.h" #include "interceptors.h" #include "ace/Manual_Event.h" -ACE_RCSID(Collocated_Test, - Server_Task, - "$Id$") - - Server_Task::Server_Task (const ACE_TCHAR *output, CORBA::ORB_ptr sorb, ACE_Manual_Event &me, diff --git a/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp index 15fe176cc47..751f151c6bd 100644 --- a/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp +++ b/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp @@ -7,10 +7,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Dynamic, - interceptors, - "$Id$") - const char *request_msg = "The Echo_Request_Interceptor request message"; const char *reply_msg = "The Echo_Request_Interceptor reply message"; CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0; diff --git a/tests/Portable_Interceptors/Collocated/Dynamic/test.idl b/tests/Portable_Interceptors/Collocated/Dynamic/test.idl index 8671f9b0a97..0a4f15fdac5 100644 --- a/tests/Portable_Interceptors/Collocated/Dynamic/test.idl +++ b/tests/Portable_Interceptors/Collocated/Dynamic/test.idl @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Portable_Interceptors -// -// = FILENAME -// test.idl -// -// = DESCRIPTION -// Simple IDL file to test portable interceptor support. -// -// = AUTHORS -// Nanbor Wang <nanbor@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file test.idl + * + * $Id$ + * + * Simple IDL file to test portable interceptor support. + * + * + * @author Nanbor Wang <nanbor@cs.wustl.edu> + */ +//============================================================================= + module Test_Interceptors { diff --git a/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp b/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp index 85cddd874d7..32a4e3ba0e2 100644 --- a/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp +++ b/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp @@ -3,8 +3,6 @@ #include "test_i.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Dynamic, test_i, "$Id$") - Visual_i::Visual_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h b/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h index 2ccfe475b5f..96d6a044e67 100644 --- a/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h +++ b/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h @@ -1,31 +1,31 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Portable_Interceptors/Dynamic -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Nanbor Wang -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Nanbor Wang + */ +//============================================================================= + #ifndef TAO_INTERCEPTOR_TEST_I_H #define TAO_INTERCEPTOR_TEST_I_H #include "testS.h" +/** + * @class Visual_i + * + * Implements the Visual interface in test.idl + */ class Visual_i : public POA_Test_Interceptors::Visual { - // = DESCRIPTION - // Implements the Visual interface in test.idl public: + /// ctor Visual_i (CORBA::ORB_ptr orb); - // ctor void normal (CORBA::Long arg); @@ -40,8 +40,8 @@ public: void shutdown (void); private: + /// The ORB pointer (for shutdown.) CORBA::ORB_var orb_; - // The ORB pointer (for shutdown.) }; #endif /* TAO_INTERCEPTOR_TEST_I_H */ diff --git a/tests/Portable_Interceptors/Collocated/Makefile.am b/tests/Portable_Interceptors/Collocated/Makefile.am deleted file mode 100644 index 18a11126170..00000000000 --- a/tests/Portable_Interceptors/Collocated/Makefile.am +++ /dev/null @@ -1,14 +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 = \ - Dynamic \ - Service_Context_Manipulation - diff --git a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp index 99e8953ecb4..2fe57c77168 100644 --- a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp +++ b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp @@ -1,12 +1,8 @@ -// // $Id$ -// #include "Client_Task.h" #include "testC.h" -ACE_RCSID(Muxing, Client_Task, "$Id$") - Client_Task::Client_Task (const ACE_TCHAR *ior, CORBA::ORB_ptr corb, ACE_Thread_Manager *thr_mgr) diff --git a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp index bdf94ffd6fd..234f16075d1 100644 --- a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp +++ b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp @@ -36,7 +36,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) // This is a hack but that is okay! return 0; } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile.am b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile.am deleted file mode 100644 index d0fb67169a1..00000000000 --- a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Makefile.am +++ /dev/null @@ -1,93 +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) - - -## Makefile.PI_Svc_Context_Manip_Collocated.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -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 = collocated - -collocated_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -collocated_SOURCES = \ - Client_Task.cpp \ - Collocated_ORBInitializer.cpp \ - Collocated_Test.cpp \ - Server_Task.cpp \ - interceptors.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Client_Task.h \ - Collocated_ORBInitializer.h \ - Server_Task.h \ - interceptors.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ - test_i.h - -collocated_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_INTERCEPTORS -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/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp index 430eec2ee3d..117d516b577 100644 --- a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp +++ b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp @@ -5,10 +5,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Service_Context_Manipulation, - interceptors, - "$Id$") - const IOP::ServiceId service_id = 0xdeadbeef; const char *request_msg = "The Echo_Request_Interceptor request message"; const char *reply_msg = "The Echo_Request_Interceptor reply message"; diff --git a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test.idl b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test.idl index e9ed51b50c7..d49c6f7aa1a 100644 --- a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test.idl +++ b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test.idl @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation -// -// = FILENAME -// test.idl -// -// = DESCRIPTION -// Simple IDL file to test collocated portable interceptor support. -// -// = AUTHORS -// Nanbor Wang <nanbor@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file test.idl + * + * $Id$ + * + * Simple IDL file to test collocated portable interceptor support. + * + * + * @author Nanbor Wang <nanbor@cs.wustl.edu> + */ +//============================================================================= + module Test_Interceptors { diff --git a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp index a1a35158494..c10682c5c68 100644 --- a/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp +++ b/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp @@ -2,11 +2,6 @@ #include "test_i.h" -ACE_RCSID (Service_Context_Manipulation, - test_i, - "$Id$") - - Visual_i::Visual_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp index 2235181a86d..2cf11a1ff5f 100644 --- a/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- -// // $Id$ #include "Echo_Client_ORBInitializer.h" -ACE_RCSID (Dynamic, Echo_Client_ORBInitializer, "$Id$") - #if TAO_HAS_INTERCEPTORS == 1 #include "client_interceptor.h" diff --git a/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp index b701542cab6..c5beae64d34 100644 --- a/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- -// // $Id$ #include "Echo_Server_ORBInitializer.h" -ACE_RCSID (Dynamic, Echo_Server_ORBInitializer, "$Id$") - #if TAO_HAS_INTERCEPTORS == 1 #include "server_interceptor.h" diff --git a/tests/Portable_Interceptors/Dynamic/Makefile.am b/tests/Portable_Interceptors/Dynamic/Makefile.am deleted file mode 100644 index d72731bd5c1..00000000000 --- a/tests/Portable_Interceptors/Dynamic/Makefile.am +++ /dev/null @@ -1,122 +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.PI_Dynamic_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) $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.PI_Dynamic_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Echo_Client_ORBInitializer.cpp \ - client.cpp \ - client_interceptor.cpp \ - testC.cpp \ - Echo_Client_ORBInitializer.h \ - client_interceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.PI_Dynamic_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Echo_Server_ORBInitializer.cpp \ - server.cpp \ - server_interceptor.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Echo_Server_ORBInitializer.h \ - server_interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_INTERCEPTORS -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/Portable_Interceptors/Dynamic/client.cpp b/tests/Portable_Interceptors/Dynamic/client.cpp index 00965c0617f..99e23771bf3 100644 --- a/tests/Portable_Interceptors/Dynamic/client.cpp +++ b/tests/Portable_Interceptors/Dynamic/client.cpp @@ -7,10 +7,6 @@ #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (Dynamic, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp index 082e29a7826..33fb5fbb16c 100644 --- a/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp +++ b/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp @@ -10,10 +10,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Dynamic, - client_interceptor, - "$Id$") - Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void) : myname_ ("Echo_Client_Interceptor") { @@ -36,8 +32,7 @@ Echo_Client_Request_Interceptor::destroy (void) void Echo_Client_Request_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ) + PortableInterceptor::ClientRequestInfo_ptr) { // Do nothing } diff --git a/tests/Portable_Interceptors/Dynamic/server.cpp b/tests/Portable_Interceptors/Dynamic/server.cpp index b06e09a630f..a6d7bc75836 100644 --- a/tests/Portable_Interceptors/Dynamic/server.cpp +++ b/tests/Portable_Interceptors/Dynamic/server.cpp @@ -7,10 +7,6 @@ #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (Dynamic, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -34,7 +30,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/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp index 0fe10e2a3c3..5d0e7659b91 100644 --- a/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp +++ b/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp @@ -10,10 +10,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Dynamic, - server_interceptor, - "$Id$") - Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) : myname_ ("Echo_Server_Interceptor") { diff --git a/tests/Portable_Interceptors/Dynamic/test.idl b/tests/Portable_Interceptors/Dynamic/test.idl index e46baae1473..a5be699d716 100644 --- a/tests/Portable_Interceptors/Dynamic/test.idl +++ b/tests/Portable_Interceptors/Dynamic/test.idl @@ -46,7 +46,7 @@ module Test_Interceptors /// Normal operation with a return val. long calculate (in long one, in long two); - + readonly attribute VarLenStruct the_structure; /// Throws a user exception. diff --git a/tests/Portable_Interceptors/Dynamic/test_i.cpp b/tests/Portable_Interceptors/Dynamic/test_i.cpp index b0f36f70bc2..83e6eba0c99 100644 --- a/tests/Portable_Interceptors/Dynamic/test_i.cpp +++ b/tests/Portable_Interceptors/Dynamic/test_i.cpp @@ -2,10 +2,6 @@ #include "test_i.h" -ACE_RCSID (Dynamic, - test_i, - "$Id$") - Visual_i::Visual_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp index e09717bbe6a..fa8404d8845 100644 --- a/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "Client_ORBInitializer.h" -ACE_RCSID (ForwardRequest, - Client_ORBInitializer, - "$Id$") - #if TAO_HAS_INTERCEPTORS == 1 #include "Client_Request_Interceptor.h" diff --git a/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp index 3a23d0d6b9e..17e904ccc91 100644 --- a/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp +++ b/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp @@ -1,14 +1,11 @@ // -*- C++ -*- +// $Id$ #include "Client_Request_Interceptor.h" #include "testC.h" #include "ace/Log_Msg.h" -ACE_RCSID (ForwardRequest, - Client_Request_Interceptor, - "$Id$") - Client_Request_Interceptor::Client_Request_Interceptor ( const char *orb_id, const char *forward_str) diff --git a/tests/Portable_Interceptors/ForwardRequest/Makefile.am b/tests/Portable_Interceptors/ForwardRequest/Makefile.am deleted file mode 100644 index 10fa24b2481..00000000000 --- a/tests/Portable_Interceptors/ForwardRequest/Makefile.am +++ /dev/null @@ -1,126 +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.PI_ForwardRequest_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.PI_ForwardRequest_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - Client_Request_Interceptor.cpp \ - client.cpp \ - testC.cpp \ - Client_ORBInitializer.h \ - Client_Request_Interceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.PI_ForwardRequest_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Server_ORBInitializer.cpp \ - Server_Request_Interceptor.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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_INTERCEPTORS -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/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp index f6503aca183..8409a93a337 100644 --- a/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "Server_ORBInitializer.h" -ACE_RCSID (ForwardRequest, - Server_ORBInitializer, - "$Id$") - #if TAO_HAS_INTERCEPTORS == 1 #include "Server_Request_Interceptor.h" diff --git a/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp index b4380b6ef67..5a82e33c4d5 100644 --- a/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp +++ b/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp @@ -1,14 +1,11 @@ // -*- C++ -*- +// $Id$ #include "tao/AnyTypeCode/TypeCode.h" #include "Server_Request_Interceptor.h" #include "tao/ORB_Constants.h" #include "ace/Log_Msg.h" -ACE_RCSID (ForwardRequest, - Server_Request_Interceptor, - "$Id$") - Server_Request_Interceptor::Server_Request_Interceptor (void) : request_count_ (0) { @@ -125,7 +122,7 @@ Server_Request_Interceptor::receive_request ( "SERVER (%P|%t) OBJ_NOT_EXIST exception thrown for request %d\n" "SERVER (%P|%t) via receive_request().\n", this->request_count_ - 2)); - + throw CORBA::OBJECT_NOT_EXIST ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, diff --git a/tests/Portable_Interceptors/ForwardRequest/client.cpp b/tests/Portable_Interceptors/ForwardRequest/client.cpp index 67cb50aa9c3..c9b39bd45c2 100644 --- a/tests/Portable_Interceptors/ForwardRequest/client.cpp +++ b/tests/Portable_Interceptors/ForwardRequest/client.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" @@ -7,10 +8,6 @@ #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (ForwardRequest, - client, - "$Id$") - const ACE_TCHAR *ior1 = 0; const ACE_TCHAR *ior2 = 0; diff --git a/tests/Portable_Interceptors/ForwardRequest/server.cpp b/tests/Portable_Interceptors/ForwardRequest/server.cpp index 11ad5a24e17..d8cba77f51c 100644 --- a/tests/Portable_Interceptors/ForwardRequest/server.cpp +++ b/tests/Portable_Interceptors/ForwardRequest/server.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" @@ -10,10 +11,6 @@ #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (ForwardRequest, - server, - "$Id$") - const ACE_TCHAR *ior1_file = 0; const ACE_TCHAR *ior2_file = 0; diff --git a/tests/Portable_Interceptors/ForwardRequest/test_i.cpp b/tests/Portable_Interceptors/ForwardRequest/test_i.cpp index b25a7d02ce9..a845f0270e1 100644 --- a/tests/Portable_Interceptors/ForwardRequest/test_i.cpp +++ b/tests/Portable_Interceptors/ForwardRequest/test_i.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "test_i.h" -ACE_RCSID (ForwardRequest, - test_i, - "$Id$") - test_i::test_i (CORBA::Short num, CORBA::ORB_ptr orb) : number_ (num), diff --git a/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp index 8da5481a2ec..04dfd2feb5b 100644 --- a/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp +++ b/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "FOO_ClientRequestInterceptor.h" #include "testC.h" @@ -5,11 +7,6 @@ #include "tao/AnyTypeCode/TypeCode_Constants.h" -ACE_RCSID (IORInterceptor, - FOO_ClientRequestInterceptor, - "$Id$") - - FOO_ClientRequestInterceptor::FOO_ClientRequestInterceptor ( IOP::Codec_ptr codec) : codec_ (IOP::Codec::_duplicate (codec)) diff --git a/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp b/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp index 0200be0375c..cfc99735237 100644 --- a/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp @@ -1,14 +1,11 @@ +// $Id$ + #include "FOO_Client_ORBInitializer.h" #include "FOO_ClientRequestInterceptor.h" #include "tao/ORB_Constants.h" #include "tao/CodecFactory/CodecFactory.h" -ACE_RCSID (IORInterceptor, - FOO_Client_ORBInitializer, - "$Id$") - - void FOO_Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ diff --git a/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp b/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp index bf9838c0ae4..ebe19cd21e7 100644 --- a/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp +++ b/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp @@ -1,13 +1,10 @@ +// $Id$ + #include "FOO_IORInterceptor.h" #include "testS.h" #include "tao/ORB_Constants.h" -ACE_RCSID (IORInterceptor, - FOO_IORInterceptor, - "$Id$") - - FOO_IORInterceptor::FOO_IORInterceptor (IOP::Codec_ptr codec) : codec_ (IOP::Codec::_duplicate (codec)) { diff --git a/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp b/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp index 95d3c5babce..450ce02d48f 100644 --- a/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "FOO_IORInterceptor_ORBInitializer.h" #include "FOO_IORInterceptor.h" @@ -6,10 +7,6 @@ #include "tao/ORB_Constants.h" #include "tao/CodecFactory/CodecFactory.h" -ACE_RCSID (IORInterceptor, - FOO_IORInterceptor_ORBInitializer, - "$Id$") - void FOO_IORInterceptor_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ diff --git a/tests/Portable_Interceptors/IORInterceptor/Makefile.am b/tests/Portable_Interceptors/IORInterceptor/Makefile.am deleted file mode 100644 index 253a7ef1254..00000000000 --- a/tests/Portable_Interceptors/IORInterceptor/Makefile.am +++ /dev/null @@ -1,124 +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.PI_IORInterceptor_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.PI_IORInterceptor_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - FOO_ClientRequestInterceptor.cpp \ - FOO_Client_ORBInitializer.cpp \ - client.cpp \ - testC.cpp \ - FOO_ClientRequestInterceptor.h \ - FOO_Client_ORBInitializer.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.PI_IORInterceptor_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - FOO_IORInterceptor.cpp \ - FOO_IORInterceptor_ORBInitializer.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - FOO_IORInterceptor.h \ - FOO_IORInterceptor_ORBInitializer.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_INTERCEPTORS -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/Portable_Interceptors/IORInterceptor/client.cpp b/tests/Portable_Interceptors/IORInterceptor/client.cpp index 3d9a5422dd9..9f5ca72f8d4 100644 --- a/tests/Portable_Interceptors/IORInterceptor/client.cpp +++ b/tests/Portable_Interceptors/IORInterceptor/client.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" @@ -7,10 +8,6 @@ #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (IORInterceptor, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/tests/Portable_Interceptors/IORInterceptor/server.cpp b/tests/Portable_Interceptors/IORInterceptor/server.cpp index 67047eecc7a..0b2b3ba607a 100644 --- a/tests/Portable_Interceptors/IORInterceptor/server.cpp +++ b/tests/Portable_Interceptors/IORInterceptor/server.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" @@ -8,10 +9,6 @@ #include "tao/ORBInitializer_Registry.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (IORInterceptor, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -35,7 +32,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/tests/Portable_Interceptors/IORInterceptor/test_i.cpp index 058e6335a3d..904570bb020 100644 --- a/tests/Portable_Interceptors/IORInterceptor/test_i.cpp +++ b/tests/Portable_Interceptors/IORInterceptor/test_i.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "test_i.h" -ACE_RCSID (IORInterceptors, - test_i, - "$Id$") - test_i::test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Portable_Interceptors/Makefile.am b/tests/Portable_Interceptors/Makefile.am deleted file mode 100644 index 4d9f7debe66..00000000000 --- a/tests/Portable_Interceptors/Makefile.am +++ /dev/null @@ -1,37 +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 = \ - AMI \ - AdvSlot \ - AdvSlotDblCpy \ - AdvSlotExt \ - Benchmark \ - Bug_1559 \ - Bug_2088 \ - Bug_2133 \ - Bug_2510_Regression \ - Bug_3079 \ - Bug_3080 \ - Collocated \ - Dynamic \ - ForwardRequest \ - IORInterceptor \ - ORB_Shutdown \ - PICurrent \ - PolicyFactory \ - Processing_Mode_Policy \ - Recursive_ORBInitializer \ - Redirection \ - Register_Initial_References \ - Request_Interceptor_Flow \ - Service_Context_Manipulation \ - Slot - diff --git a/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am b/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am deleted file mode 100644 index 25bb70cdab4..00000000000 --- a/tests/Portable_Interceptors/ORB_Shutdown/Makefile.am +++ /dev/null @@ -1,117 +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.PI_ORB_Shutdown_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.PI_ORB_Shutdown_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 \ - testC.cpp \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.PI_ORB_Shutdown_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Server_ORBInitializer.cpp \ - Server_Request_Interceptor.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_INTERCEPTORS -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/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp index 2e52e0adeb6..c248a50c45a 100644 --- a/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "Server_ORBInitializer.h" -ACE_RCSID (ForwardRequest, - Server_ORBInitializer, - "$Id$") - #if TAO_HAS_INTERCEPTORS == 1 #include "Server_Request_Interceptor.h" diff --git a/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp b/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp index a78dc678b9b..500f2c85eaf 100644 --- a/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp +++ b/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp @@ -1,11 +1,8 @@ -#include "Server_Request_Interceptor.h" +// $Id$ +#include "Server_Request_Interceptor.h" #include "ace/Log_Msg.h" -ACE_RCSID (ORB_Shutdown, - Server_Request_Interceptor, - "$Id$") - Server_Request_Interceptor::Server_Request_Interceptor (bool & destroy_called) : destroy_called_ (destroy_called) { diff --git a/tests/Portable_Interceptors/ORB_Shutdown/client.cpp b/tests/Portable_Interceptors/ORB_Shutdown/client.cpp index 68bde6ac847..fd849a1bac8 100644 --- a/tests/Portable_Interceptors/ORB_Shutdown/client.cpp +++ b/tests/Portable_Interceptors/ORB_Shutdown/client.cpp @@ -1,15 +1,9 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" - #include "testC.h" - -ACE_RCSID (ORB_Shutdown, - client, - "$Id$") - - const ACE_TCHAR *ior = 0; int diff --git a/tests/Portable_Interceptors/ORB_Shutdown/server.cpp b/tests/Portable_Interceptors/ORB_Shutdown/server.cpp index f50727cbfed..b17ddaded1d 100644 --- a/tests/Portable_Interceptors/ORB_Shutdown/server.cpp +++ b/tests/Portable_Interceptors/ORB_Shutdown/server.cpp @@ -1,18 +1,13 @@ -#include "ace/Get_Opt.h" +// $Id$ +#include "ace/Get_Opt.h" #include "test_i.h" #include "Server_ORBInitializer.h" #include "Server_Request_Interceptor.h" - #include "tao/ORBInitializer_Registry.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (ORB_Shutdown, - server, - "$Id$") - - const ACE_TCHAR *ior_file = 0; int diff --git a/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp b/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp index ea019951879..3467c5b3390 100644 --- a/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp +++ b/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp @@ -1,10 +1,6 @@ -#include "test_i.h" - - -ACE_RCSID (ORB_Shutdown, - test_i, - "$Id$") +// $Id$ +#include "test_i.h" test_i::test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp b/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp index f07af1f187a..507ac2ac517 100644 --- a/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp +++ b/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ClientORBInitializer.h" #include "ClientRequestInterceptor.h" @@ -7,14 +8,8 @@ #include "ace/Log_Msg.h" -ACE_RCSID (PICurrent, - ClientORBInitializer, - "$Id$") - - PortableInterceptor::SlotId slot_id = 2093843211; - void ClientORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ diff --git a/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp b/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp index 69042d4326f..5f402b7bdd5 100644 --- a/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp +++ b/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp @@ -1,16 +1,10 @@ -#include "ClientRequestInterceptor.h" +// $Id$ +#include "ClientRequestInterceptor.h" #include "tao/CORBA_String.h" - #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" - -ACE_RCSID (PICurrent, - ClientRequestInterceptor, - "$Id$") - - ClientRequestInterceptor::ClientRequestInterceptor ( PortableInterceptor::SlotId id, PortableInterceptor::Current_ptr pi_current) diff --git a/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp b/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp index 0dd2ae70fc0..0761a907fcc 100644 --- a/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp +++ b/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp @@ -1,15 +1,10 @@ -#include "ClientRequestInterceptor2.h" +// $Id$ +#include "ClientRequestInterceptor2.h" #include "tao/CORBA_String.h" - #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" -ACE_RCSID (PICurrent, - ClientRequestInterceptor2, - "$Id$") - - ClientRequestInterceptor2::ClientRequestInterceptor2 ( PortableInterceptor::SlotId id) : slot_id_ (id) diff --git a/tests/Portable_Interceptors/PICurrent/Makefile.am b/tests/Portable_Interceptors/PICurrent/Makefile.am deleted file mode 100644 index 624eb21d818..00000000000 --- a/tests/Portable_Interceptors/PICurrent/Makefile.am +++ /dev/null @@ -1,124 +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.PI_PICurrent_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.PI_PICurrent_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - ClientORBInitializer.cpp \ - ClientRequestInterceptor.cpp \ - client.cpp \ - testC.cpp \ - ClientORBInitializer.h \ - ClientRequestInterceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.PI_PICurrent_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - ClientRequestInterceptor2.cpp \ - ServerORBInitializer.cpp \ - ServerRequestInterceptor.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - ClientRequestInterceptor2.h \ - ServerORBInitializer.h \ - ServerRequestInterceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_INTERCEPTORS -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/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp b/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp index 0de620070ef..65217fc799f 100644 --- a/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp +++ b/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ServerORBInitializer.h" #include "ServerRequestInterceptor.h" @@ -6,10 +7,6 @@ #include "tao/PI/ORBInitInfo.h" #include "tao/ORB_Core.h" -ACE_RCSID (PICurrent, - ServerORBInitializer, - "$Id$") - PortableInterceptor::SlotId slot_id = 2093843221; void diff --git a/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp index 0c5ac6f0ffc..396f088cc6e 100644 --- a/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp +++ b/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp @@ -1,16 +1,11 @@ // -*- C++ -*- +// $Id$ #include "ServerRequestInterceptor.h" - #include "tao/CORBA_String.h" - #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" -ACE_RCSID (PICurrent, - ServerRequestInterceptor, - "$Id$") - ServerRequestInterceptor::ServerRequestInterceptor ( PortableInterceptor::SlotId id, PortableInterceptor::Current_ptr pi_current) diff --git a/tests/Portable_Interceptors/PICurrent/client.cpp b/tests/Portable_Interceptors/PICurrent/client.cpp index 38702e83179..d4891c53162 100644 --- a/tests/Portable_Interceptors/PICurrent/client.cpp +++ b/tests/Portable_Interceptors/PICurrent/client.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" @@ -9,10 +10,6 @@ #include "tao/ORBInitializer_Registry.h" #include "tao/PI/PI.h" -ACE_RCSID (PICurrent, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/tests/Portable_Interceptors/PICurrent/server.cpp b/tests/Portable_Interceptors/PICurrent/server.cpp index d3d15dd887b..c7b4b946957 100644 --- a/tests/Portable_Interceptors/PICurrent/server.cpp +++ b/tests/Portable_Interceptors/PICurrent/server.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" @@ -11,10 +12,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_strings.h" -ACE_RCSID (PICurrent, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); extern PortableInterceptor::SlotId slot_id; @@ -68,7 +65,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/tests/Portable_Interceptors/PICurrent/test_i.cpp b/tests/Portable_Interceptors/PICurrent/test_i.cpp index 8237b777dcf..b2b72b018a4 100644 --- a/tests/Portable_Interceptors/PICurrent/test_i.cpp +++ b/tests/Portable_Interceptors/PICurrent/test_i.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "test_i.h" -ACE_RCSID (PICurrent, - test_i, - "$Id$") - test_i::test_i (PortableInterceptor::Current_ptr current, PortableInterceptor::SlotId id, CORBA::ORB_ptr orb) diff --git a/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp b/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp index 37e62f127da..4f3a65687d3 100644 --- a/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp +++ b/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp @@ -1,12 +1,8 @@ +// $Id$ + #include "IORInterceptor.h" #include "testC.h" - -ACE_RCSID (PolicyFactory, - IORInterceptor, - "$Id$") - - IORInterceptor::IORInterceptor (void) : success_ (false) { diff --git a/tests/Portable_Interceptors/PolicyFactory/Makefile.am b/tests/Portable_Interceptors/PolicyFactory/Makefile.am deleted file mode 100644 index eaffbc39f4e..00000000000 --- a/tests/Portable_Interceptors/PolicyFactory/Makefile.am +++ /dev/null @@ -1,90 +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) - - -## Makefile.PI_PolicyFactory_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl 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) - -server_SOURCES = \ - IORInterceptor.cpp \ - Policy.cpp \ - PolicyFactory.cpp \ - Server_ORBInitializer.cpp \ - server.cpp \ - testC.cpp \ - IORInterceptor.h \ - Policy.h \ - PolicyFactory.h \ - Server_ORBInitializer.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_INTERCEPTORS -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/Portable_Interceptors/PolicyFactory/Policy.cpp b/tests/Portable_Interceptors/PolicyFactory/Policy.cpp index 6351d93f35a..1c048efbcbc 100644 --- a/tests/Portable_Interceptors/PolicyFactory/Policy.cpp +++ b/tests/Portable_Interceptors/PolicyFactory/Policy.cpp @@ -5,11 +5,6 @@ #include "tao/SystemException.h" #include "ace/Log_Msg.h" -ACE_RCSID (PolicyFactory, - Policy, - "$Id$") - - Policy::Policy (CORBA::ULong val) : value_ (val) { diff --git a/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp b/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp index 4e90c443045..1d60d5a2e41 100644 --- a/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp +++ b/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp @@ -3,11 +3,6 @@ #include "PolicyFactory.h" #include "Policy.h" -ACE_RCSID (PolicyFactory, - PolicyFactory, - "$Id$") - - CORBA::Policy_ptr PolicyFactory::create_policy (CORBA::PolicyType type, const CORBA::Any & value) diff --git a/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp index c0ec2c8b751..450419eaac7 100644 --- a/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "Server_ORBInitializer.h" #include "IORInterceptor.h" @@ -9,12 +10,6 @@ #include "ace/OS_NS_string.h" - -ACE_RCSID (PolicyFactory, - Server_ORBInitializer, - "$Id$") - - void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ diff --git a/tests/Portable_Interceptors/PolicyFactory/server.cpp b/tests/Portable_Interceptors/PolicyFactory/server.cpp index 2ec075eee22..307332238dc 100644 --- a/tests/Portable_Interceptors/PolicyFactory/server.cpp +++ b/tests/Portable_Interceptors/PolicyFactory/server.cpp @@ -1,17 +1,12 @@ // -*- C++ -*- +// $Id$ #include "Server_ORBInitializer.h" - #include "tao/ORBInitializer_Registry.h" #include "testC.h" - #include "tao/PortableServer/PortableServer.h" #include "ace/Log_Msg.h" -ACE_RCSID (PolicyFactory, - server, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp index 94bc8630a56..c6c5c380e07 100644 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp +++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp @@ -1,13 +1,9 @@ -// // $Id$ -// #include "Client_Task.h" #include "testC.h" #include "interceptors.h" -ACE_RCSID(Muxing, Client_Task, "$Id$") - Client_Task::Client_Task (const ACE_TCHAR *ior, CORBA::ORB_ptr corb, ACE_Thread_Manager *thr_mgr) diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp index 01e78ae2b96..034ca0322bb 100644 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp +++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp @@ -47,7 +47,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) return 0; } } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile.am b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile.am deleted file mode 100644 index 3326661306f..00000000000 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Makefile.am +++ /dev/null @@ -1,93 +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) - - -## Makefile.PI_ProcMode_Collocated_Collocated.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -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 = PI_ProcMode_Collocated_Test - -PI_ProcMode_Collocated_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -PI_ProcMode_Collocated_Test_SOURCES = \ - Client_Task.cpp \ - Collocated_Test.cpp \ - Echo_Collocated_ORBInitializer.cpp \ - Server_Task.cpp \ - interceptors.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Client_Task.h \ - Echo_Collocated_ORBInitializer.h \ - Server_Task.h \ - interceptors.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ - test_i.h - -PI_ProcMode_Collocated_Test_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_INTERCEPTORS -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/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp index 3af152af5d4..ffaf78aae2c 100644 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp +++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp @@ -1,17 +1,11 @@ -// // $Id$ -// + #include "Server_Task.h" #include "test_i.h" #include "interceptors.h" #include "ace/Manual_Event.h" -ACE_RCSID(Collocated_Test, - Server_Task, - "$Id$") - - Server_Task::Server_Task (const ACE_TCHAR *output, CORBA::ORB_ptr sorb, ACE_Manual_Event &me, diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp index 20bbdf1918b..adde10c09d5 100644 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp +++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp @@ -9,10 +9,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Dynamic, - interceptors, - "$Id$") - const char *request_msg = "The Echo_Request_Interceptor request message"; const char *reply_msg = "The Echo_Request_Interceptor reply message"; CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0; diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test.idl b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test.idl index 07ed4dee088..2447f44442e 100644 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test.idl +++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test.idl @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Portable_Interceptors -// -// = FILENAME -// test.idl -// -// = DESCRIPTION -// Simple IDL file to test portable interceptor support. -// -// = AUTHORS -// Nanbor Wang <nanbor@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file test.idl + * + * $Id$ + * + * Simple IDL file to test portable interceptor support. + * + * + * @author Nanbor Wang <nanbor@cs.wustl.edu> + */ +//============================================================================= + module Test_Interceptors { diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp index 547a8c5366c..4fe8eb0d837 100644 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp +++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp @@ -3,8 +3,6 @@ #include "test_i.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Dynamic, test_i, "$Id$") - Visual_i::Visual_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h index 2ccfe475b5f..96d6a044e67 100644 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h +++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h @@ -1,31 +1,31 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Portable_Interceptors/Dynamic -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Nanbor Wang -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Nanbor Wang + */ +//============================================================================= + #ifndef TAO_INTERCEPTOR_TEST_I_H #define TAO_INTERCEPTOR_TEST_I_H #include "testS.h" +/** + * @class Visual_i + * + * Implements the Visual interface in test.idl + */ class Visual_i : public POA_Test_Interceptors::Visual { - // = DESCRIPTION - // Implements the Visual interface in test.idl public: + /// ctor Visual_i (CORBA::ORB_ptr orb); - // ctor void normal (CORBA::Long arg); @@ -40,8 +40,8 @@ public: void shutdown (void); private: + /// The ORB pointer (for shutdown.) CORBA::ORB_var orb_; - // The ORB pointer (for shutdown.) }; #endif /* TAO_INTERCEPTOR_TEST_I_H */ diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Makefile.am b/tests/Portable_Interceptors/Processing_Mode_Policy/Makefile.am deleted file mode 100644 index 40e67c75e8c..00000000000 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Makefile.am +++ /dev/null @@ -1,14 +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 = \ - Collocated \ - Remote - diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp index be36b6f1750..c6c56772cfb 100644 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp +++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp @@ -1,13 +1,9 @@ -// // $Id$ -// #include "Client_Task.h" #include "testC.h" #include "client_interceptor.h" -ACE_RCSID(Remote, Client_Task, "$Id$") - Client_Task::Client_Task (const ACE_TCHAR *ior, CORBA::ORB_ptr corb, ACE_Thread_Manager *thr_mgr) diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am deleted file mode 100644 index 8380d73a2d1..00000000000 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile.am +++ /dev/null @@ -1,127 +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.PI_ProcMode_Remote_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 $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.PI_ProcMode_Remote_RemoteServer.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += PI_ProcMode_Remote_TestServer - -PI_ProcMode_Remote_TestServer_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -PI_ProcMode_Remote_TestServer_SOURCES = \ - Echo_Server_ORBInitializer.cpp \ - Server_Task.cpp \ - server_interceptor.cpp \ - server_main.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Echo_Server_ORBInitializer.h \ - Server_Task.h \ - server_interceptor.h \ - test_i.h - -PI_ProcMode_Remote_TestServer_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.PI_ProcMode_Remote_RemoteClient.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += PI_ProcMode_Remote_TestClient - -PI_ProcMode_Remote_TestClient_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -PI_ProcMode_Remote_TestClient_SOURCES = \ - Client_Task.cpp \ - Echo_Client_ORBInitializer.cpp \ - client_interceptor.cpp \ - client_main.cpp \ - testC.cpp \ - Client_Task.h \ - Echo_Client_ORBInitializer.h \ - client_interceptor.h - -PI_ProcMode_Remote_TestClient_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_INTERCEPTORS -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/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp index 665c2de1d60..b658317741e 100644 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp +++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp @@ -1,17 +1,11 @@ -// // $Id$ -// + #include "Server_Task.h" #include "test_i.h" #include "server_interceptor.h" #include "ace/Manual_Event.h" -ACE_RCSID(Remote, - Server_Task, - "$Id$") - - Server_Task::Server_Task (const ACE_TCHAR *output, CORBA::ORB_ptr sorb, ACE_Manual_Event &me, diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp index 36af24c0c16..a094b78f209 100644 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp +++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp @@ -7,10 +7,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Remote, - client_interceptor, - "$Id$") - const char *request_msg = "The Echo_Client_Request_Interceptor request message"; const char *reply_msg = "The Echo_Client_Request_Interceptor reply message"; CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0; diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp index cab19179fe0..765508c93d2 100644 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp +++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp @@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) return 0; } } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp index 887a95d23fb..d50d028ec06 100644 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp +++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp @@ -7,10 +7,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Remote, - server_interceptor, - "$Id$") - const char *request_msg = "The Echo_Server_Request_Interceptor request message"; const char *reply_msg = "The Echo_Server_Request_Interceptor reply message"; CORBA::ULong Echo_Server_Request_Interceptor::server_interceptor_check_ = 0; diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp index 716b81cfaf3..afc44b481dd 100644 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp +++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp @@ -35,7 +35,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) return 0; } } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test.idl b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test.idl index 07ed4dee088..2447f44442e 100644 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test.idl +++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test.idl @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Portable_Interceptors -// -// = FILENAME -// test.idl -// -// = DESCRIPTION -// Simple IDL file to test portable interceptor support. -// -// = AUTHORS -// Nanbor Wang <nanbor@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file test.idl + * + * $Id$ + * + * Simple IDL file to test portable interceptor support. + * + * + * @author Nanbor Wang <nanbor@cs.wustl.edu> + */ +//============================================================================= + module Test_Interceptors { diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp index af6f50de15c..86c82f814ed 100644 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp +++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp @@ -2,8 +2,6 @@ #include "test_i.h" -ACE_RCSID(Remote, test_i, "$Id$") - Visual_i::Visual_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h index 2ccfe475b5f..96d6a044e67 100644 --- a/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h +++ b/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h @@ -1,31 +1,31 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Portable_Interceptors/Dynamic -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Nanbor Wang -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Nanbor Wang + */ +//============================================================================= + #ifndef TAO_INTERCEPTOR_TEST_I_H #define TAO_INTERCEPTOR_TEST_I_H #include "testS.h" +/** + * @class Visual_i + * + * Implements the Visual interface in test.idl + */ class Visual_i : public POA_Test_Interceptors::Visual { - // = DESCRIPTION - // Implements the Visual interface in test.idl public: + /// ctor Visual_i (CORBA::ORB_ptr orb); - // ctor void normal (CORBA::Long arg); @@ -40,8 +40,8 @@ public: void shutdown (void); private: + /// The ORB pointer (for shutdown.) CORBA::ORB_var orb_; - // The ORB pointer (for shutdown.) }; #endif /* TAO_INTERCEPTOR_TEST_I_H */ diff --git a/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp index b5a7b63a0c4..281bba57562 100644 --- a/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp @@ -6,10 +6,6 @@ #include "Client_ORBInitializer.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (Recursive_ORBInitializer, - Client_ORBInitializer, - "$Id$") - Client_ORBInitializer::Client_ORBInitializer (Client_ORBInitializer *second) : pre_init_called (0), post_init_called (0), diff --git a/tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile.am b/tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile.am deleted file mode 100644 index bffd8a890b0..00000000000 --- a/tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile.am +++ /dev/null @@ -1,51 +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.Register_ORBInitializer_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS = client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - client.cpp \ - Client_ORBInitializer.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -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/Portable_Interceptors/Recursive_ORBInitializer/client.cpp b/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp index 3541d3d65d5..247c131a64f 100644 --- a/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp +++ b/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp @@ -3,10 +3,6 @@ #include "Client_ORBInitializer.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID(Recursive_ORBInitializer, - client, - "$Id$") - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp index f42b8ca4578..15b949a6996 100644 --- a/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "Client_ORBInitializer.h" -ACE_RCSID (Redirection, - Client_ORBInitializer, - "$Id$") - #if TAO_HAS_INTERCEPTORS == 1 #include "Client_Request_Interceptor.h" diff --git a/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp b/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp index f088670f29b..11dd4f09a45 100644 --- a/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp +++ b/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp @@ -1,13 +1,10 @@ // -*- C++ -*- +// $Id$ #include "Client_Request_Interceptor.h" #include "testC.h" #include "ace/Log_Msg.h" -ACE_RCSID (Redirection, - Client_Request_Interceptor, - "$Id$") - Client_Request_Interceptor::Client_Request_Interceptor ( const char *orb_id, const char *forward_str) diff --git a/tests/Portable_Interceptors/Redirection/Makefile.am b/tests/Portable_Interceptors/Redirection/Makefile.am deleted file mode 100644 index a2cf5a0efd0..00000000000 --- a/tests/Portable_Interceptors/Redirection/Makefile.am +++ /dev/null @@ -1,128 +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.PI_Redirection_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.PI_Redirection_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - Client_Request_Interceptor.cpp \ - client.cpp \ - testC.cpp \ - Client_ORBInitializer.h \ - Client_Request_Interceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.PI_Redirection_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - CrashPoint.cpp \ - Server_ORBInitializer.cpp \ - Server_Request_Interceptor.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - CrashPoint.h \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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_INTERCEPTORS -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/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp index 33fb284f0c2..8a83f147441 100644 --- a/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "Server_ORBInitializer.h" -ACE_RCSID (Redirection, - Server_ORBInitializer, - "$Id$") - #if TAO_HAS_INTERCEPTORS == 1 #include "Server_Request_Interceptor.h" diff --git a/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp b/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp index 3123772c7cb..52449966d7f 100644 --- a/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp +++ b/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp @@ -1,14 +1,11 @@ // -*- C++ -*- +// $Id$ #include "Server_Request_Interceptor.h" #include "tao/ORB_Constants.h" #include "ace/Log_Msg.h" #include "CrashPoint.h" -ACE_RCSID (Redirection, - Server_Request_Interceptor, - "$Id$") - Server_Request_Interceptor::Server_Request_Interceptor (void) : request_count_ (0) { diff --git a/tests/Portable_Interceptors/Redirection/client.cpp b/tests/Portable_Interceptors/Redirection/client.cpp index 0c591bae70d..be64cb15b69 100644 --- a/tests/Portable_Interceptors/Redirection/client.cpp +++ b/tests/Portable_Interceptors/Redirection/client.cpp @@ -1,14 +1,11 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "testC.h" #include "Client_ORBInitializer.h" #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (Redirection, - client, - "$Id$") - const ACE_TCHAR *ior1 = 0; const ACE_TCHAR *ior2 = 0; diff --git a/tests/Portable_Interceptors/Redirection/server.cpp b/tests/Portable_Interceptors/Redirection/server.cpp index 695300311be..48dd464b76d 100644 --- a/tests/Portable_Interceptors/Redirection/server.cpp +++ b/tests/Portable_Interceptors/Redirection/server.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "test_i.h" @@ -8,10 +9,6 @@ #include "ace/OS_NS_stdio.h" #include "CrashPoint.h" -ACE_RCSID (Redirection, - server, - "$Id$") - const ACE_TCHAR *ior_file = 0; int number = 0; diff --git a/tests/Portable_Interceptors/Redirection/test_i.cpp b/tests/Portable_Interceptors/Redirection/test_i.cpp index 189b2447c94..a845f0270e1 100644 --- a/tests/Portable_Interceptors/Redirection/test_i.cpp +++ b/tests/Portable_Interceptors/Redirection/test_i.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "test_i.h" -ACE_RCSID (Redirection, - test_i, - "$Id$") - test_i::test_i (CORBA::Short num, CORBA::ORB_ptr orb) : number_ (num), diff --git a/tests/Portable_Interceptors/Register_Initial_References/Makefile.am b/tests/Portable_Interceptors/Register_Initial_References/Makefile.am deleted file mode 100644 index d2fb9f169ed..00000000000 --- a/tests/Portable_Interceptors/Register_Initial_References/Makefile.am +++ /dev/null @@ -1,86 +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) - - -## Makefile.Register_ORBInitializer_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -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) - -server_SOURCES = \ - Server_ORBInitializer.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_INTERCEPTORS -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/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp index 64a56d5719b..0998a5aac00 100644 --- a/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp @@ -1,17 +1,11 @@ // -*- C++ -*- -// // $Id$ -// #include "Server_ORBInitializer.h" #include "test_i.h" #include "tao/ORBInitializer_Registry.h" #include "tao/ORB_Constants.h" -ACE_RCSID (Recursive_ORBInitializer, - Server_ORBInitializer, - "$Id$") - Server_ORBInitializer::Server_ORBInitializer (void) { } diff --git a/tests/Portable_Interceptors/Register_Initial_References/server.cpp b/tests/Portable_Interceptors/Register_Initial_References/server.cpp index 98853ebc269..55f9b3710d8 100644 --- a/tests/Portable_Interceptors/Register_Initial_References/server.cpp +++ b/tests/Portable_Interceptors/Register_Initial_References/server.cpp @@ -4,11 +4,6 @@ #include "tao/ORBInitializer_Registry.h" #include "test_i.h" -ACE_RCSID(Recursive_ORBInitializer, - server, - "$Id$") - - int test_orb (CORBA::ORB_ptr orb) { int errors = 0; diff --git a/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp b/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp index 9f1c4e44e7a..34a4258e7b0 100644 --- a/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp +++ b/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "test_i.h" -ACE_RCSID (Register_Initial_References, - test_i, - "$Id$") - test_i::test_i (void) { } diff --git a/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp index 7409c0021dc..78e66358303 100644 --- a/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp @@ -1,16 +1,10 @@ -#include "Client_ORBInitializer.h" - -ACE_RCSID (Request_Interceptor_Flow, - Client_ORBInitializer, - "$Id$") - +// $Id$ +#include "Client_ORBInitializer.h" #include "tao/Exception.h" #include "tao/ORB_Constants.h" - #include "Client_Request_Interceptor.h" - void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) diff --git a/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp b/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp index 107e2209a7b..19da555bfb0 100644 --- a/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp +++ b/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "Client_Request_Interceptor.h" #include "testC.h" @@ -7,10 +8,6 @@ #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Request_Interceptor_Flow, - Client_Request_Interceptor, - "$Id$") - Client_Request_Interceptor::Client_Request_Interceptor (const char *name) : Request_Interceptor (name) { diff --git a/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am b/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am deleted file mode 100644 index 64f048a5f71..00000000000 --- a/tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile.am +++ /dev/null @@ -1,126 +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.PI_Request_Interceptor_Flow_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 $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -## Makefile.PI_Request_Interceptor_Flow_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - Client_Request_Interceptor.cpp \ - Request_Interceptor.cpp \ - client.cpp \ - testC.cpp \ - Client_ORBInitializer.h \ - Client_Request_Interceptor.h \ - Request_Interceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.PI_Request_Interceptor_Flow_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Request_Interceptor.cpp \ - Server_ORBInitializer.cpp \ - Server_Request_Interceptor.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Request_Interceptor.h \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_INTERCEPTORS -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/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp b/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp index df1b2742754..f91aeea4748 100644 --- a/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp +++ b/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "Request_Interceptor.h" -ACE_RCSID (Request_Interceptor_Flow, - Request_Interceptor, - "$Id$") - Request_Interceptor::Request_Interceptor (const char *name) : name_ (name), starting_interception_point_count_ (0), diff --git a/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp index fdaedb584cc..18520006375 100644 --- a/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp @@ -1,12 +1,8 @@ -#include "Server_ORBInitializer.h" - -ACE_RCSID (Request_Interceptor_Flow, - Server_ORBInitializer, - "$Id$") +// $Id$ +#include "Server_ORBInitializer.h" #include "tao/Exception.h" #include "tao/ORB_Constants.h" - #include "Server_Request_Interceptor.h" void diff --git a/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp index 349f9c5def0..d47d16aeb08 100644 --- a/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp +++ b/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp @@ -1,16 +1,10 @@ // -*- C++ -*- +// $Id$ #include "Server_Request_Interceptor.h" - -ACE_RCSID (Request_Interceptor_Flow, - Server_Request_Interceptor, - "$Id$") - #include "testC.h" - #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h" #include "tao/AnyTypeCode/TypeCode.h" - #include "ace/OS_NS_string.h" Server_Request_Interceptor::Server_Request_Interceptor (const char *name) diff --git a/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp b/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp index bc18fba7e18..2a2ac4e7b73 100644 --- a/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp +++ b/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" @@ -7,10 +8,6 @@ #include "tao/ORBInitializer_Registry.h" -ACE_RCSID (Request_Interceptor_Flow, - client, - "$Id$") - const ACE_TCHAR *ior = 0; int diff --git a/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp index 07ae27a8a99..023ad932f4a 100644 --- a/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp +++ b/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp @@ -1,16 +1,12 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "test_i.h" #include "Server_ORBInitializer.h" - #include "tao/ORBInitializer_Registry.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Request_Interceptor_Flow, - server, - "$Id$") - const ACE_TCHAR *ior_file = 0; int diff --git a/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp b/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp index 6eddcc6653c..519ffd3319c 100644 --- a/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp +++ b/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "test_i.h" -ACE_RCSID (Request_Interceptor_Flow, - test_i, - "$Id$") - test_i::test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp b/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp index 2a0776226f0..45170534be6 100644 --- a/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp @@ -6,8 +6,6 @@ #include "Client_ORBInitializer.h" #include "client_interceptor.h" -ACE_RCSID (Service_Context_Manipulation, Client_ORBInitializer, "$Id$") - Client_ORBInitializer::Client_ORBInitializer (void) { } diff --git a/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am b/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am deleted file mode 100644 index d0c56adfb37..00000000000 --- a/tests/Portable_Interceptors/Service_Context_Manipulation/Makefile.am +++ /dev/null @@ -1,122 +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.PI_Svc_Context_Manip_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.PI_Svc_Context_Manip_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - client.cpp \ - client_interceptor.cpp \ - testC.cpp \ - Client_ORBInitializer.h \ - client_interceptor.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.PI_Svc_Context_Manip_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Server_ORBInitializer.cpp \ - server.cpp \ - server_interceptor.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - Server_ORBInitializer.h \ - server_interceptor.h \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_INTERCEPTORS -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/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp b/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp index 03a51a1c2e0..ad369d2b7ed 100644 --- a/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp +++ b/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp @@ -6,8 +6,6 @@ #include "Server_ORBInitializer.h" #include "server_interceptor.h" -ACE_RCSID (Service_Context_Manipulation, Server_ORBInitializer, "$Id$") - Server_ORBInitializer::Server_ORBInitializer (void) { } diff --git a/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp b/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp index 9f6fb5660ef..13d6cfb232c 100644 --- a/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp +++ b/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp @@ -6,8 +6,6 @@ #include "tao/ORBInitializer_Registry.h" -ACE_RCSID(Interceptors, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp b/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp index 2a2db026aa7..8dbf21a741a 100644 --- a/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp +++ b/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp @@ -6,10 +6,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Service_Context_Manipulation, - interceptors, - "$Id$") - const IOP::ServiceId service_id = 0xdeadbeef; const char *request_msg = "The Echo_Request_Interceptor request message"; const char *reply_msg = "The Echo_Request_Interceptor reply message"; diff --git a/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp index f22ac303516..5891af15597 100644 --- a/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp +++ b/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp @@ -7,10 +7,6 @@ #include "tao/ORBInitializer_Registry.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Service_Context_Manipulation, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -34,7 +30,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/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp b/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp index 07fa8d7031c..c6d15ecfdb6 100644 --- a/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp +++ b/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp @@ -6,10 +6,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_string.h" -ACE_RCSID (Service_Context_Manipulation, - server_interceptor, - "$Id$") - const IOP::ServiceId service_id = 0xdeadbeef; const char *request_msg = "The Echo_Request_Interceptor request message"; const char *reply_msg = "The Echo_Request_Interceptor reply message"; diff --git a/tests/Portable_Interceptors/Service_Context_Manipulation/test.idl b/tests/Portable_Interceptors/Service_Context_Manipulation/test.idl index 79a06a14351..2e858b32098 100644 --- a/tests/Portable_Interceptors/Service_Context_Manipulation/test.idl +++ b/tests/Portable_Interceptors/Service_Context_Manipulation/test.idl @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Interceptors -// -// = FILENAME -// test.idl -// -// = DESCRIPTION -// Simple IDL file to test portable interceptor support. -// -// = AUTHORS -// Nanbor Wang <nanbor@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file test.idl + * + * $Id$ + * + * Simple IDL file to test portable interceptor support. + * + * + * @author Nanbor Wang <nanbor@cs.wustl.edu> + */ +//============================================================================= + module Test_Interceptors { diff --git a/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp b/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp index 0d201962ba4..75d61f3827e 100644 --- a/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp +++ b/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp @@ -2,11 +2,6 @@ #include "test_i.h" -ACE_RCSID (Service_Context_Manipulation, - test_i, - "$Id$") - - Visual_i::Visual_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Portable_Interceptors/Slot/Makefile.am b/tests/Portable_Interceptors/Slot/Makefile.am deleted file mode 100644 index 5e0d16c1a6d..00000000000 --- a/tests/Portable_Interceptors/Slot/Makefile.am +++ /dev/null @@ -1,51 +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.PI_Slot_Driver.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS - -noinst_PROGRAMS = driver - -driver_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -driver_SOURCES = \ - driver.cpp - -driver_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_INTERCEPTORS -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/Portable_Interceptors/Slot/driver.cpp b/tests/Portable_Interceptors/Slot/driver.cpp index 49e82ac6077..aa24db1e945 100644 --- a/tests/Portable_Interceptors/Slot/driver.cpp +++ b/tests/Portable_Interceptors/Slot/driver.cpp @@ -1,6 +1,5 @@ -// file : Slot/driver.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "tao/PI/PI.h" #include "tao/LocalObject.h" @@ -57,10 +56,15 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->destroy (); } catch (PortableInterceptor::InvalidSlot const&) - { - ACE_ERROR ((LM_ERROR, "ERROR: Caught InvalidSlot exception.\n")); - return 1; - } + { + ACE_ERROR ((LM_ERROR, "ERROR: Caught InvalidSlot exception.\n")); + return 1; + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Exception caught:"); + return 1; + } return 0; } diff --git a/tests/QtTests/Makefile.am b/tests/QtTests/Makefile.am deleted file mode 100644 index 06fa5c967c8..00000000000 --- a/tests/QtTests/Makefile.am +++ /dev/null @@ -1,178 +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 = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.QtTests_Server.am - -if BUILD_ACE_QTREACTOR -if BUILD_EXCEPTIONS -if BUILD_QT -if BUILD_TAO_QTRESOURCE - -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 $@ - -BUILT_SOURCES += \ - test_i_moc.cpp - -CLEANFILES += \ - test_i_moc.cpp - -test_i_moc.cpp: $(srcdir)/test_i.h - $(QTDIR)/bin/moc $(srcdir)/test_i.h -o test_i_moc.cpp - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - $(ACE_QT_CPPFLAGS) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i_moc.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ - test_i.h - -server_LDFLAGS = \ - $(ACE_QT_LDFLAGS) - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_QtResource.la \ - $(ACE_BUILDDIR)/ace/libACE_QtReactor.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_QT_LIBS) - -endif BUILD_TAO_QTRESOURCE -endif BUILD_QT -endif BUILD_EXCEPTIONS -endif BUILD_ACE_QTREACTOR - -## Makefile.QtTests_Client.am - -if BUILD_ACE_QTREACTOR -if BUILD_EXCEPTIONS -if BUILD_QT -if BUILD_TAO_QTRESOURCE - -BUILT_SOURCES += \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES += \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -BUILT_SOURCES += \ - client_moc.cpp - -CLEANFILES += \ - client_moc.cpp - -client_moc.cpp: $(srcdir)/client.h - $(QTDIR)/bin/moc $(srcdir)/client.h -o client_moc.cpp - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - $(ACE_QT_CPPFLAGS) - -client_SOURCES = \ - client.cpp \ - client_moc.cpp \ - testC.cpp \ - client.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -client_LDFLAGS = \ - $(ACE_QT_LDFLAGS) - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_QtResource.la \ - $(ACE_BUILDDIR)/ace/libACE_QtReactor.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - $(ACE_QT_LIBS) - -endif BUILD_TAO_QTRESOURCE -endif BUILD_QT -endif BUILD_EXCEPTIONS -endif BUILD_ACE_QTREACTOR - -## 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/QtTests/QtTests.mpc b/tests/QtTests/QtTests.mpc index 95dad19f581..5805f452dcd 100644 --- a/tests/QtTests/QtTests.mpc +++ b/tests/QtTests/QtTests.mpc @@ -1,10 +1,10 @@ // -*- MPC -*- // $Id$ -project(*server): taoserver, tao_qtresource { +project(*server): taoserver, tao_qtresource, ace_qt4 { MOC_Files { - test_i.h + test_i.h } Source_Files { @@ -14,7 +14,7 @@ project(*server): taoserver, tao_qtresource { } } -project(*client): taoclient, anytypecode, tao_qtresource { +project(*client): taoclient, anytypecode, tao_qtresource, ace_qt4 { after += *server MOC_Files { diff --git a/tests/QtTests/client.cpp b/tests/QtTests/client.cpp index 9f91969b420..d4f549290d7 100644 --- a/tests/QtTests/client.cpp +++ b/tests/QtTests/client.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "tao/QtResource/QtResource_Loader.h" -ACE_RCSID(QtTests, client, "$Id$") - #include "client.h" int @@ -29,7 +27,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // This may look a bit suspect, but Qt wants the manager widget // as the toplevel widget unlike Xt for display purposes. - app.setMainWidget (&(client.box_)); + app.setActiveWindow (&(client.mainwindow_)); // Show them on Screen client.show (); @@ -98,12 +96,13 @@ void Client::create_widgets (/**/) { // Ewsize the box - this->box_.resize (200,120); + this->mainwindow_.resize (200,120); + this->mainwindow_.setWindowTitle("QtClient"); // Make a pushbutton widget ACE_NEW (this->push_button_, - QPushButton ("Quit", - &this->box_)); + QPushButton ("Quit")); + box_.addWidget(this->push_button_); // Connect the click () SIGNAL routine with the SLOT handler that we // have defined @@ -114,14 +113,15 @@ Client::create_widgets (/**/) // Create a slider widget ACE_NEW (this->slider_, - QSlider (QSlider::Horizontal, - &this->box_, - "Slider")); + QSlider (Qt::Horizontal)); // Add resource for the slider this->slider_->setRange (0, 99); this->slider_->setValue (0); + box_.addWidget(this->slider_); + + // Connect the valuechanged SIGNAL routine with the slot that we // have defined. THe slot routine would invoke the remote call. QObject::connect (this->slider_, @@ -129,12 +129,15 @@ Client::create_widgets (/**/) this, SLOT (remote_call (int))); + this->mainwindow_.setLayout(&box_); + + } void Client::show (void) { - this->box_.show (); + this->mainwindow_.show (); } void diff --git a/tests/QtTests/client.h b/tests/QtTests/client.h index fedef24e6d1..e37ff4485b1 100644 --- a/tests/QtTests/client.h +++ b/tests/QtTests/client.h @@ -1,65 +1,63 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Xt_Stopwatch/Stopwatch_client -// -// = FILENAME -// client.h -// -// = AUTHOR -// Balachandran Natarajan <bala@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file client.h + * + * $Id$ + * + * @author Balachandran Natarajan <bala@cs.wustl.edu> + */ +//============================================================================= + #ifndef _QT_CLIENT_H #define _QT_CLIENT_H #include "testC.h" -#include <qapplication.h> -#include <qvbox.h> -#include <qslider.h> -#include <qpushbutton.h> +#include <QtGui/qapplication.h> +#include <QtGui/qboxlayout.h> +#include <QtGui/qslider.h> +#include <QtGui/qpushbutton.h> class Client : public QObject { Q_OBJECT public: + /// ctor Client (CORBA::ORB_ptr orb, QApplication &app); - // ctor + ///Dtor.. ~Client (void); - //Dtor.. + /// Adds the callbacks to the GUI underneath..... void create_widgets (void); - // Adds the callbacks to the GUI underneath..... void show (void); void parse_args (int argc, ACE_TCHAR *argv[]); - QVBox box_; - // A box widget.. + /// A box widget.. + QHBoxLayout box_; + QWidget mainwindow_; public slots: + /// Two slot handlers for the two widgets that we have void remote_call (int val); void shutdown_call (void); - // Two slot handlers for the two widgets that we have private: + /// A push button QPushButton *push_button_; - // A push button + /// A slider widget QSlider *slider_; - // A slider widget + /// The ORB CORBA::ORB_var orb_; - // The ORB LCD_Display_var server_; diff --git a/tests/QtTests/server.cpp b/tests/QtTests/server.cpp index 7c7817eb715..6552506e4b8 100644 --- a/tests/QtTests/server.cpp +++ b/tests/QtTests/server.cpp @@ -3,16 +3,14 @@ #include "test_i.h" #include "ace/Get_Opt.h" -ACE_RCSID (QtTests, server, "$Id$") - // who defines index macro? #ifdef index #undef index #endif #include "tao/QtResource/QtResource_Loader.h" -#include <qlcdnumber.h> -#include <qvbox.h> -#include <qslider.h> +#include <QtGui/qlcdnumber.h> +#include <QtGui/qboxlayout.h> +#include <QtGui/qslider.h> #include "ace/OS_NS_stdio.h" @@ -42,7 +40,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; } @@ -89,10 +87,13 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) LCD_Display::_narrow (object.in ()); // Create the LCD after the QVbox is created. - QVBox box; + QWidget mainwindow_; + mainwindow_.resize (145, 100); + mainwindow_.setWindowTitle("QtServer"); - box.resize (145, 100); - QLCDNumber lcd (2, &box, "lcd_display"); + QVBoxLayout *box = new QVBoxLayout(); + QLCDNumber lcd (2); + box->addWidget(&lcd); // Connect the signal from the hosted servant with the public // SLOT method display () for the LCD Widget. @@ -102,8 +103,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) &lcd, SLOT (display (int))); - app.setMainWidget(&box); - box.show (); + mainwindow_.setLayout(box); + app.setActiveWindow(&(mainwindow_)); + mainwindow_.show (); // End of QT specific stuff.. diff --git a/tests/QtTests/test.idl b/tests/QtTests/test.idl index 1dc08b44be6..d65cc24720a 100644 --- a/tests/QtTests/test.idl +++ b/tests/QtTests/test.idl @@ -3,7 +3,7 @@ interface LCD_Display { void send_val (in long val); - // Remote method through which the + // Remote method through which the // slider sets the value of the lcd display void shutdown (); diff --git a/tests/QtTests/test_i.cpp b/tests/QtTests/test_i.cpp index 7ce6cc05e7d..745b65dc513 100644 --- a/tests/QtTests/test_i.cpp +++ b/tests/QtTests/test_i.cpp @@ -2,10 +2,6 @@ #include "test_i.h" -ACE_RCSID( QtTests, - test_i, - "$Id$") - LCD_Display_imp::LCD_Display_imp (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) diff --git a/tests/QtTests/test_i.h b/tests/QtTests/test_i.h index f1d517adfa8..193e6e5655e 100644 --- a/tests/QtTests/test_i.h +++ b/tests/QtTests/test_i.h @@ -1,36 +1,35 @@ -// $Id$ -// ============================================================================ -// -// = LIBRARY -// TAO/tests/QtTests -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Bala Natarajan <bala@cs.wustl.edu> -// -// ============================================================================ +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Bala Natarajan <bala@cs.wustl.edu> + */ +//============================================================================= + #ifndef _QT_TEST_I_H #define _QT_TEST_I_H #include "testS.h" -#include <qapplication.h> -#include <qobject.h> +#include <QtGui/qapplication.h> +#include <QtCore/qobject.h> class LCD_Display_imp : public QObject, public POA_LCD_Display { + /** + * = TITLE + * LCD_Display implementation class + * + * = DESCRIPTION + * Implements the LCD_Display interface in test.idl + * + */ Q_OBJECT - // = TITLE - // LCD_Display implementation class - // - // = DESCRIPTION - // Implements the LCD_Display interface in test.idl - // public: LCD_Display_imp (CORBA::ORB_ptr); @@ -44,8 +43,8 @@ public: void set_value (int val); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB }; #endif /* SERVER_TEST_I_H */ diff --git a/tests/Queued_Message_Test/Makefile.am b/tests/Queued_Message_Test/Makefile.am deleted file mode 100644 index f7e4ca76e66..00000000000 --- a/tests/Queued_Message_Test/Makefile.am +++ /dev/null @@ -1,44 +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.Queued_Message_Test.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = Queued_Message_Test - -Queued_Message_Test_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Queued_Message_Test_SOURCES = \ - Queued_Message_Test.cpp - -Queued_Message_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/Queued_Message_Test/Queued_Message_Test.cpp b/tests/Queued_Message_Test/Queued_Message_Test.cpp index 3a557a0c78e..e9cfc0daf8b 100644 --- a/tests/Queued_Message_Test/Queued_Message_Test.cpp +++ b/tests/Queued_Message_Test/Queued_Message_Test.cpp @@ -17,10 +17,6 @@ #include "ace/OS_NS_time.h" #include "ace/OS_NS_stdlib.h" -ACE_RCSID (tests, - Queued_Message_Test, - "$Id$") - /// Max number of bytes on each message block const size_t max_block_length = 256; diff --git a/tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am b/tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am deleted file mode 100644 index 12ef647cef0..00000000000 --- a/tests/RTCORBA/Activate_Object_Multiple_ORBs/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.AO_Multiple_ORBs.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) -Sa -St $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - test.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -server_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/RTCORBA/Banded_Connections/Makefile.am b/tests/RTCORBA/Banded_Connections/Makefile.am deleted file mode 100644 index d6e46e184cf..00000000000 --- a/tests/RTCORBA/Banded_Connections/Makefile.am +++ /dev/null @@ -1,114 +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.RTCORBA_Banded_Conn_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.RTCORBA_Banded_Conn_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Banded_Conn_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Banded_Connections/svc.conf b/tests/RTCORBA/Banded_Connections/svc.conf index 2154375e265..e92d9e0da74 100644 --- a/tests/RTCORBA/Banded_Connections/svc.conf +++ b/tests/RTCORBA/Banded_Connections/svc.conf @@ -1,3 +1,5 @@ +# $Id$ + # No options required for regular testing # For real-time testing, uncomment the following line: diff --git a/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp b/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp index 86416ddadde..cc6f1339fc7 100644 --- a/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp +++ b/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp @@ -6,8 +6,6 @@ #include "Client_ORBInitializer.h" #include "interceptors.h" -ACE_RCSID (Client_Propagated, Client_ORBInitializer, "$Id$") - Client_ORBInitializer::Client_ORBInitializer (void) { } diff --git a/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp b/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp index f0e7c5e1797..e455ac9af81 100644 --- a/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp +++ b/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp @@ -4,10 +4,6 @@ #include "tao/OctetSeqC.h" #include "ace/Log_Msg.h" -ACE_RCSID (Client_Propagated, - interceptors, - "$Id$") - Client_Request_Interceptor:: Client_Request_Interceptor (const char *id) : myname_ ("Client_Request_Interceptor"), diff --git a/tests/RTCORBA/Bug_3382_Regression/svc.conf b/tests/RTCORBA/Bug_3382_Regression/svc.conf index 6ba8bde66ff..4e5bbb07102 100644 --- a/tests/RTCORBA/Bug_3382_Regression/svc.conf +++ b/tests/RTCORBA/Bug_3382_Regression/svc.conf @@ -1,3 +1,5 @@ +# $Id$ + # No options required for regular testing # I've followed the pattern of other real time tests here - basically the client / server part of this # test is a no-op (as are they) unless you *do* modify this file. diff --git a/tests/RTCORBA/Bug_3643_Regression/client.cpp b/tests/RTCORBA/Bug_3643_Regression/client.cpp index d578c7336b4..0901e47d1c7 100644 --- a/tests/RTCORBA/Bug_3643_Regression/client.cpp +++ b/tests/RTCORBA/Bug_3643_Regression/client.cpp @@ -8,8 +8,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_time.h" -ACE_RCSID(Thread_Pool, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://ior_1"); int iterations = 1000; int shutdown_server = 0; @@ -69,7 +67,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/RTCORBA/Bug_3643_Regression/run_test.pl b/tests/RTCORBA/Bug_3643_Regression/run_test.pl index d51b5d263d5..89fb6d384b9 100755 --- a/tests/RTCORBA/Bug_3643_Regression/run_test.pl +++ b/tests/RTCORBA/Bug_3643_Regression/run_test.pl @@ -15,15 +15,15 @@ $number_of_clients = 4; $status = 0; $continuous = ($^O eq 'hpux'); -@configurations = +@configurations = ({ - file => "ior_1", + file => "ior_1", description => "Invoking methods on servant in default thread pool", },{ - file => "ior_2", + file => "ior_2", description => "Invoking methods on servant in first RT thread pool (without lanes)", },{ - file => "ior_3", + file => "ior_3", description => "Invoking methods on servant in second RT thread pool (with lanes)", }, ); @@ -38,7 +38,7 @@ sub run_clients my @parms = @_; $arg = $parms[0]; $clients = $parms[1]; - + for ($i = 0; $i < $clients; $i++) { $CL[$i] = $client->CreateProcess ("client", $arg); @@ -72,7 +72,7 @@ for $test (@configurations) { # Mark as no longer running to avoid errors on exit. $SV->{RUNNING} = 0; exit $status; - } + } else { print STDERR "ERROR: cannot find ior file: $test->{file}\n"; $status = 1; @@ -85,7 +85,7 @@ for $test (@configurations) { print STDERR "\n*************************************************************\n"; print STDERR "$test->{description}\n"; print STDERR "*************************************************************\n\n"; - + $iorfile = $client->LocalFile ($test->{file}); run_clients ("-k file://$iorfile", $number_of_clients); print STDERR "Prepare next cycle"; diff --git a/tests/RTCORBA/Bug_3643_Regression/server.cpp b/tests/RTCORBA/Bug_3643_Regression/server.cpp index 96745267fb2..a2562a1baf5 100644 --- a/tests/RTCORBA/Bug_3643_Regression/server.cpp +++ b/tests/RTCORBA/Bug_3643_Regression/server.cpp @@ -8,8 +8,6 @@ #include "tao/RTPortableServer/RTPortableServer.h" #include "../check_supported_priorities.cpp" -ACE_RCSID(Thread_Pool, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); int ior_count = 1; CORBA::ULong static_threads = 1; @@ -53,7 +51,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } @@ -67,7 +65,7 @@ write_ior_to_file (CORBA::ORB_ptr orb, char filename[BUFSIZ]; ACE_OS::sprintf (filename, "%s_%d", - ior_output_file, + ACE_TEXT_ALWAYS_CHAR (ior_output_file), ior_count++); FILE *output_file = diff --git a/tests/RTCORBA/Bug_3643_Regression/svc.conf.dynamic b/tests/RTCORBA/Bug_3643_Regression/svc.conf.dynamic index c288d674567..8b03973b4b9 100644 --- a/tests/RTCORBA/Bug_3643_Regression/svc.conf.dynamic +++ b/tests/RTCORBA/Bug_3643_Regression/svc.conf.dynamic @@ -1 +1,3 @@ +# $Id$ + static RT_ORB_Loader "-RTORBDynamicThreadIdleTimeout 1000000" diff --git a/tests/RTCORBA/Bug_3643_Regression/test_i.cpp b/tests/RTCORBA/Bug_3643_Regression/test_i.cpp index 3fec3b5fbf6..93cf9c3939a 100644 --- a/tests/RTCORBA/Bug_3643_Regression/test_i.cpp +++ b/tests/RTCORBA/Bug_3643_Regression/test_i.cpp @@ -5,8 +5,6 @@ #include "tao/ORB_Core.h" #include "tao/RTCORBA/Thread_Pool.h" -ACE_RCSID(Thread_Pools, test_i, "$Id$") - test_i::test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, long msec_sleep) diff --git a/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp b/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp index 86416ddadde..cc6f1339fc7 100644 --- a/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp +++ b/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp @@ -6,8 +6,6 @@ #include "Client_ORBInitializer.h" #include "interceptors.h" -ACE_RCSID (Client_Propagated, Client_ORBInitializer, "$Id$") - Client_ORBInitializer::Client_ORBInitializer (void) { } diff --git a/tests/RTCORBA/Client_Propagated/Makefile.am b/tests/RTCORBA/Client_Propagated/Makefile.am deleted file mode 100644 index 3157c972f23..00000000000 --- a/tests/RTCORBA/Client_Propagated/Makefile.am +++ /dev/null @@ -1,122 +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.RTCORBA_Client_Propagated_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.RTCORBA_Client_Propagated_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Client_ORBInitializer.cpp \ - client.cpp \ - interceptors.cpp \ - testC.cpp \ - Client_ORBInitializer.h \ - interceptors.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Client_Propagated_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - Client_ORBInitializer.h \ - interceptors.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Client_Propagated/interceptors.cpp b/tests/RTCORBA/Client_Propagated/interceptors.cpp index f0e7c5e1797..e455ac9af81 100644 --- a/tests/RTCORBA/Client_Propagated/interceptors.cpp +++ b/tests/RTCORBA/Client_Propagated/interceptors.cpp @@ -4,10 +4,6 @@ #include "tao/OctetSeqC.h" #include "ace/Log_Msg.h" -ACE_RCSID (Client_Propagated, - interceptors, - "$Id$") - Client_Request_Interceptor:: Client_Request_Interceptor (const char *id) : myname_ ("Client_Request_Interceptor"), diff --git a/tests/RTCORBA/Client_Propagated/svc.conf b/tests/RTCORBA/Client_Propagated/svc.conf index 2154375e265..e92d9e0da74 100644 --- a/tests/RTCORBA/Client_Propagated/svc.conf +++ b/tests/RTCORBA/Client_Propagated/svc.conf @@ -1,3 +1,5 @@ +# $Id$ + # No options required for regular testing # For real-time testing, uncomment the following line: diff --git a/tests/RTCORBA/Client_Protocol/Makefile.am b/tests/RTCORBA/Client_Protocol/Makefile.am deleted file mode 100644 index b1db2831849..00000000000 --- a/tests/RTCORBA/Client_Protocol/Makefile.am +++ /dev/null @@ -1,116 +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.RTCORBA_Client_Protocol_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.RTCORBA_Client_Protocol_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Client_Protocol_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Client_Protocol/svc.conf b/tests/RTCORBA/Client_Protocol/svc.conf index 16b29a6e009..b99bdeffc67 100644 --- a/tests/RTCORBA/Client_Protocol/svc.conf +++ b/tests/RTCORBA/Client_Protocol/svc.conf @@ -1,3 +1,5 @@ +# $Id$ + # Options for SHMIOP protocol static SHMIOP_Factory "-MMAPFilePrefix server_shmiop" diff --git a/tests/RTCORBA/Collocation/Collocation.cpp b/tests/RTCORBA/Collocation/Collocation.cpp index 3d362683281..aaf702561a0 100644 --- a/tests/RTCORBA/Collocation/Collocation.cpp +++ b/tests/RTCORBA/Collocation/Collocation.cpp @@ -9,8 +9,6 @@ #include "tao/RTPortableServer/RTPortableServer.h" #include "../check_supported_priorities.cpp" -ACE_RCSID(Collocations, Collocations, "$Id$") - RTCORBA::Priority default_thread_priority; class test_i; diff --git a/tests/RTCORBA/Collocation/Makefile.am b/tests/RTCORBA/Collocation/Makefile.am deleted file mode 100644 index 9ac1a07742a..00000000000 --- a/tests/RTCORBA/Collocation/Makefile.am +++ /dev/null @@ -1,84 +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) - - -## Makefile.RTCORBA_Collocation_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -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 = Collocation - -Collocation_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Collocation_SOURCES = \ - Collocation.cpp \ - testC.cpp \ - testS.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -Collocation_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Collocation/continuous.conf b/tests/RTCORBA/Collocation/continuous.conf index 8d8795f4817..fd95de5142e 100644 --- a/tests/RTCORBA/Collocation/continuous.conf +++ b/tests/RTCORBA/Collocation/continuous.conf @@ -1,2 +1,4 @@ +# $Id$ + # Option for platforms where direct mapping doesn't work static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/tests/RTCORBA/Collocation/svc.conf b/tests/RTCORBA/Collocation/svc.conf index 2154375e265..e92d9e0da74 100644 --- a/tests/RTCORBA/Collocation/svc.conf +++ b/tests/RTCORBA/Collocation/svc.conf @@ -1,3 +1,5 @@ +# $Id$ + # No options required for regular testing # For real-time testing, uncomment the following line: diff --git a/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp b/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp index 27dce42812b..1db92e716ab 100644 --- a/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp +++ b/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp @@ -5,8 +5,6 @@ #include "tao/RTCORBA/RTCORBA.h" #include "../check_supported_priorities.cpp" -ACE_RCSID(Destroy_Thread_Pools, Destroy_Thread_Pools, "$Id$") - static CORBA::ULong stacksize = 0; static CORBA::ULong static_threads = 1; static CORBA::ULong dynamic_threads = 0; diff --git a/tests/RTCORBA/Destroy_Thread_Pool/Makefile.am b/tests/RTCORBA/Destroy_Thread_Pool/Makefile.am deleted file mode 100644 index 0244903c9e5..00000000000 --- a/tests/RTCORBA/Destroy_Thread_Pool/Makefile.am +++ /dev/null @@ -1,52 +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.RTCORBA_Destroy_Thread_Pool_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS = Destroy_Thread_Pool - -Destroy_Thread_Pool_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Destroy_Thread_Pool_SOURCES = \ - Destroy_Thread_Pool.cpp - -Destroy_Thread_Pool_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Destroy_Thread_Pool/continuous.conf b/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf index 8d8795f4817..fd95de5142e 100644 --- a/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf +++ b/tests/RTCORBA/Destroy_Thread_Pool/continuous.conf @@ -1,2 +1,4 @@ +# $Id$ + # Option for platforms where direct mapping doesn't work static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp b/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp index bb503a6728f..155d0516de5 100644 --- a/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp +++ b/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp @@ -4,10 +4,6 @@ #include "tao/debug.h" #include "ace/Log_Msg.h" -ACE_RCSID (Strategies, - Custom_Network_Priority_Mapping, - "$Id$") - #define IPDSFIELD_DSCP_DEFAULT 0x00 #define IPDSFIELD_DSCP_CS1 0x08 #define IPDSFIELD_DSCP_CS2 0x10 diff --git a/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h b/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h index fac5d84a433..cfdcb226bee 100644 --- a/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h +++ b/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h @@ -1,20 +1,17 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO -// -// = FILENAME -// Custom_Network_Priority_Mapping.h -// -// = DESCRIPTION -// Declares the Custom_Network_Priority_Mapping interface, -// -// = AUTHOR -// Yamuna Krishnamurthy (yamuna@oomworks.com) -// -// ============================================================================ + +//============================================================================= +/** + * @file Custom_Network_Priority_Mapping.h + * + * $Id$ + * + * Declares the Custom_Network_Priority_Mapping interface, + * + * + * @author Yamuna Krishnamurthy (yamuna@oomworks.com) + */ +//============================================================================= + #ifndef CUSTOM_NETWORK_PRIORITY_MAPPING_H #define CUSTOM_NETWORK_PRIORITY_MAPPING_H @@ -26,18 +23,18 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +/** + * @class Custom_Network_Priority_Mapping + * + * @brief A simple implementation of the Network_Priority_Mapping interface + * + * This implementation uses custom mapping between the range of + * priorities for a given scheduling class (ACE_SCHED_OTHER, + * ACE_SCHED_FIFO, ACE_SCHED_RR) and the valid range of CORBA + * priorities (0...32767) + */ class Custom_Network_Priority_Mapping : public TAO_Network_Priority_Mapping { - // - // = TITLE - // A simple implementation of the Network_Priority_Mapping interface - // - // = DESCRIPTION - // This implementation uses custom mapping between the range of - // priorities for a given scheduling class (ACE_SCHED_OTHER, - // ACE_SCHED_FIFO, ACE_SCHED_RR) and the valid range of CORBA - // priorities (0...32767) - // public: Custom_Network_Priority_Mapping (void); diff --git a/tests/RTCORBA/Diffserv/Makefile.am b/tests/RTCORBA/Diffserv/Makefile.am deleted file mode 100644 index 4484516bf5c..00000000000 --- a/tests/RTCORBA/Diffserv/Makefile.am +++ /dev/null @@ -1,119 +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.RTCORBA_Diffserv_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.RTCORBA_Diffserv_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Custom_Network_Priority_Mapping.cpp \ - client.cpp \ - testC.cpp \ - Custom_Network_Priority_Mapping.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Diffserv_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Custom_Network_Priority_Mapping.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - Custom_Network_Priority_Mapping.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Dynamic_Thread_Pool/Makefile.am b/tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am deleted file mode 100644 index 727f056645f..00000000000 --- a/tests/RTCORBA/Dynamic_Thread_Pool/Makefile.am +++ /dev/null @@ -1,119 +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.RT_Dynamic_Thread_Pool_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.RT_Dynamic_Thread_Pool_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RT_Dynamic_Thread_Pool_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Dynamic_Thread_Pool/client.cpp b/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp index 4d1a63cc19c..e1a03f0299d 100644 --- a/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp +++ b/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp @@ -8,8 +8,6 @@ #include "ace/OS_NS_unistd.h" #include "../check_supported_priorities.cpp" -ACE_RCSID(Thread_Pool, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://ior_1"); int iterations = 6; int shutdown_server = 0; @@ -48,7 +46,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf b/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf index 41c1919a08a..a8ed67d58c8 100644 --- a/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf +++ b/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf @@ -1,2 +1,4 @@ +# $Id$ + # Option for platforms where direct mapping doesn't work static RT_ORB_Loader "-ORBPriorityMapping continuous -RTORBDynamicThreadIdleTimeout 1000000" diff --git a/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp index 862ade1d4f5..b703aff675d 100644 --- a/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp +++ b/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp @@ -8,8 +8,6 @@ #include "tao/RTPortableServer/RTPortableServer.h" #include "../check_supported_priorities.cpp" -ACE_RCSID(Thread_Pool, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); int ior_count = 1; CORBA::ULong static_threads = 1; @@ -53,7 +51,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } @@ -67,7 +65,7 @@ write_ior_to_file (CORBA::ORB_ptr orb, char filename[BUFSIZ]; ACE_OS::sprintf (filename, "%s_%d", - ior_output_file, + ACE_TEXT_ALWAYS_CHAR (ior_output_file), ior_count++); FILE *output_file = diff --git a/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf b/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf index d3e71e1da4b..0b1f7bb3bcd 100644 --- a/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf +++ b/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf @@ -1 +1,3 @@ +# $Id$ + static RT_ORB_Loader "-RTORBDynamicThreadIdleTimeout 100000" diff --git a/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp b/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp index 3fec3b5fbf6..93cf9c3939a 100644 --- a/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp +++ b/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp @@ -5,8 +5,6 @@ #include "tao/ORB_Core.h" #include "tao/RTCORBA/Thread_Pool.h" -ACE_RCSID(Thread_Pools, test_i, "$Id$") - test_i::test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, long msec_sleep) diff --git a/tests/RTCORBA/Explicit_Binding/Makefile.am b/tests/RTCORBA/Explicit_Binding/Makefile.am deleted file mode 100644 index 307bbec3cb7..00000000000 --- a/tests/RTCORBA/Explicit_Binding/Makefile.am +++ /dev/null @@ -1,116 +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.RTCORBA_Explicit_Binding_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.RTCORBA_Explicit_Binding_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Explicit_Binding_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Explicit_Binding/svc.conf b/tests/RTCORBA/Explicit_Binding/svc.conf index 57fc20f1023..74be1affa18 100644 --- a/tests/RTCORBA/Explicit_Binding/svc.conf +++ b/tests/RTCORBA/Explicit_Binding/svc.conf @@ -1,2 +1,4 @@ +# $Id$ + # Options for SHMIOP protocol static SHMIOP_Factory "-MMAPFilePrefix server_shmiop" diff --git a/tests/RTCORBA/Linear_Priority/Makefile.am b/tests/RTCORBA/Linear_Priority/Makefile.am deleted file mode 100644 index e1695f0a247..00000000000 --- a/tests/RTCORBA/Linear_Priority/Makefile.am +++ /dev/null @@ -1,114 +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.RTCORBA_Linear_Priority_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.RTCORBA_Linear_Priority_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Linear_Priority_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Linear_Priority/run_test.pl b/tests/RTCORBA/Linear_Priority/run_test.pl index 72aaa9fa9f4..c60447d6388 100755 --- a/tests/RTCORBA/Linear_Priority/run_test.pl +++ b/tests/RTCORBA/Linear_Priority/run_test.pl @@ -65,7 +65,7 @@ sub run_server if ($SV->Spawn () == -1) { exit 1; } - + if ($server->WaitForFileTimed ($iorbase, $server->ProcessStartWaitInterval()) == -1) { check_supported_priorities ($SV); @@ -83,7 +83,7 @@ sub zap_server print STDERR "ERROR: server returned $server_status\n"; $status = 1; } - + $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); diff --git a/tests/RTCORBA/Linear_Priority/svc.conf b/tests/RTCORBA/Linear_Priority/svc.conf index 56e9a13fea0..cf6a420b24c 100644 --- a/tests/RTCORBA/Linear_Priority/svc.conf +++ b/tests/RTCORBA/Linear_Priority/svc.conf @@ -1,3 +1,5 @@ +# $Id$ + # Options required for regular testing; comment out for real-time testing static RT_ORB_Loader "-ORBPriorityMapping linear" diff --git a/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am b/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am deleted file mode 100644 index 25e08c9ae06..00000000000 --- a/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile.am +++ /dev/null @@ -1,116 +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.RTCORBA_MT_Client_Proto_Prio_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.RTCORBA_MT_Client_Proto_Prio_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_MT_Client_Proto_Prio_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/MT_Client_Protocol_Priority/process-output.pl b/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl index 56cc7f6a747..ebebfc4f323 100755 --- a/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl +++ b/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl @@ -129,20 +129,20 @@ elsif ($iiop_requests != $shmiop_requests) { print "ERROR: Number of iiop requests differs from shmiop differs from " ."number of iterations\n"; - print "IIOP Request: "; + print "IIOP Request: "; print $iiop_requests; print "\n"; - print "IIOP Request: "; + print "IIOP Request: "; print $iiop_requests; print "\n"; ++$errors; } -elsif (($priority1 != $priority2 +elsif (($priority1 != $priority2 and ($priority1_requests != $priority2_requests or $priority1_requests != $iterations)) - or ($priority1 == $priority2 - and ($priority2_requests != 0 + or ($priority1 == $priority2 + and ($priority2_requests != 0 or $priority1_requests != 2*$iterations))) { print "ERROR: Nonmatching number of requests of each priority\n"; diff --git a/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf b/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf index d5c77cef4a9..4f5af462be1 100644 --- a/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf +++ b/tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf @@ -1,3 +1,5 @@ +# $Id$ + # Options for SHMIOP protocol static SHMIOP_Factory "-MMAPFilePrefix server_shmiop" diff --git a/tests/RTCORBA/Makefile.am b/tests/RTCORBA/Makefile.am deleted file mode 100644 index 568e309829e..00000000000 --- a/tests/RTCORBA/Makefile.am +++ /dev/null @@ -1,34 +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 = \ - Activate_Object_Multiple_ORBs \ - Banded_Connections \ - Client_Propagated \ - Client_Protocol \ - Collocation \ - Destroy_Thread_Pool \ - Diffserv \ - Dynamic_Thread_Pool \ - Explicit_Binding \ - Linear_Priority \ - MT_Client_Protocol_Priority \ - ORB_init \ - Persistent_IOR \ - Policies \ - Policy_Combinations \ - Priority_Inversion_With_Bands \ - Private_Connection \ - Profile_And_Endpoint_Selection \ - RTMutex \ - Server_Declared \ - Server_Protocol \ - Thread_Pool - diff --git a/tests/RTCORBA/ORB_init/Makefile.am b/tests/RTCORBA/ORB_init/Makefile.am deleted file mode 100644 index 3b87ae65eeb..00000000000 --- a/tests/RTCORBA/ORB_init/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.ORB_init_RT.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS = ORB_init - -ORB_init_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -ORB_init_SOURCES = \ - ORB_init.cpp - -ORB_init_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Persistent_IOR/Makefile.am b/tests/RTCORBA/Persistent_IOR/Makefile.am deleted file mode 100644 index a728daf22d0..00000000000 --- a/tests/RTCORBA/Persistent_IOR/Makefile.am +++ /dev/null @@ -1,114 +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.RTCORBA_Persistent_IOR_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.RTCORBA_Persistent_IOR_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Persistent_IOR_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Persistent_IOR/continuous.conf b/tests/RTCORBA/Persistent_IOR/continuous.conf index 8d8795f4817..fd95de5142e 100644 --- a/tests/RTCORBA/Persistent_IOR/continuous.conf +++ b/tests/RTCORBA/Persistent_IOR/continuous.conf @@ -1,2 +1,4 @@ +# $Id$ + # Option for platforms where direct mapping doesn't work static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/tests/RTCORBA/Persistent_IOR/server.cpp b/tests/RTCORBA/Persistent_IOR/server.cpp index 28c06691035..fbfb1d0974d 100644 --- a/tests/RTCORBA/Persistent_IOR/server.cpp +++ b/tests/RTCORBA/Persistent_IOR/server.cpp @@ -109,7 +109,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/RTCORBA/Policies/Makefile.am b/tests/RTCORBA/Policies/Makefile.am deleted file mode 100644 index ab5b6b9cbb4..00000000000 --- a/tests/RTCORBA/Policies/Makefile.am +++ /dev/null @@ -1,52 +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.RTCORBA_Policies_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS = Policies - -Policies_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Policies_SOURCES = \ - Policies.cpp - -Policies_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Policies/Policies.cpp b/tests/RTCORBA/Policies/Policies.cpp index cd8aebbdca2..78b61e238c8 100644 --- a/tests/RTCORBA/Policies/Policies.cpp +++ b/tests/RTCORBA/Policies/Policies.cpp @@ -1,22 +1,19 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/RTCORBA/Policies -// -// = FILENAME -// Policies.cpp -// -// = DESCRIPTION -// This program tests the construction of RTCORBA policies, both -// through the generic ORB::create_policy interface and the -// RTCORBA specific interfaces. -// -// = AUTHOR -// Irfan Pyarali -// -//========================================================================= + +//============================================================================= +/** + * @file Policies.cpp + * + * $Id$ + * + * This program tests the construction of RTCORBA policies, both + * through the generic ORB::create_policy interface and the + * RTCORBA specific interfaces. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "tao/ORB.h" #include "tao/RTCORBA/RTCORBA.h" diff --git a/tests/RTCORBA/Policy_Combinations/Makefile.am b/tests/RTCORBA/Policy_Combinations/Makefile.am deleted file mode 100644 index c706a19b40d..00000000000 --- a/tests/RTCORBA/Policy_Combinations/Makefile.am +++ /dev/null @@ -1,114 +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.RTCORBA_Policy_Combinations_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.RTCORBA_Policy_Combinations_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Policy_Combinations_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Policy_Combinations/run_test.pl b/tests/RTCORBA/Policy_Combinations/run_test.pl index 0f283da95ba..05b3c10408f 100755 --- a/tests/RTCORBA/Policy_Combinations/run_test.pl +++ b/tests/RTCORBA/Policy_Combinations/run_test.pl @@ -13,7 +13,7 @@ $status = 0; my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; -@iorfiles = +@iorfiles = ( "root", "child", @@ -36,7 +36,7 @@ sub run_client $CL = $client->CreateProcess ("client", @_); $CL->Spawn (); - + $client_status = $CL->WaitKill ($client->ProcessStartWaitInterval ()); if ($client_status != 0) { @@ -64,18 +64,18 @@ for $file (@iorfiles) { # Mark as no longer running to avoid errors on exit. $SV->{RUNNING} = 0; exit $status; - } - else { + } + else { print STDERR "ERROR: cannot find ior file: $server_iorfile\n"; $status = 1; goto kill_server; } } - + print STDERR "\n******************************************************\n"; print STDERR "Invoking methods on servant in $file poa\n"; print STDERR "******************************************************\n\n"; - + run_client ("-k file://$client_iorfile"); } @@ -86,7 +86,7 @@ print STDERR "**************************\n\n"; $ior_file = $client->LocalFile ($iorfiles[0]); run_client ("-k file://$ior_file -i 0 -x"); -kill_server: +kill_server: print STDERR "Killing server...\n"; $server_status = $SV->Kill ($server->ProcessStopWaitInterval ()); diff --git a/tests/RTCORBA/Policy_Combinations/svc.conf b/tests/RTCORBA/Policy_Combinations/svc.conf index 4f8bca41eeb..39d05a94c51 100644 --- a/tests/RTCORBA/Policy_Combinations/svc.conf +++ b/tests/RTCORBA/Policy_Combinations/svc.conf @@ -1,3 +1,5 @@ +# $Id$ + # Options required for regular testing; comment out for real-time testing static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am b/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am deleted file mode 100644 index da9a2fc255a..00000000000 --- a/tests/RTCORBA/Priority_Inversion_With_Bands/Makefile.am +++ /dev/null @@ -1,119 +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.Priority_Inversion_With_Bands_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.Priority_Inversion_With_Bands_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.Priority_Inversion_With_Bands_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp index 1be484f6684..968e12e75bd 100644 --- a/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp +++ b/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp @@ -7,8 +7,6 @@ #include "ace/Task.h" #include "../check_supported_priorities.cpp" -ACE_RCSID(Priority_Inversion_With_Bands, client, "$Id$") - static const ACE_TCHAR *ior = ACE_TEXT("file://ior_1"); static int iterations = 12; static CORBA::ULong work = 2; @@ -56,7 +54,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf b/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf index 8d8795f4817..fd95de5142e 100644 --- a/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf +++ b/tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf @@ -1,2 +1,4 @@ +# $Id$ + # Option for platforms where direct mapping doesn't work static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp index d32f0d268f9..8c424029757 100644 --- a/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp +++ b/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp @@ -7,8 +7,6 @@ #include "tao/RTPortableServer/RTPortableServer.h" #include "../check_supported_priorities.cpp" -ACE_RCSID(Priority_Inversion_With_Bands, server, "$Id$") - static const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); static int ior_count = 1; static CORBA::ULong static_threads = 1; @@ -52,7 +50,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } @@ -66,7 +64,7 @@ write_ior_to_file (CORBA::ORB_ptr orb, char filename[BUFSIZ]; ACE_OS::sprintf (filename, "%s_%d", - ior_output_file, + ACE_TEXT_ALWAYS_CHAR (ior_output_file), ior_count++); FILE *output_file = diff --git a/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf b/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf index 2154375e265..e92d9e0da74 100644 --- a/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf +++ b/tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf @@ -1,3 +1,5 @@ +# $Id$ + # No options required for regular testing # For real-time testing, uncomment the following line: diff --git a/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp b/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp index c3af66871f5..636b668c44f 100644 --- a/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp +++ b/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp @@ -5,8 +5,6 @@ #include "tao/RTCORBA/Thread_Pool.h" #include "ace/Countdown_Time.h" -ACE_RCSID(Priority_Inversion_With_Bands, test_i, "$Id$") - test_i::test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, RTCORBA::Priority low_priority, diff --git a/tests/RTCORBA/Private_Connection/Makefile.am b/tests/RTCORBA/Private_Connection/Makefile.am deleted file mode 100644 index 5fb15f2895e..00000000000 --- a/tests/RTCORBA/Private_Connection/Makefile.am +++ /dev/null @@ -1,114 +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.RTCORBA_Private_Connection_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.RTCORBA_Private_Connection_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Private_Connection_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am b/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am deleted file mode 100644 index 2fe9ccba2d8..00000000000 --- a/tests/RTCORBA/Profile_And_Endpoint_Selection/Makefile.am +++ /dev/null @@ -1,117 +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.PaE_Selection_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.PaE_Selection_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.PaE_Selection_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp index 3930ea0dc92..e06538fdc19 100644 --- a/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp +++ b/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp @@ -1,18 +1,17 @@ -// $Id$ - -// ================================================================ -// -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// This is a client implementation. -// -// = AUTHOR -// Irfan Pyarali -// -// ================================================================ + +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * This is a client implementation. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "ace/Get_Opt.h" #include "ace/Task.h" @@ -24,8 +23,6 @@ #include "../common_args.cpp" #include "testC.h" -ACE_RCSID(Profile_And_Endpoint_Selection, client, "$Id$") - static int iterations = 1; static int debug = 1; static int shutdown_server = 0; diff --git a/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl b/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl index ada7040bb13..dc91a8ecbf8 100755 --- a/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl +++ b/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl @@ -85,7 +85,7 @@ sub run_client my $client_args = "@_" . " $extra_client_args"; print "client $client_args\n"; - + $CL = $client->CreateProcess ("client", "$client_args"); $CL->Spawn (); diff --git a/tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf b/tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf index 6bfc6d18fd8..9677f2345df 100644 --- a/tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf +++ b/tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf @@ -1,3 +1,5 @@ +# $Id$ + # Options for SHMIOP protocol static SHMIOP_Factory "-MMAPFilePrefix server_shmiop" diff --git a/tests/RTCORBA/RTMutex/Makefile.am b/tests/RTCORBA/RTMutex/Makefile.am deleted file mode 100644 index 1890acac35f..00000000000 --- a/tests/RTCORBA/RTMutex/Makefile.am +++ /dev/null @@ -1,52 +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.RTCORBA_RTMutex_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Server_Declared/Makefile.am b/tests/RTCORBA/Server_Declared/Makefile.am deleted file mode 100644 index c1986ef2e2f..00000000000 --- a/tests/RTCORBA/Server_Declared/Makefile.am +++ /dev/null @@ -1,114 +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.RTCORBA_Server_Declared_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.RTCORBA_Server_Declared_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Server_Declared_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Server_Declared/continuous.conf b/tests/RTCORBA/Server_Declared/continuous.conf index 8d8795f4817..fd95de5142e 100644 --- a/tests/RTCORBA/Server_Declared/continuous.conf +++ b/tests/RTCORBA/Server_Declared/continuous.conf @@ -1,2 +1,4 @@ +# $Id$ + # Option for platforms where direct mapping doesn't work static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/tests/RTCORBA/Server_Declared/run_test.pl b/tests/RTCORBA/Server_Declared/run_test.pl index 777edcbd732..05bf789d0cd 100755 --- a/tests/RTCORBA/Server_Declared/run_test.pl +++ b/tests/RTCORBA/Server_Declared/run_test.pl @@ -64,15 +64,15 @@ if ($server_status != 0) { if ($server->WaitForFileTimed ($iorbase2, $server->ProcessStartWaitInterval ()) == -1) { - $server_status = $SV->TimedWait (1); - if ($server_status == 2) { + $server_status = $SV->TimedWait (1); + if ($server_status == 2) { # Mark as no longer running to avoid errors on exit. - $SV->{RUNNING} = 0; - exit $status; - } - else { - print STDERR "ERROR: cannot find file <$server_iorfile2>\n"; - $SV->Kill (); + $SV->{RUNNING} = 0; + exit $status; + } + else { + print STDERR "ERROR: cannot find file <$server_iorfile2>\n"; + $SV->Kill (); exit 1; } } diff --git a/tests/RTCORBA/Server_Declared/svc.conf b/tests/RTCORBA/Server_Declared/svc.conf index 2154375e265..e92d9e0da74 100644 --- a/tests/RTCORBA/Server_Declared/svc.conf +++ b/tests/RTCORBA/Server_Declared/svc.conf @@ -1,3 +1,5 @@ +# $Id$ + # No options required for regular testing # For real-time testing, uncomment the following line: diff --git a/tests/RTCORBA/Server_Protocol/Makefile.am b/tests/RTCORBA/Server_Protocol/Makefile.am deleted file mode 100644 index 0ee58c7eae2..00000000000 --- a/tests/RTCORBA/Server_Protocol/Makefile.am +++ /dev/null @@ -1,116 +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.RTCORBA_Server_Protocol_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.RTCORBA_Server_Protocol_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Server_Protocol_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Server_Protocol/server_iiop.conf b/tests/RTCORBA/Server_Protocol/server_iiop.conf index 6970cc7974c..f3f5f7b38e9 100644 --- a/tests/RTCORBA/Server_Protocol/server_iiop.conf +++ b/tests/RTCORBA/Server_Protocol/server_iiop.conf @@ -1,2 +1,4 @@ +# $Id$ + # Protocol options static Advanced_Resource_Factory "-ORBProtocolFactory IIOP_Factory" diff --git a/tests/RTCORBA/Server_Protocol/server_iiop_shmiop.conf b/tests/RTCORBA/Server_Protocol/server_iiop_shmiop.conf index e93d62ad565..3ec59053a11 100644 --- a/tests/RTCORBA/Server_Protocol/server_iiop_shmiop.conf +++ b/tests/RTCORBA/Server_Protocol/server_iiop_shmiop.conf @@ -1,2 +1,4 @@ +# $Id$ + # Protocol options static Advanced_Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory SHMIOP_Factory " diff --git a/tests/RTCORBA/Server_Protocol/server_iiop_uiop.conf b/tests/RTCORBA/Server_Protocol/server_iiop_uiop.conf index 8278e468550..8a6b8931749 100644 --- a/tests/RTCORBA/Server_Protocol/server_iiop_uiop.conf +++ b/tests/RTCORBA/Server_Protocol/server_iiop_uiop.conf @@ -1,2 +1,4 @@ +# $Id$ + # Protocol options static Advanced_Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIOP_Factory " diff --git a/tests/RTCORBA/Server_Protocol/server_reverse.conf b/tests/RTCORBA/Server_Protocol/server_reverse.conf index 8f1988df985..5e13f4ec5e4 100644 --- a/tests/RTCORBA/Server_Protocol/server_reverse.conf +++ b/tests/RTCORBA/Server_Protocol/server_reverse.conf @@ -1,3 +1,5 @@ +# $Id$ + # Options for SHMIOP protocol static SHMIOP_Factory "-MMAPFilePrefix server_shmiop" diff --git a/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf b/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf index 9e1b5d05bab..c8678d85d41 100644 --- a/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf +++ b/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf @@ -1,3 +1,5 @@ +# $Id$ + # Options for SHMIOP protocol static SHMIOP_Factory "-MMAPFilePrefix server_shmiop" diff --git a/tests/RTCORBA/Server_Protocol/server_shmiop.conf b/tests/RTCORBA/Server_Protocol/server_shmiop.conf index c75f08cdd40..ae137dae9a8 100644 --- a/tests/RTCORBA/Server_Protocol/server_shmiop.conf +++ b/tests/RTCORBA/Server_Protocol/server_shmiop.conf @@ -1,3 +1,5 @@ +# $Id$ + # Options for SHMIOP protocol static SHMIOP_Factory "-MMAPFilePrefix server_shmiop" diff --git a/tests/RTCORBA/Server_Protocol/server_uiop.conf b/tests/RTCORBA/Server_Protocol/server_uiop.conf index eb6162bccf2..ed85b9686c9 100644 --- a/tests/RTCORBA/Server_Protocol/server_uiop.conf +++ b/tests/RTCORBA/Server_Protocol/server_uiop.conf @@ -1,2 +1,4 @@ +# $Id$ + # Protocol options static Advanced_Resource_Factory "-ORBProtocolFactory UIOP_Factory " diff --git a/tests/RTCORBA/Thread_Pool/Makefile.am b/tests/RTCORBA/Thread_Pool/Makefile.am deleted file mode 100644 index 60f29fbaffd..00000000000 --- a/tests/RTCORBA/Thread_Pool/Makefile.am +++ /dev/null @@ -1,119 +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.RTCORBA_Thread_Pool_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.RTCORBA_Thread_Pool_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - client.cpp \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Thread_Pool_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTCORBA/Thread_Pool/client.cpp b/tests/RTCORBA/Thread_Pool/client.cpp index f4514bf5024..a4eac855841 100644 --- a/tests/RTCORBA/Thread_Pool/client.cpp +++ b/tests/RTCORBA/Thread_Pool/client.cpp @@ -8,8 +8,6 @@ #include "ace/OS_NS_unistd.h" #include "../check_supported_priorities.cpp" -ACE_RCSID(Thread_Pool, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://ior_1"); int iterations = 6; int shutdown_server = 0; @@ -47,7 +45,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/RTCORBA/Thread_Pool/continuous.conf b/tests/RTCORBA/Thread_Pool/continuous.conf index 8d8795f4817..fd95de5142e 100644 --- a/tests/RTCORBA/Thread_Pool/continuous.conf +++ b/tests/RTCORBA/Thread_Pool/continuous.conf @@ -1,2 +1,4 @@ +# $Id$ + # Option for platforms where direct mapping doesn't work static RT_ORB_Loader "-ORBPriorityMapping continuous" diff --git a/tests/RTCORBA/Thread_Pool/run_test.pl b/tests/RTCORBA/Thread_Pool/run_test.pl index 3f3754b03ab..2a3ba89d6f6 100755 --- a/tests/RTCORBA/Thread_Pool/run_test.pl +++ b/tests/RTCORBA/Thread_Pool/run_test.pl @@ -15,15 +15,15 @@ $number_of_clients = 4; $status = 0; $continuous = ($^O eq 'hpux'); -@configurations = +@configurations = ({ - file => "ior_1", + file => "ior_1", description => "Invoking methods on servant in default thread pool", },{ - file => "ior_2", + file => "ior_2", description => "Invoking methods on servant in first RT thread pool (without lanes)", },{ - file => "ior_3", + file => "ior_3", description => "Invoking methods on servant in second RT thread pool (with lanes)", }, ); @@ -38,7 +38,7 @@ sub run_clients my @parms = @_; $arg = $parms[0]; $clients = $parms[1]; - + for ($i = 0; $i < $clients; $i++) { $CL[$i] = $client->CreateProcess ("client", $arg); @@ -72,7 +72,7 @@ for $test (@configurations) { # Mark as no longer running to avoid errors on exit. $SV->{RUNNING} = 0; exit $status; - } + } else { print STDERR "ERROR: cannot find ior file: $test->{file}\n"; $status = 1; @@ -85,7 +85,7 @@ for $test (@configurations) { print STDERR "\n*************************************************************\n"; print STDERR "$test->{description}\n"; print STDERR "*************************************************************\n\n"; - + $iorfile = $client->LocalFile ($test->{file}); run_clients ("-k file://$iorfile", $number_of_clients); print STDERR "Prepare next cycle"; diff --git a/tests/RTCORBA/Thread_Pool/server.cpp b/tests/RTCORBA/Thread_Pool/server.cpp index a1f7c2af78e..d5ff7b033f8 100644 --- a/tests/RTCORBA/Thread_Pool/server.cpp +++ b/tests/RTCORBA/Thread_Pool/server.cpp @@ -8,8 +8,6 @@ #include "tao/RTPortableServer/RTPortableServer.h" #include "../check_supported_priorities.cpp" -ACE_RCSID(Thread_Pool, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); int ior_count = 1; CORBA::ULong static_threads = 2; @@ -54,7 +52,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } @@ -68,7 +66,7 @@ write_ior_to_file (CORBA::ORB_ptr orb, char filename[BUFSIZ]; ACE_OS::sprintf (filename, "%s_%d", - ior_output_file, + ACE_TEXT_ALWAYS_CHAR (ior_output_file), ior_count++); FILE *output_file = diff --git a/tests/RTCORBA/Thread_Pool/svc.conf b/tests/RTCORBA/Thread_Pool/svc.conf index 2154375e265..e92d9e0da74 100644 --- a/tests/RTCORBA/Thread_Pool/svc.conf +++ b/tests/RTCORBA/Thread_Pool/svc.conf @@ -1,3 +1,5 @@ +# $Id$ + # No options required for regular testing # For real-time testing, uncomment the following line: diff --git a/tests/RTCORBA/Thread_Pool/test_i.cpp b/tests/RTCORBA/Thread_Pool/test_i.cpp index 2bf77daed60..f5f7fd2a337 100644 --- a/tests/RTCORBA/Thread_Pool/test_i.cpp +++ b/tests/RTCORBA/Thread_Pool/test_i.cpp @@ -5,8 +5,6 @@ #include "tao/ORB_Core.h" #include "tao/RTCORBA/Thread_Pool.h" -ACE_RCSID(Thread_Pools, test_i, "$Id$") - test_i::test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, long msec_sleep) diff --git a/tests/RTScheduling/Current/Makefile.am b/tests/RTScheduling/Current/Makefile.am deleted file mode 100644 index adf84014b02..00000000000 --- a/tests/RTScheduling/Current/Makefile.am +++ /dev/null @@ -1,57 +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.Current.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS = Current - -Current_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Current_SOURCES = \ - ../Scheduler.cpp \ - Thread_Task.cpp \ - test.cpp \ - ../Scheduler.h \ - Thread_Task.h - -Current_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTScheduling/Current/Thread_Task.h b/tests/RTScheduling/Current/Thread_Task.h index a6ae16092a1..47682ac2328 100644 --- a/tests/RTScheduling/Current/Thread_Task.h +++ b/tests/RTScheduling/Current/Thread_Task.h @@ -15,7 +15,7 @@ class Thread_Task : public ACE_Task <ACE_SYNCH> int activate_task (int thr_count); ~Thread_Task (void); - + protected: /// task svc virtual int svc (void); diff --git a/tests/RTScheduling/DT_Spawn/Makefile.am b/tests/RTScheduling/DT_Spawn/Makefile.am deleted file mode 100644 index d83080144ba..00000000000 --- a/tests/RTScheduling/DT_Spawn/Makefile.am +++ /dev/null @@ -1,55 +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.DT_Spawn.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS = DT_Spawn - -DT_Spawn_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -DT_Spawn_SOURCES = \ - ../Scheduler.cpp \ - test.cpp \ - ../Scheduler.h - -DT_Spawn_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTScheduling/Makefile.am b/tests/RTScheduling/Makefile.am deleted file mode 100644 index 7e300b181e6..00000000000 --- a/tests/RTScheduling/Makefile.am +++ /dev/null @@ -1,17 +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 = \ - Current \ - DT_Spawn \ - Scheduling_Interceptor \ - Thread_Cancel \ - VoidData - diff --git a/tests/RTScheduling/Scheduling_Interceptor/Makefile.am b/tests/RTScheduling/Scheduling_Interceptor/Makefile.am deleted file mode 100644 index 6cf4f519c09..00000000000 --- a/tests/RTScheduling/Scheduling_Interceptor/Makefile.am +++ /dev/null @@ -1,123 +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.Scheduler_Interceptor_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.Scheduler_Interceptor_Client.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += Scheduler_Interceptor_Client - -Scheduler_Interceptor_Client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Scheduler_Interceptor_Client_SOURCES = \ - ../Scheduler.cpp \ - testC.cpp \ - test_client.cpp \ - ../Scheduler.h - -Scheduler_Interceptor_Client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.Scheduler_Interceptor_Server.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS += Scheduler_Interceptor_Server - -Scheduler_Interceptor_Server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Scheduler_Interceptor_Server_SOURCES = \ - ../Scheduler.cpp \ - testC.cpp \ - testS.cpp \ - test_server.cpp \ - ../Scheduler.h - -Scheduler_Interceptor_Server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTScheduling/Scheduling_Interceptor/run_test.pl b/tests/RTScheduling/Scheduling_Interceptor/run_test.pl index 237be8be118..c6cfc4f738a 100755 --- a/tests/RTScheduling/Scheduling_Interceptor/run_test.pl +++ b/tests/RTScheduling/Scheduling_Interceptor/run_test.pl @@ -29,12 +29,12 @@ $client->DeleteFile($iorbase); $SV = $server->CreateProcess ("Scheduler_Interceptor_Server", "-ORBdebuglevel $debug_level " . "-f $server_iorfile"); - + $CL = $client->CreateProcess ("Scheduler_Interceptor_Client", "-f $client_iorfile"); - + print STDERR "Starting Server\n"; - + $server_status = $SV->Spawn (); if ($server_status != 0) { diff --git a/tests/RTScheduling/Scheduling_Interceptor/test.idl b/tests/RTScheduling/Scheduling_Interceptor/test.idl index c0c3d7e9da1..af5ea5b8b16 100644 --- a/tests/RTScheduling/Scheduling_Interceptor/test.idl +++ b/tests/RTScheduling/Scheduling_Interceptor/test.idl @@ -2,7 +2,7 @@ interface test { oneway void one_way (in string message); - + string two_way (in string message); oneway void shutdown (); diff --git a/tests/RTScheduling/Thread_Cancel/Makefile.am b/tests/RTScheduling/Thread_Cancel/Makefile.am deleted file mode 100644 index e1a77bdb23b..00000000000 --- a/tests/RTScheduling/Thread_Cancel/Makefile.am +++ /dev/null @@ -1,57 +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.Thread_Cancel.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -noinst_PROGRAMS = Thread_Cancel - -Thread_Cancel_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Thread_Cancel_SOURCES = \ - ../Scheduler.cpp \ - Thread_Task.cpp \ - test.cpp \ - ../Scheduler.h \ - Thread_Task.h - -Thread_Cancel_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/RTScheduling/Thread_Cancel/Thread_Task.h b/tests/RTScheduling/Thread_Cancel/Thread_Task.h index 441469fa8d4..8d0441d08d3 100644 --- a/tests/RTScheduling/Thread_Cancel/Thread_Task.h +++ b/tests/RTScheduling/Thread_Cancel/Thread_Task.h @@ -13,7 +13,7 @@ class Thread_Task : public ACE_Task <ACE_SYNCH> int activate_task (CORBA::ORB_ptr orb); RTScheduling::Current::IdType* guids (void); - + protected: /// task svc virtual int svc (void); diff --git a/tests/RTScheduling/VoidData/Makefile.am b/tests/RTScheduling/VoidData/Makefile.am deleted file mode 100644 index 87cc20bb478..00000000000 --- a/tests/RTScheduling/VoidData/Makefile.am +++ /dev/null @@ -1,82 +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) - - -## Makefile.VoidData.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -BUILT_SOURCES = \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES = \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - -noinst_PROGRAMS = VoidData - -VoidData_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -VoidData_SOURCES = \ - testC.cpp \ - test_client.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -VoidData_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_RTScheduler.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_RT_CORBA -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/Reliable_Oneways/Makefile.am b/tests/Reliable_Oneways/Makefile.am deleted file mode 100644 index 3fe75700e6b..00000000000 --- a/tests/Reliable_Oneways/Makefile.am +++ /dev/null @@ -1,120 +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.Reliable_Oneways_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.Reliable_Oneways_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 = \ - TestC.cpp \ - client.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.Reliable_Oneways_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Oneway_Receiver.cpp \ - Shutdown_Helper.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Oneway_Receiver.h \ - Shutdown_Helper.h - -server_LDADD = \ - $(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_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 - -## 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/Reliable_Oneways/Oneway_Receiver.cpp b/tests/Reliable_Oneways/Oneway_Receiver.cpp index a2e99ade4fc..4aab39a74d8 100644 --- a/tests/Reliable_Oneways/Oneway_Receiver.cpp +++ b/tests/Reliable_Oneways/Oneway_Receiver.cpp @@ -4,8 +4,6 @@ #include "Oneway_Receiver.h" #include "Shutdown_Helper.h" -ACE_RCSID(Reliable_Oneways, Oneway_Receiver, "$Id$") - Oneway_Receiver::Oneway_Receiver (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Reliable_Oneways/Shutdown_Helper.cpp b/tests/Reliable_Oneways/Shutdown_Helper.cpp index d7168f8a5a5..c001ac11463 100644 --- a/tests/Reliable_Oneways/Shutdown_Helper.cpp +++ b/tests/Reliable_Oneways/Shutdown_Helper.cpp @@ -3,8 +3,6 @@ // #include "Shutdown_Helper.h" -ACE_RCSID(Reliable_Oneways, Shutdown_Helper, "$Id$") - Shutdown_Helper::Shutdown_Helper (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Reliable_Oneways/client.cpp b/tests/Reliable_Oneways/client.cpp index 52a6c6d8531..06564a478f7 100644 --- a/tests/Reliable_Oneways/client.cpp +++ b/tests/Reliable_Oneways/client.cpp @@ -6,8 +6,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_sys_time.h" -ACE_RCSID(Reliable_Oneways, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int test_sync_with_target = 0; int test_sync_with_server = 0; diff --git a/tests/Reliable_Oneways/server.cpp b/tests/Reliable_Oneways/server.cpp index c6a9dbc93d3..a6840a8110d 100644 --- a/tests/Reliable_Oneways/server.cpp +++ b/tests/Reliable_Oneways/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Reliable_Oneways, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -30,7 +28,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/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp b/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp index 75f2f941112..bb2e6367b84 100644 --- a/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp +++ b/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp @@ -9,6 +9,7 @@ * @author Carlos O'Ryan */ #include "tao/Bounded_Value_Sequence_T.h" +#include "ace/Log_Msg.h" struct Foo { @@ -20,54 +21,62 @@ CORBA::ULong const TEST_FOO_MAX = 64; int ACE_TMAIN (int, ACE_TCHAR *[]) { - typedef TAO::bounded_value_sequence<int,TEST_INT_MAX> int_sequence; + try + { + typedef TAO::bounded_value_sequence<int,TEST_INT_MAX> int_sequence; - int_sequence a; - int_sequence b(a); + int_sequence a; + int_sequence b(a); - int_sequence c(0, int_sequence::allocbuf(), true); + int_sequence c(0, int_sequence::allocbuf(), true); - a = b; + a = b; - a.length(c.maximum()); - if (a.release()) - { - b.length(a.length()); - } + a.length(c.maximum()); + if (a.release()) + { + b.length(a.length()); + } - a[0] = 0; - b[0] = a[0]; + a[0] = 0; + b[0] = a[0]; - int_sequence const & d = a; - try - { - c[0] = d[0]; + int_sequence const & d = a; + try + { + c[0] = d[0]; #if defined (TAO_CHECKED_SEQUENCE_INDEXING) && (TAO_CHECKED_SEQUENCE_INDEXING == 1) - return 1; + return 1; #endif - } - catch (const ::CORBA::BAD_PARAM &) - { - // c has length = 0, so there is an exception when we try - // to access element above length. - } + } + catch (const ::CORBA::BAD_PARAM &) + { + // c has length = 0, so there is an exception when we try + // to access element above length. + } - b.replace(0, int_sequence::allocbuf(), true); + b.replace(0, int_sequence::allocbuf(), true); - int const * x = d.get_buffer(); - if (x != 0) - { - int_sequence::freebuf(a.get_buffer(true)); - } - x = b.get_buffer(); + int const * x = d.get_buffer(); + if (x != 0) + { + int_sequence::freebuf(a.get_buffer(true)); + } + x = b.get_buffer(); - int_sequence e(c); + int_sequence e(c); - typedef TAO::bounded_value_sequence<Foo,TEST_FOO_MAX> Foo_sequence; + typedef TAO::bounded_value_sequence<Foo,TEST_FOO_MAX> Foo_sequence; - Foo_sequence u; - Foo_sequence v(u); - u = v; + Foo_sequence u; + Foo_sequence v(u); + u = v; + } + catch (const ::CORBA::Exception &) + { + ACE_ERROR ((LM_ERROR, "Caught unexpected exception\n")); + return 1; + } return 0; } diff --git a/tests/Sequence_Unit_Tests/Bounded_String.cpp b/tests/Sequence_Unit_Tests/Bounded_String.cpp index 31b9cb38d19..03f63c4f2f5 100644 --- a/tests/Sequence_Unit_Tests/Bounded_String.cpp +++ b/tests/Sequence_Unit_Tests/Bounded_String.cpp @@ -10,69 +10,77 @@ */ #include "tao/Bounded_Basic_String_Sequence_T.h" #include "tao/CORBA_String.h" +#include "ace/Log_Msg.h" CORBA::ULong const MAXIMUM = 42; typedef TAO::bounded_basic_string_sequence<char, MAXIMUM> s_sequence; int ACE_TMAIN (int, ACE_TCHAR *[]) { - s_sequence a; - s_sequence b(a); + try + { + s_sequence a; + s_sequence b(a); - s_sequence c(0, s_sequence::allocbuf(), true); - a = b; + s_sequence c(0, s_sequence::allocbuf(), true); + a = b; - a.length(c.maximum()); - if (a.release()) - { - b.length(a.length()); - } - a[0] = const_cast<char const*>("Hello"); - b[0] = a[0]; + a.length(c.maximum()); + if (a.release()) + { + b.length(a.length()); + } + a[0] = const_cast<char const*>("Hello"); + b[0] = a[0]; - s_sequence const & d = a; - try - { - c[0] = d[0]; -#if defined (TAO_CHECKED_SEQUENCE_INDEXING) && (TAO_CHECKED_SEQUENCE_INDEXING == 1) - return 1; -#endif - } - catch (const ::CORBA::BAD_PARAM &) - { - // c has length = 0, so there is an exception when we try - // to access element above length. - } + s_sequence const & d = a; + try + { + c[0] = d[0]; + #if defined (TAO_CHECKED_SEQUENCE_INDEXING) && (TAO_CHECKED_SEQUENCE_INDEXING == 1) + return 1; + #endif + } + catch (const ::CORBA::BAD_PARAM &) + { + // c has length = 0, so there is an exception when we try + // to access element above length. + } - b.replace(0, s_sequence::allocbuf(), true); + b.replace(0, s_sequence::allocbuf(), true); - char const * const * x = d.get_buffer(); - if (x != 0) - { - s_sequence::freebuf(a.get_buffer(true)); - } - x = b.get_buffer(); + char const * const * x = d.get_buffer(); + if (x != 0) + { + s_sequence::freebuf(a.get_buffer(true)); + } + x = b.get_buffer(); - if (d.length()) - { - s_sequence::freebuf(s_sequence::allocbuf()); - } + if (d.length()) + { + s_sequence::freebuf(s_sequence::allocbuf()); + } - s_sequence e(c); + s_sequence e(c); - CORBA::String_var w(const_cast<char const*>("World")); - try - { - e[0] = w; + CORBA::String_var w(const_cast<char const*>("World")); + try + { + e[0] = w; #if defined (TAO_CHECKED_SEQUENCE_INDEXING) && (TAO_CHECKED_SEQUENCE_INDEXING == 1) - return 1; + return 1; #endif + } + catch (const ::CORBA::BAD_PARAM &) + { + // e has length = 0, so there is an exception when we try + // to access element above length. + } } - catch (const ::CORBA::BAD_PARAM &) + catch (const ::CORBA::Exception &) { - // e has length = 0, so there is an exception when we try - // to access element above length. + ACE_ERROR ((LM_ERROR, "Caught unexpected exception\n")); + return 1; } - return 0; } diff --git a/tests/Sequence_Unit_Tests/Makefile.am b/tests/Sequence_Unit_Tests/Makefile.am deleted file mode 100644 index c5ed091dd25..00000000000 --- a/tests/Sequence_Unit_Tests/Makefile.am +++ /dev/null @@ -1,694 +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) - -noinst_PROGRAMS = - -## Makefile.Sequence_Unit_Tests_B_Obj_Ref_Seq.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += bounded_object_reference_sequence_ut - -bounded_object_reference_sequence_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -bounded_object_reference_sequence_ut_SOURCES = \ - bounded_object_reference_sequence_ut.cpp \ - mock_reference.cpp \ - mock_reference.hpp - -bounded_object_reference_sequence_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -bounded_object_reference_sequence_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_B_Sequence_CDR.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += bounded_sequence_cdr_ut - -bounded_sequence_cdr_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -bounded_sequence_cdr_ut_SOURCES = \ - bounded_sequence_cdr_ut.cpp \ - mock_reference.cpp \ - mock_reference.hpp - -bounded_sequence_cdr_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -bounded_sequence_cdr_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_B_Simple_Types.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += Bounded_Simple_Types - -Bounded_Simple_Types_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Bounded_Simple_Types_SOURCES = \ - Bounded_Simple_Types.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -Bounded_Simple_Types_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Sequence_Unit_Tests_B_String_Seq.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += bounded_string_sequence_ut - -bounded_string_sequence_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -bounded_string_sequence_ut_SOURCES = \ - bounded_string_sequence_ut.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -bounded_string_sequence_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -bounded_string_sequence_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_B_Value_Sequence.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += bounded_value_sequence_ut - -bounded_value_sequence_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -bounded_value_sequence_ut_SOURCES = \ - bounded_value_sequence_ut.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -bounded_value_sequence_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -bounded_value_sequence_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_Bounded_String.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += Bounded_String - -Bounded_String_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Bounded_String_SOURCES = \ - Bounded_String.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -Bounded_String_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Sequence_Unit_Tests_Obj_Ref_Seq_Elem.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += object_reference_sequence_element_ut - -object_reference_sequence_element_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -object_reference_sequence_element_ut_SOURCES = \ - mock_reference.cpp \ - object_reference_sequence_element_ut.cpp \ - mock_reference.hpp - -object_reference_sequence_element_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -object_reference_sequence_element_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_String_Seq_Elem.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += string_sequence_element_ut - -string_sequence_element_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -string_sequence_element_ut_SOURCES = \ - string_sequence_element_ut.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -string_sequence_element_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -string_sequence_element_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_Test_Alloc_Traits.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += testing_allocation_traits_ut - -testing_allocation_traits_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -testing_allocation_traits_ut_SOURCES = \ - testing_allocation_traits_ut.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -testing_allocation_traits_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -testing_allocation_traits_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_UB_Fwd_Ob_Ref_Seq.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += unbounded_fwd_object_reference_sequence_ut - -unbounded_fwd_object_reference_sequence_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -unbounded_fwd_object_reference_sequence_ut_SOURCES = \ - fwd_mock_reference.cpp \ - unbounded_fwd_object_reference_sequence_ut.cpp \ - fwd_mock_reference.hpp - -unbounded_fwd_object_reference_sequence_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -unbounded_fwd_object_reference_sequence_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_UB_Obj_Ref_Seq.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += unbounded_object_reference_sequence_ut - -unbounded_object_reference_sequence_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -unbounded_object_reference_sequence_ut_SOURCES = \ - mock_reference.cpp \ - unbounded_object_reference_sequence_ut.cpp \ - mock_reference.hpp - -unbounded_object_reference_sequence_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -unbounded_object_reference_sequence_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_UB_Oct_Seq_No_Cpy.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += unbounded_octet_sequence_nocopy_ut - -unbounded_octet_sequence_nocopy_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -unbounded_octet_sequence_nocopy_ut_SOURCES = \ - mock_reference.cpp \ - unbounded_octet_sequence_nocopy_ut.cpp \ - mock_reference.hpp - -unbounded_octet_sequence_nocopy_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -unbounded_octet_sequence_nocopy_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_UB_Octet_Sequence.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += unbounded_octet_sequence_ut - -unbounded_octet_sequence_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -unbounded_octet_sequence_ut_SOURCES = \ - mock_reference.cpp \ - unbounded_octet_sequence_ut.cpp \ - mock_reference.hpp - -unbounded_octet_sequence_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -unbounded_octet_sequence_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_UB_Sequence_CDR.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += unbounded_sequence_cdr_ut - -unbounded_sequence_cdr_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -unbounded_sequence_cdr_ut_SOURCES = \ - mock_reference.cpp \ - unbounded_sequence_cdr_ut.cpp \ - mock_reference.hpp - -unbounded_sequence_cdr_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -unbounded_sequence_cdr_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_UB_Simple_Types.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += Unbounded_Simple_Types - -Unbounded_Simple_Types_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Unbounded_Simple_Types_SOURCES = \ - Unbounded_Simple_Types.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -Unbounded_Simple_Types_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Sequence_Unit_Tests_UB_String_Seq.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += unbounded_string_sequence_ut - -unbounded_string_sequence_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -unbounded_string_sequence_ut_SOURCES = \ - unbounded_string_sequence_ut.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -unbounded_string_sequence_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -unbounded_string_sequence_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_UB_Value_Sequence.am - -if BUILD_BOOST -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += unbounded_value_sequence_ut - -unbounded_value_sequence_ut_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(BOOST_ROOT)/include/$(BOOST_VERSION) \ - -I$(BOOST_ROOT)/. - -unbounded_value_sequence_ut_SOURCES = \ - unbounded_value_sequence_ut.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -unbounded_value_sequence_ut_LDFLAGS = \ - -L$(BOOST_ROOT)/lib - -unbounded_value_sequence_ut_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -l$(BOOST_STATIC_LIB_PREFIX)boost_unit_test_framework$(BOOST_CFG) - -endif BUILD_EXCEPTIONS -endif BUILD_BOOST - -## Makefile.Sequence_Unit_Tests_Unbounded_Octet.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += Unbounded_Octet - -Unbounded_Octet_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Unbounded_Octet_SOURCES = \ - Unbounded_Octet.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -Unbounded_Octet_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Sequence_Unit_Tests_Unbounded_String.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += Unbounded_String - -Unbounded_String_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -Unbounded_String_SOURCES = \ - Unbounded_String.cpp \ - bounded_sequence_cdr.hpp \ - fwd_mock_reference.hpp \ - mock_array.hpp \ - mock_reference.hpp \ - string_sequence_tester.hpp \ - testing_allocation_traits.hpp \ - testing_counters.hpp \ - testing_exception.hpp \ - testing_object_reference_traits.hpp \ - testing_range_checking.hpp \ - testing_string_traits.hpp \ - unbounded_sequence_cdr.hpp \ - value_sequence_tester.hpp - -Unbounded_String_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/Sequence_Unit_Tests/Unbounded_Octet.cpp b/tests/Sequence_Unit_Tests/Unbounded_Octet.cpp index ca0704ea501..dc4fc7db1f0 100644 --- a/tests/Sequence_Unit_Tests/Unbounded_Octet.cpp +++ b/tests/Sequence_Unit_Tests/Unbounded_Octet.cpp @@ -10,54 +10,64 @@ */ #include "tao/Basic_Types.h" #include "tao/Unbounded_Octet_Sequence_T.h" +#include "ace/Log_Msg.h" typedef TAO::unbounded_value_sequence <CORBA::Octet> s_sequence; int ACE_TMAIN (int, ACE_TCHAR *[]) { - s_sequence a; - s_sequence b(23); + try + { + s_sequence a; + s_sequence b(23); - s_sequence c(32, 0, s_sequence::allocbuf(32), true); - a = b; + s_sequence c(32, 0, s_sequence::allocbuf(32), true); + a = b; - a.length(c.maximum()); - if (a.release()) - { - b.length(a.length()); - } - a[0] = 'a'; - b[0] = a[0]; + a.length(c.maximum()); + if (a.release()) + { + b.length(a.length()); + } - s_sequence const & d = a; - try - { - c[0] = d[0]; + a[0] = 'a'; + b[0] = a[0]; + + s_sequence const & d = a; + try + { + c[0] = d[0]; #if defined (TAO_CHECKED_SEQUENCE_INDEXING) && (TAO_CHECKED_SEQUENCE_INDEXING == 1) - return 1; + return 1; #endif - } - catch (const ::CORBA::BAD_PARAM &) - { - // c has length = 0, so there is an exception when we try - // to access element above length. - } + } + catch (const ::CORBA::BAD_PARAM &) + { + // c has length = 0, so there is an exception when we try + // to access element above length. + } - b.replace(64, 0, s_sequence::allocbuf(64), true); + b.replace(64, 0, s_sequence::allocbuf(64), true); - CORBA::Octet const * x = d.get_buffer(); - if (x != 0) - { - s_sequence::freebuf(a.get_buffer(true)); - } - x = b.get_buffer(); + CORBA::Octet const * x = d.get_buffer(); + if (x != 0) + { + s_sequence::freebuf(a.get_buffer(true)); + } + x = b.get_buffer(); - if (d.length()) - { - s_sequence::freebuf(s_sequence::allocbuf(64)); - } + if (d.length()) + { + s_sequence::freebuf(s_sequence::allocbuf(64)); + } - s_sequence e(c); + s_sequence e(c); + } + catch (const ::CORBA::Exception &) + { + ACE_ERROR ((LM_ERROR, "Caught unexpected exception\n")); + return 1; + } return 0; } diff --git a/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp b/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp index 79a93c10ed1..743b3c76b62 100644 --- a/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp +++ b/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp @@ -9,6 +9,7 @@ * @author Carlos O'Ryan */ #include "tao/Unbounded_Value_Sequence_T.h" +#include "ace/Log_Msg.h" struct Foo { @@ -17,53 +18,61 @@ struct Foo int ACE_TMAIN (int, ACE_TCHAR *[]) { - typedef TAO::unbounded_value_sequence<int> int_sequence; + try + { + typedef TAO::unbounded_value_sequence<int> int_sequence; - int_sequence a; - int_sequence b(23); + int_sequence a; + int_sequence b(23); - int_sequence c(32, 0, int_sequence::allocbuf(32), true); + int_sequence c(32, 0, int_sequence::allocbuf(32), true); - a = b; + a = b; - a.length(c.maximum()); - if (a.release()) - { - b.length(a.length()); - } - a[0] = 0; - b[0] = a[0]; + a.length(c.maximum()); + if (a.release()) + { + b.length(a.length()); + } + a[0] = 0; + b[0] = a[0]; - int_sequence const & d = a; - try - { - c[0] = d[0]; + int_sequence const & d = a; + try + { + c[0] = d[0]; #if defined (TAO_CHECKED_SEQUENCE_INDEXING) && (TAO_CHECKED_SEQUENCE_INDEXING == 1) - return 1; + return 1; #endif - } - catch (const ::CORBA::BAD_PARAM &) - { - // c has length = 0, so there is an exception when we try - // to access element above length. - } + } + catch (const ::CORBA::BAD_PARAM &) + { + // c has length = 0, so there is an exception when we try + // to access element above length. + } - b.replace(64, 0, int_sequence::allocbuf(64), true); + b.replace(64, 0, int_sequence::allocbuf(64), true); - int const * x = d.get_buffer(); - if (x != 0) - { - int_sequence::freebuf(a.get_buffer(true)); - } - x = b.get_buffer(); + int const * x = d.get_buffer(); + if (x != 0) + { + int_sequence::freebuf(a.get_buffer(true)); + } + x = b.get_buffer(); - int_sequence e(c); + int_sequence e(c); - typedef TAO::unbounded_value_sequence<Foo> Foo_sequence; + typedef TAO::unbounded_value_sequence<Foo> Foo_sequence; - Foo_sequence u; - Foo_sequence v(32); - u = v; + Foo_sequence u; + Foo_sequence v(32); + u = v; + } + catch (const ::CORBA::Exception &) + { + ACE_ERROR ((LM_ERROR, "Caught unexpected exception\n")); + return 1; + } return 0; } diff --git a/tests/Sequence_Unit_Tests/Unbounded_String.cpp b/tests/Sequence_Unit_Tests/Unbounded_String.cpp index a7e77788021..67eefb40cc4 100644 --- a/tests/Sequence_Unit_Tests/Unbounded_String.cpp +++ b/tests/Sequence_Unit_Tests/Unbounded_String.cpp @@ -10,67 +10,76 @@ */ #include "tao/Unbounded_Basic_String_Sequence_T.h" #include "tao/CORBA_String.h" +#include "ace/Log_Msg.h" typedef TAO::unbounded_basic_string_sequence<char> s_sequence; int ACE_TMAIN (int, ACE_TCHAR *[]) { - s_sequence a; - s_sequence b(23); + try + { + s_sequence a; + s_sequence b(23); - s_sequence c(32, 0, s_sequence::allocbuf(32), true); - a = b; + s_sequence c(32, 0, s_sequence::allocbuf(32), true); + a = b; - a.length(c.maximum()); - if (a.release()) - { - b.length(a.length()); - } - a[0] = const_cast<char const*>("Hello"); - b[0] = a[0]; + a.length(c.maximum()); + if (a.release()) + { + b.length(a.length()); + } + a[0] = const_cast<char const*>("Hello"); + b[0] = a[0]; - s_sequence const & d = a; - try - { - c[0] = d[0]; + s_sequence const & d = a; + try + { + c[0] = d[0]; #if defined (TAO_CHECKED_SEQUENCE_INDEXING) && (TAO_CHECKED_SEQUENCE_INDEXING == 1) - return 1; + return 1; #endif - } - catch (const ::CORBA::BAD_PARAM &) - { - // c has length = 0, so there is an exception when we try - // to access element above length. - } + } + catch (const ::CORBA::BAD_PARAM &) + { + // c has length = 0, so there is an exception when we try + // to access element above length. + } - b.replace(64, 0, s_sequence::allocbuf(64), true); + b.replace(64, 0, s_sequence::allocbuf(64), true); - char const * const * x = d.get_buffer(); - if (x != 0) - { - s_sequence::freebuf(a.get_buffer(true)); - } - x = b.get_buffer(); + char const * const * x = d.get_buffer(); + if (x != 0) + { + s_sequence::freebuf(a.get_buffer(true)); + } + x = b.get_buffer(); - if (d.length()) - { - s_sequence::freebuf(s_sequence::allocbuf(64)); - } + if (d.length()) + { + s_sequence::freebuf(s_sequence::allocbuf(64)); + } - s_sequence e(c); + s_sequence e(c); - CORBA::String_var w(const_cast<char const*>("World")); - try - { - e[0] = w; + CORBA::String_var w(const_cast<char const*>("World")); + try + { + e[0] = w; #if defined (TAO_CHECKED_SEQUENCE_INDEXING) && (TAO_CHECKED_SEQUENCE_INDEXING == 1) - return 1; + return 1; #endif + } + catch (const ::CORBA::BAD_PARAM &) + { + // e has length = 0, so there is an exception when we try + // to access element above length. + } } - catch (const ::CORBA::BAD_PARAM &) + catch (const ::CORBA::Exception &) { - // e has length = 0, so there is an exception when we try - // to access element above length. + ACE_ERROR ((LM_ERROR, "Caught unexpected exception\n")); + return 1; } return 0; diff --git a/tests/Sequence_Unit_Tests/string_sequence_tester.hpp b/tests/Sequence_Unit_Tests/string_sequence_tester.hpp index 339c59ada80..6ebcf3d7018 100644 --- a/tests/Sequence_Unit_Tests/string_sequence_tester.hpp +++ b/tests/Sequence_Unit_Tests/string_sequence_tester.hpp @@ -204,10 +204,11 @@ struct string_sequence_tester x.length(8); tested_sequence const & y = x; - character_type const * lhs = 0; + character_type const * lhs; character_type const * rhs = 0; CHECK_THROW(lhs = y[32], std::range_error); CHECK_THROW(x[32] = rhs, std::range_error); + ACE_UNUSED_ARG (lhs); return 0; } diff --git a/tests/Sequence_Unit_Tests/value_sequence_tester.hpp b/tests/Sequence_Unit_Tests/value_sequence_tester.hpp index f07b05c0d9e..d14d90c36c5 100644 --- a/tests/Sequence_Unit_Tests/value_sequence_tester.hpp +++ b/tests/Sequence_Unit_Tests/value_sequence_tester.hpp @@ -12,6 +12,7 @@ #include "tao/Basic_Types.h" #include "test_macros.h" +#include "tao/SystemException.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -68,14 +69,22 @@ struct value_sequence_tester int test_index_accessor() { - tested_sequence x; - x.length(8); - // Set x[4] to any value just for suppressing valgrind complains. - x[4] = 1; - - tested_sequence const & y = x; - const_value_type & z = y[4]; - CHECK_EQUAL(z, y[4]); + try + { + tested_sequence x; + x.length(8); + // Set x[4] to any value just for suppressing valgrind complains. + x[4] = 1; + + tested_sequence const & y = x; + const_value_type & z = y[4]; + CHECK_EQUAL(z, y[4]); + } + catch (const ::CORBA::BAD_PARAM &) + { + ACE_ERROR ((LM_ERROR, "Error: test_index_accessor: BAD_PARAM exception caught\n")); + return 1; + } return 0; } diff --git a/tests/Servant_To_Reference_Test/Makefile.am b/tests/Servant_To_Reference_Test/Makefile.am deleted file mode 100644 index 43708b043b4..00000000000 --- a/tests/Servant_To_Reference_Test/Makefile.am +++ /dev/null @@ -1,80 +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) - - -## Makefile.Servant_To_Reference_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) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - Test_i.cpp \ - server.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl \ - Test_i.h - -server_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/Servant_To_Reference_Test/Test_i.cpp b/tests/Servant_To_Reference_Test/Test_i.cpp index 2002a8e631a..871deea0c89 100644 --- a/tests/Servant_To_Reference_Test/Test_i.cpp +++ b/tests/Servant_To_Reference_Test/Test_i.cpp @@ -3,8 +3,6 @@ // #include "Test_i.h" -ACE_RCSID(Hello, Hello, "$Id$") - One_Impl::One_Impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Servant_To_Reference_Test/server.cpp b/tests/Servant_To_Reference_Test/server.cpp index ca960031eb2..0a9f412be5c 100644 --- a/tests/Servant_To_Reference_Test/server.cpp +++ b/tests/Servant_To_Reference_Test/server.cpp @@ -5,10 +5,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/Task.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); class MT_Task : public ACE_Task_Base @@ -84,7 +80,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/tests/Server_Connection_Purging/Makefile.am b/tests/Server_Connection_Purging/Makefile.am deleted file mode 100644 index a94e1eb2050..00000000000 --- a/tests/Server_Connection_Purging/Makefile.am +++ /dev/null @@ -1,130 +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.Server_Connection_Purging_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.Server_Connection_Purging_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 \ - Test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Server_Connection_Purging_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 \ - TestS.cpp \ - Test_i.cpp \ - server.cpp \ - Test_i.h - -server_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.Server_Connection_Purging_ShutCl.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += shutdown_client - -shutdown_client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -shutdown_client_SOURCES = \ - TestC.cpp \ - client2.cpp \ - Test_i.h - -shutdown_client_LDADD = \ - $(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/Server_Connection_Purging/client.cpp b/tests/Server_Connection_Purging/client.cpp index e5821cede7f..ee883a364ac 100644 --- a/tests/Server_Connection_Purging/client.cpp +++ b/tests/Server_Connection_Purging/client.cpp @@ -37,7 +37,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Server_Connection_Purging/server.cpp b/tests/Server_Connection_Purging/server.cpp index 65bd480b7fb..263256e1d5b 100644 --- a/tests/Server_Connection_Purging/server.cpp +++ b/tests/Server_Connection_Purging/server.cpp @@ -27,7 +27,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/tests/Server_Leaks/Makefile.am b/tests/Server_Leaks/Makefile.am deleted file mode 100644 index 19954882560..00000000000 --- a/tests/Server_Leaks/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.Server_Leaks_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.Server_Leaks_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 \ - Ping_Service.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Server_Leaks_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Ping_Service.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Ping_Service.h - -server_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/Server_Leaks/Ping_Service.cpp b/tests/Server_Leaks/Ping_Service.cpp index e6c157058ea..2a0151b78f8 100644 --- a/tests/Server_Leaks/Ping_Service.cpp +++ b/tests/Server_Leaks/Ping_Service.cpp @@ -3,8 +3,6 @@ // #include "Ping_Service.h" -ACE_RCSID(Server_Leaks, Ping_Service, "$Id$") - Ping_Service::Ping_Service (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Server_Leaks/client.cpp b/tests/Server_Leaks/client.cpp index 14ac97af38b..f3a5cc20a6f 100644 --- a/tests/Server_Leaks/client.cpp +++ b/tests/Server_Leaks/client.cpp @@ -3,8 +3,6 @@ #include "TestC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Server_Leaks, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int do_shutdown = 0; @@ -35,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/tests/Server_Leaks/server.cpp b/tests/Server_Leaks/server.cpp index e26806e215c..b2f1c39fbbf 100644 --- a/tests/Server_Leaks/server.cpp +++ b/tests/Server_Leaks/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Server_Leaks, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -29,7 +27,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/tests/Server_Port_Zero/Hello.cpp b/tests/Server_Port_Zero/Hello.cpp index 1769811f1c8..0f62f20b906 100644 --- a/tests/Server_Port_Zero/Hello.cpp +++ b/tests/Server_Port_Zero/Hello.cpp @@ -3,10 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Server_Port_Zero, - Hello, - "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Server_Port_Zero/Makefile.am b/tests/Server_Port_Zero/Makefile.am deleted file mode 100644 index 7fec49ca73d..00000000000 --- a/tests/Server_Port_Zero/Makefile.am +++ /dev/null @@ -1,80 +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) - - -## Makefile.Server_Port_Zero_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) -Sa -St $(srcdir)/Test.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Hello.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Hello.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl - -server_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/Server_Port_Zero/server.cpp b/tests/Server_Port_Zero/server.cpp index 9c76207a19b..8bc92fedd9d 100644 --- a/tests/Server_Port_Zero/server.cpp +++ b/tests/Server_Port_Zero/server.cpp @@ -4,10 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Server_Port_Zero, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -32,7 +28,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/tests/Single_Read/Makefile.am b/tests/Single_Read/Makefile.am deleted file mode 100644 index ddbb4285f05..00000000000 --- a/tests/Single_Read/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.Single_Read_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.Single_Read_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 \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Single_Read_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_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/Single_Read/client.cpp b/tests/Single_Read/client.cpp index c756e56970d..a7da7ced2c7 100644 --- a/tests/Single_Read/client.cpp +++ b/tests/Single_Read/client.cpp @@ -1,12 +1,9 @@ // $Id$ - #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" #include "testC.h" -ACE_RCSID(Timed_Buffered_Oneways, client, "$Id$") - // Name of file contains ior. static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior"); diff --git a/tests/Single_Read/server.cpp b/tests/Single_Read/server.cpp index bc3c4eb6698..455d25e9e97 100644 --- a/tests/Single_Read/server.cpp +++ b/tests/Single_Read/server.cpp @@ -4,8 +4,6 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Timed_Buffered_Oneways, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); const ACE_TCHAR *client_done_file = ACE_TEXT("client_done.ior"); @@ -35,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Single_Read/test_i.cpp b/tests/Single_Read/test_i.cpp index 0c8b541d1da..5ff43da0a20 100644 --- a/tests/Single_Read/test_i.cpp +++ b/tests/Single_Read/test_i.cpp @@ -3,8 +3,6 @@ #include "test_i.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Single_Read, test_i, "$Id$") - test_i::test_i (CORBA::ORB_ptr orb, const ACE_TCHAR *file_name) : orb_ (CORBA::ORB::_duplicate (orb)), client_done_ (false), diff --git a/tests/Single_Read/test_i.h b/tests/Single_Read/test_i.h index c1218fe34a2..fdf530e5931 100644 --- a/tests/Single_Read/test_i.h +++ b/tests/Single_Read/test_i.h @@ -1,31 +1,30 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Single_Read -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Balachandran Natarajan <bala@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Balachandran Natarajan <bala@cs.wustl.edu> + */ +//============================================================================= + #ifndef TAO_SINGLE_READ_TEST_I_H #define TAO_SINGLE_READ_TEST_I_H #include "testS.h" +/** + * @class test_i + * + * @brief Simple implementation. + */ class test_i : public POA_test { - // = TITLE - // Simple implementation. - // public: + /// ctor. test_i (CORBA::ORB_ptr orb, const ACE_TCHAR *file_name); - // ctor. // = The test interface methods. void method (CORBA::ULong request_number, diff --git a/tests/Smart_Proxies/Benchmark/Makefile.am b/tests/Smart_Proxies/Benchmark/Makefile.am deleted file mode 100644 index faee8593cae..00000000000 --- a/tests/Smart_Proxies/Benchmark/Makefile.am +++ /dev/null @@ -1,111 +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.SP_Benchmark_Idl.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) -Sa -St -Gsp $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Benchmark_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - client.cpp \ - testC.cpp \ - Smart_Proxy_Impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Benchmark_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - Smart_Proxy_Impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.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/tests/Smart_Proxies/Benchmark/client.cpp b/tests/Smart_Proxies/Benchmark/client.cpp index 891debe9049..4f26a42e822 100644 --- a/tests/Smart_Proxies/Benchmark/client.cpp +++ b/tests/Smart_Proxies/Benchmark/client.cpp @@ -1,20 +1,17 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/Smart_Proxies/Benchmark -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// This is the client program that tests TAO's Smart Proxy extension. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -//========================================================================= + +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * This is the client program that tests TAO's Smart Proxy extension. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + #include "testC.h" #include "Smart_Proxy_Impl.h" @@ -27,10 +24,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_errno.h" -ACE_RCSID (Benchmark, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int niterations = 5; int register_smart_proxy = 1; @@ -59,8 +52,8 @@ class Marker } private: + /// Keep throughput statistics on a per-thread basis ACE_Throughput_Stats throughput_; - // Keep throughput statistics on a per-thread basis }; @@ -184,7 +177,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) now - latency_base); if (TAO_debug_level > 0 && i % 100 == 0) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i)); + ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration <%d> - price <%d> - cost <%d>\n", + i, price, cost)); } marker.dump_stats (ACE_TEXT("buying tickets "), gsf); diff --git a/tests/Smart_Proxies/Benchmark/server.cpp b/tests/Smart_Proxies/Benchmark/server.cpp index 83c30de42f3..e1d7bede99d 100644 --- a/tests/Smart_Proxies/Benchmark/server.cpp +++ b/tests/Smart_Proxies/Benchmark/server.cpp @@ -1,27 +1,22 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/Smart_Proxies/Benchmark -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// This is the server program that tests TAO's Smart Proxy extension. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -//========================================================================= + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * This is the server program that tests TAO's Smart Proxy extension. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + #include "testS.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" -ACE_RCSID(Benchmark, server, "$Id$") - // The servant class Test_i : public POA_Test @@ -34,8 +29,8 @@ public: CORBA::Long tickets (CORBA::Short number); //FUZZ: disable check_for_lack_ACE_OS + ///FUZZ: enable check_for_lack_ACE_OS void shutdown (void); - //FUZZ: enable check_for_lack_ACE_OS private: CORBA::ORB_var orb_; @@ -88,7 +83,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/tests/Smart_Proxies/Benchmark/test.idl b/tests/Smart_Proxies/Benchmark/test.idl index 4ff86645b77..5bcb1fa79dd 100644 --- a/tests/Smart_Proxies/Benchmark/test.idl +++ b/tests/Smart_Proxies/Benchmark/test.idl @@ -6,7 +6,7 @@ interface Test // A simple test interface // // = DESCRIPTION - // This test demostrates the smart proxy feature in TAO + // This test demostrates the smart proxy feature in TAO // and shows how it can improve performace via caching. short box_prices (); diff --git a/tests/Smart_Proxies/Collocation/Makefile.am b/tests/Smart_Proxies/Collocation/Makefile.am deleted file mode 100644 index 7c2237e86ad..00000000000 --- a/tests/Smart_Proxies/Collocation/Makefile.am +++ /dev/null @@ -1,135 +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 = -noinst_HEADERS = - -## Makefile.SP_Collocation_Idl.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - DiamondC.cpp \ - DiamondC.h \ - DiamondC.inl \ - DiamondS.cpp \ - DiamondS.h \ - DiamondS.inl - -CLEANFILES = \ - Diamond-stamp \ - DiamondC.cpp \ - DiamondC.h \ - DiamondC.inl \ - DiamondS.cpp \ - DiamondS.h \ - DiamondS.inl - -DiamondC.cpp DiamondC.h DiamondC.inl DiamondS.cpp DiamondS.h DiamondS.inl: Diamond-stamp - -Diamond-stamp: $(srcdir)/Diamond.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Gsp -Wb,stub_export_macro=MY_Stub_Export -Wb,stub_export_include=stub_export.h -Wb,skel_export_macro=Diamond_Export -Wb,skel_export_include=diamond_export.h -Gd $(srcdir)/Diamond.idl - @touch $@ - -noinst_HEADERS += \ - Diamond.idl - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Collocation_TestStubsLib.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES += libColl_Test_Stubs.la - -libColl_Test_Stubs_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DMY_STUB_BUILD_DLL - -libColl_Test_Stubs_la_SOURCES = \ - DiamondC.cpp \ - Smart_Proxy_Impl.cpp - -noinst_HEADERS += \ - Smart_Proxy_Impl.h - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Collocation_DiamondLib.am - -if BUILD_EXCEPTIONS - -noinst_LTLIBRARIES += libDiamond.la - -libDiamond_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DDIAMOND_BUILD_DLL - -libDiamond_la_SOURCES = \ - DiamondS.cpp \ - Diamond_i.cpp - -noinst_HEADERS += \ - Diamond_i.h - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Collocation_Test.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS = main - -main_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -main_SOURCES = \ - Coll_Tester.cpp \ - main.cpp \ - Coll_Tester.h - -main_LDADD = \ - libColl_Test_Stubs.la \ - libDiamond.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.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/Smart_Proxies/Collocation/main.cpp b/tests/Smart_Proxies/Collocation/main.cpp index 7955d7a9770..d5eceaf8341 100644 --- a/tests/Smart_Proxies/Collocation/main.cpp +++ b/tests/Smart_Proxies/Collocation/main.cpp @@ -3,8 +3,6 @@ #include "Coll_Tester.h" #include "tao/Strategies/advanced_resource.h" -ACE_RCSID(Collocation, main, "$Id$") - int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { Collocation_Test coll_test; diff --git a/tests/Smart_Proxies/Collocation/svc.conf b/tests/Smart_Proxies/Collocation/svc.conf index 285b1297bd4..826ce10d8f7 100644 --- a/tests/Smart_Proxies/Collocation/svc.conf +++ b/tests/Smart_Proxies/Collocation/svc.conf @@ -8,7 +8,7 @@ static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocato # Make sure we use RW client handler so if something goes wrong, the program will bloc, # i.e., won't work. -static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW" +static Client_Strategy_Factory "-ORBClientConnectionHandler RW" # Not absolutely necessary for this test, but we add it for fun. -static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null" +static Server_Strategy_Factory "-ORBConcurrency reactive" diff --git a/tests/Smart_Proxies/Collocation/svc.conf.xml b/tests/Smart_Proxies/Collocation/svc.conf.xml index 866550b8838..17e28d20bbd 100644 --- a/tests/Smart_Proxies/Collocation/svc.conf.xml +++ b/tests/Smart_Proxies/Collocation/svc.conf.xml @@ -9,7 +9,7 @@ <static id="Resource_Factory" params="-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null"/> <!-- Make sure we use RW client handler so if something goes wrong, the program will bloc, --> <!-- i.e., won't work. --> - <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler RW"/> + <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/> <!-- Not absolutely necessary for this test, but we add it for fun. --> - <static id="Server_Strategy_Factory" params="-ORBConcurrency reactive -ORBPOALock null"/> + <static id="Server_Strategy_Factory" params="-ORBConcurrency reactive"/> </ACE_Svc_Conf> diff --git a/tests/Smart_Proxies/Makefile.am b/tests/Smart_Proxies/Makefile.am deleted file mode 100644 index 879e568b241..00000000000 --- a/tests/Smart_Proxies/Makefile.am +++ /dev/null @@ -1,119 +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) - -SUBDIRS = \ - . \ - Benchmark \ - Collocation \ - On_Demand \ - Policy \ - dtor - -noinst_PROGRAMS = - -## Makefile.Smart_Proxies_Idl.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) -Sa -St -Gsp $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.Smart_Proxies_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - client.cpp \ - testC.cpp \ - Smart_Proxy_Impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Smart_Proxies_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - Smart_Proxy_Impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.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/tests/Smart_Proxies/On_Demand/Makefile.am b/tests/Smart_Proxies/On_Demand/Makefile.am deleted file mode 100644 index c4ba6d36b14..00000000000 --- a/tests/Smart_Proxies/On_Demand/Makefile.am +++ /dev/null @@ -1,114 +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.SP_On_Demand_Idl.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) -Sa -St -Gsp $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.SP_On_Demand_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - Smart_Test_Factory.cpp \ - client.cpp \ - testC.cpp \ - Smart_Proxy_Impl.h \ - Smart_Test_Factory.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.SP_On_Demand_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - Smart_Proxy_Impl.h \ - Smart_Test_Factory.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.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/tests/Smart_Proxies/On_Demand/client.cpp b/tests/Smart_Proxies/On_Demand/client.cpp index 558dddea467..13cd632d504 100644 --- a/tests/Smart_Proxies/On_Demand/client.cpp +++ b/tests/Smart_Proxies/On_Demand/client.cpp @@ -1,28 +1,23 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/Smart_Proxy/On_Demand -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// This is the client program that tests TAO's Smart Proxy extension. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -//========================================================================= + +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * This is the client program that tests TAO's Smart Proxy extension. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + #define ACE_BUILD_SVC_DLL #include "ace/Get_Opt.h" #include "testC.h" #include "ace/OS_NS_string.h" -ACE_RCSID(Smart_Proxy, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/tests/Smart_Proxies/On_Demand/server.cpp b/tests/Smart_Proxies/On_Demand/server.cpp index 0ab01611e34..1da423a2ca8 100644 --- a/tests/Smart_Proxies/On_Demand/server.cpp +++ b/tests/Smart_Proxies/On_Demand/server.cpp @@ -1,27 +1,22 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/Smart_Proxy/On_Demand -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// This is the server program that tests TAO's Smart Proxy extension. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -//========================================================================= + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * This is the server program that tests TAO's Smart Proxy extension. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + #include "testS.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" -ACE_RCSID(Smart_Proxy, server, "$Id$") - // The servant class Test_i : public POA_Test @@ -32,8 +27,8 @@ public: CORBA::Short method (CORBA::Short boo); //FUZZ: disable check_for_lack_ACE_OS + ///FUZZ: enable check_for_lack_ACE_OS void shutdown (void); - //FUZZ: enable check_for_lack_ACE_OS private: CORBA::ORB_var orb_; @@ -85,7 +80,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/tests/Smart_Proxies/On_Demand/test.idl b/tests/Smart_Proxies/On_Demand/test.idl index c3478d7e120..0f8886ac634 100644 --- a/tests/Smart_Proxies/On_Demand/test.idl +++ b/tests/Smart_Proxies/On_Demand/test.idl @@ -10,7 +10,7 @@ interface Test // which has a method which can be 'smartified' // to provide extra functionality. - exception Oops + exception Oops { string reason; }; diff --git a/tests/Smart_Proxies/Policy/Makefile.am b/tests/Smart_Proxies/Policy/Makefile.am deleted file mode 100644 index d21ba51b584..00000000000 --- a/tests/Smart_Proxies/Policy/Makefile.am +++ /dev/null @@ -1,111 +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.SP_Policy_Idl.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) -Sa -St -Gsp $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Policy_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - client.cpp \ - testC.cpp \ - Smart_Proxy_Impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.SP_Policy_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - Smart_Proxy_Impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.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/tests/Smart_Proxies/Policy/client.cpp b/tests/Smart_Proxies/Policy/client.cpp index 9bbf62c6333..18858ee8601 100644 --- a/tests/Smart_Proxies/Policy/client.cpp +++ b/tests/Smart_Proxies/Policy/client.cpp @@ -1,28 +1,23 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/Smart_Proxy -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// This is the client program that tests TAO's Smart Proxy extension. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -//========================================================================= + +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * This is the client program that tests TAO's Smart Proxy extension. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" #include "testC.h" #include "Smart_Proxy_Impl.h" -ACE_RCSID(Smart_Proxy, client, "$Id$") - const ACE_TCHAR *ior1 = ACE_TEXT("file://test1.ior"); const ACE_TCHAR *ior2 = ACE_TEXT("file://test2.ior"); int one_shot_factory = 1; diff --git a/tests/Smart_Proxies/Policy/server.cpp b/tests/Smart_Proxies/Policy/server.cpp index dd5846f3797..33a19e5aff6 100644 --- a/tests/Smart_Proxies/Policy/server.cpp +++ b/tests/Smart_Proxies/Policy/server.cpp @@ -1,27 +1,22 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/Smart_Proxy -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// This is the server program that tests TAO's Smart Proxy extension. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -//========================================================================= + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * This is the server program that tests TAO's Smart Proxy extension. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + #include "testS.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" -ACE_RCSID(Smart_Proxy, server, "$Id$") - // The servant class Test_i : public POA_Test @@ -32,8 +27,8 @@ public: CORBA::Short method (CORBA::Short boo); //FUZZ: disable check_for_lack_ACE_OS + ///FUZZ: enable check_for_lack_ACE_OS void shutdown (void); - //FUZZ: enable check_for_lack_ACE_OS private: CORBA::ORB_var orb_; @@ -85,7 +80,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/tests/Smart_Proxies/Policy/test.idl b/tests/Smart_Proxies/Policy/test.idl index f870179f56d..6d98cb1223c 100644 --- a/tests/Smart_Proxies/Policy/test.idl +++ b/tests/Smart_Proxies/Policy/test.idl @@ -6,12 +6,12 @@ interface Test // A simple test interface // // = DESCRIPTION - // This test demostrates the smart proxy feature in TAO + // This test demostrates the smart proxy feature in TAO // Note that though the interface has two methods just one - // of them can be "smartified" if necessary, the other one + // of them can be "smartified" if necessary, the other one // simply performs the same way as would the default proxy. - exception Oops + exception Oops { string reason; }; diff --git a/tests/Smart_Proxies/client.cpp b/tests/Smart_Proxies/client.cpp index 621d6fd794f..2000a28b4b2 100644 --- a/tests/Smart_Proxies/client.cpp +++ b/tests/Smart_Proxies/client.cpp @@ -1,20 +1,17 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/Smart_Proxy -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// This is the client program that tests TAO's Smart Proxy extension. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -//========================================================================= + +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * This is the client program that tests TAO's Smart Proxy extension. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + #include "ace/Get_Opt.h" #include "testC.h" @@ -22,8 +19,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(Smart_Proxy, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int diff --git a/tests/Smart_Proxies/dtor/Makefile.am b/tests/Smart_Proxies/dtor/Makefile.am deleted file mode 100644 index 3eb71ba82e0..00000000000 --- a/tests/Smart_Proxies/dtor/Makefile.am +++ /dev/null @@ -1,112 +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.dtor_idl.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) -Sa -St -Gsp $(srcdir)/test.idl - @touch $@ - -noinst_HEADERS = \ - test.idl - -endif BUILD_EXCEPTIONS - -## Makefile.Dtor_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Smart_Proxy_Impl.cpp \ - client.cpp \ - testC.cpp \ - Smart_Proxy_Impl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Dtor_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - Smart_Proxy_Impl.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_SmartProxies.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/tests/Smart_Proxies/dtor/server.cpp b/tests/Smart_Proxies/dtor/server.cpp index f5ed8b0cf6e..ffbcf770d1b 100644 --- a/tests/Smart_Proxies/dtor/server.cpp +++ b/tests/Smart_Proxies/dtor/server.cpp @@ -59,7 +59,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/tests/Smart_Proxies/dtor/test.idl b/tests/Smart_Proxies/dtor/test.idl index 5ab792d6458..06d125afd30 100644 --- a/tests/Smart_Proxies/dtor/test.idl +++ b/tests/Smart_Proxies/dtor/test.idl @@ -1,11 +1,11 @@ //$Id$ -// This test is to ensure if the destruction process -// and the _non_existent() function in the smart proxy -// is working properly. +// This test is to ensure if the destruction process +// and the _non_existent() function in the smart proxy +// is working properly. -interface Test +interface Test { void hello (in long howmany); oneway void shutdown (); diff --git a/tests/Smart_Proxies/server.cpp b/tests/Smart_Proxies/server.cpp index 3b3592d2d23..45705ad98aa 100644 --- a/tests/Smart_Proxies/server.cpp +++ b/tests/Smart_Proxies/server.cpp @@ -1,27 +1,22 @@ -// $Id$ - -//======================================================================== -// -// = LIBRARY -// TAO/tests/Smart_Proxy -// -// = FILENAME -// server.cpp -// -// = DESCRIPTION -// This is the server program that tests TAO's Smart Proxy extension. -// -// = AUTHOR -// Kirthika Parameswaran <kirthika@cs.wustl.edu> -// -//========================================================================= + +//============================================================================= +/** + * @file server.cpp + * + * $Id$ + * + * This is the server program that tests TAO's Smart Proxy extension. + * + * + * @author Kirthika Parameswaran <kirthika@cs.wustl.edu> + */ +//============================================================================= + #include "testS.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" -ACE_RCSID(Smart_Proxy, server, "$Id$") - // The servant class Test_i : public POA_Test @@ -32,8 +27,8 @@ public: CORBA::Short method (CORBA::Short boo); //FUZZ: disable check_for_lack_ACE_OS + ///FUZZ: enable check_for_lack_ACE_OS void shutdown (void); - //FUZZ: enable check_for_lack_ACE_OS private: CORBA::ORB_var orb_; @@ -85,7 +80,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/tests/Smart_Proxies/test.idl b/tests/Smart_Proxies/test.idl index f870179f56d..6d98cb1223c 100644 --- a/tests/Smart_Proxies/test.idl +++ b/tests/Smart_Proxies/test.idl @@ -6,12 +6,12 @@ interface Test // A simple test interface // // = DESCRIPTION - // This test demostrates the smart proxy feature in TAO + // This test demostrates the smart proxy feature in TAO // Note that though the interface has two methods just one - // of them can be "smartified" if necessary, the other one + // of them can be "smartified" if necessary, the other one // simply performs the same way as would the default proxy. - exception Oops + exception Oops { string reason; }; diff --git a/tests/Stack_Recursion/Client_Task.cpp b/tests/Stack_Recursion/Client_Task.cpp index 61ae3c5e451..9bbaa1a9caf 100644 --- a/tests/Stack_Recursion/Client_Task.cpp +++ b/tests/Stack_Recursion/Client_Task.cpp @@ -4,10 +4,6 @@ #include "Client_Task.h" -ACE_RCSID(Stack_Recursion, - Client_Task, - "$Id$") - Client_Task::Client_Task (Test::Sender_ptr sender, CORBA::Long event_count, CORBA::ULong event_size, diff --git a/tests/Stack_Recursion/Makefile.am b/tests/Stack_Recursion/Makefile.am deleted file mode 100644 index e6df4960f7b..00000000000 --- a/tests/Stack_Recursion/Makefile.am +++ /dev/null @@ -1,109 +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.Stack_Recursion_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.Stack_Recursion_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_Task.cpp \ - TestC.cpp \ - client.cpp \ - Client_Task.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Stack_Recursion_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - Sender.cpp \ - Server_Task.cpp \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - Sender.h \ - Server_Task.h - -server_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/Stack_Recursion/Sender.cpp b/tests/Stack_Recursion/Sender.cpp index e82205e3e05..c221af4b87c 100644 --- a/tests/Stack_Recursion/Sender.cpp +++ b/tests/Stack_Recursion/Sender.cpp @@ -3,10 +3,6 @@ // #include "Sender.h" -ACE_RCSID(Stack_Recursion, - Sender, - "$Id$") - Sender::Sender (CORBA::ORB_ptr orb) : message_count_ (0) , byte_count_ (0) diff --git a/tests/Stack_Recursion/Server_Task.cpp b/tests/Stack_Recursion/Server_Task.cpp index ffacc6abae5..15daa14ac9a 100644 --- a/tests/Stack_Recursion/Server_Task.cpp +++ b/tests/Stack_Recursion/Server_Task.cpp @@ -5,10 +5,6 @@ #include "Server_Task.h" #include "Sender.h" -ACE_RCSID(Stack_Recusrion, - Server_Task, - "$Id$") - Server_Task::Server_Task (CORBA::ORB_ptr orb, const Sender *sender, ACE_Thread_Manager *thr_mgr) diff --git a/tests/Stack_Recursion/client.cpp b/tests/Stack_Recursion/client.cpp index 975cd259671..5f7e03858c6 100644 --- a/tests/Stack_Recursion/client.cpp +++ b/tests/Stack_Recursion/client.cpp @@ -3,10 +3,6 @@ #include "Client_Task.h" #include "ace/Get_Opt.h" -ACE_RCSID(Stack_Recursion, - client, - "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); static int iterations = 1000; @@ -34,7 +30,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/tests/Stack_Recursion/server.cpp b/tests/Stack_Recursion/server.cpp index 4e0a0cafe83..93f40f4df09 100644 --- a/tests/Stack_Recursion/server.cpp +++ b/tests/Stack_Recursion/server.cpp @@ -4,10 +4,6 @@ #include "Server_Task.h" #include "ace/Get_Opt.h" -ACE_RCSID(Stack_Recursion, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int @@ -31,7 +27,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/tests/Strategies/Makefile.am b/tests/Strategies/Makefile.am deleted file mode 100644 index 7c2193af698..00000000000 --- a/tests/Strategies/Makefile.am +++ /dev/null @@ -1,123 +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.Strategies_Idl.am - -BUILT_SOURCES = \ - simple_testC.cpp \ - simple_testC.h \ - simple_testC.inl \ - simple_testS.cpp \ - simple_testS.h \ - simple_testS.inl - -CLEANFILES = \ - simple_test-stamp \ - simple_testC.cpp \ - simple_testC.h \ - simple_testC.inl \ - simple_testS.cpp \ - simple_testS.h \ - simple_testS.inl - -simple_testC.cpp simple_testC.h simple_testC.inl simple_testS.cpp simple_testS.h simple_testS.inl: simple_test-stamp - -simple_test-stamp: $(srcdir)/simple_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/simple_test.idl - @touch $@ - -noinst_HEADERS = \ - simple_test.idl - -## Makefile.Strategies_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 \ - simple_testC.cpp \ - simple_test_i.h \ - simple_test_i.inl - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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.Strategies_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - simple_testC.cpp \ - simple_testS.cpp \ - simple_test_i.cpp \ - simple_test_i.h \ - simple_test_i.inl - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## 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/Strategies/client.cpp b/tests/Strategies/client.cpp index 72b531d4f32..7d1dd8c33bf 100644 --- a/tests/Strategies/client.cpp +++ b/tests/Strategies/client.cpp @@ -4,8 +4,6 @@ #include "ace/Task.h" #include "simple_testC.h" -ACE_RCSID(tests, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int server_shutdown = 0; @@ -34,7 +32,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/tests/Strategies/server.cpp b/tests/Strategies/server.cpp index e896098d5af..75cf6830738 100644 --- a/tests/Strategies/server.cpp +++ b/tests/Strategies/server.cpp @@ -4,8 +4,6 @@ #include "ace/OS_NS_stdio.h" #include "simple_test_i.h" -ACE_RCSID(tests, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int @@ -29,7 +27,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/tests/Strategies/simple_test_i.cpp b/tests/Strategies/simple_test_i.cpp index fc61c63ee2d..bbb6b1c07fb 100644 --- a/tests/Strategies/simple_test_i.cpp +++ b/tests/Strategies/simple_test_i.cpp @@ -7,8 +7,6 @@ #include "simple_test_i.inl" #endif /* __ACE_INLINE__ */ -ACE_RCSID(tests, simple_test_i, "$Id$") - CORBA::Boolean Simple_Server_i::print_status (void) { diff --git a/tests/Strategies/simple_test_i.h b/tests/Strategies/simple_test_i.h index c2680214a24..1077e9f1a54 100644 --- a/tests/Strategies/simple_test_i.h +++ b/tests/Strategies/simple_test_i.h @@ -1,34 +1,32 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tao/Strategies/tests/ -// -// = FILENAME -// simple_test_i.h -// -// = AUTHOR -// Priyanka Gontla <pgontla@ece.uci.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file simple_test_i.h + * + * $Id$ + * + * @author Priyanka Gontla <pgontla@ece.uci.edu> + */ +//============================================================================= + #ifndef TAO_STRATEGIES_TEST_I_H #define TAO_STRATEGIES_TEST_I_H #include "simple_testS.h" +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb); - // ctor // = The Simple_Server methods. CORBA::Boolean print_status (void); diff --git a/tests/Timed_Buffered_Oneways/Makefile.am b/tests/Timed_Buffered_Oneways/Makefile.am deleted file mode 100644 index 120dbfcb5d0..00000000000 --- a/tests/Timed_Buffered_Oneways/Makefile.am +++ /dev/null @@ -1,119 +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.Timed_Buffered_Oneways_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.Timed_Buffered_Oneways_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 \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.Timed_Buffered_Oneways_Server.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## 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/Timed_Buffered_Oneways/client.cpp b/tests/Timed_Buffered_Oneways/client.cpp index 6bc6276367b..bd6881ba7a4 100644 --- a/tests/Timed_Buffered_Oneways/client.cpp +++ b/tests/Timed_Buffered_Oneways/client.cpp @@ -1,18 +1,18 @@ -// $Id$ - -// ================================================================ -// -// = FILENAME -// client.cpp -// -// = DESCRIPTION -// This is a client that uses oneways with buffering constraints -// and roundtrip timeout constraints. -// -// = AUTHOR -// Irfan Pyarali -// -// ================================================================ + +//============================================================================= +/** + * @file client.cpp + * + * $Id$ + * + * This is a client that uses oneways with buffering constraints + * and roundtrip timeout constraints. + * + * + * @author Irfan Pyarali + */ +//============================================================================= + #include "testC.h" @@ -25,8 +25,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_sys_time.h" -ACE_RCSID(Timed_Buffered_Oneways, client, "$Id$") - // Eager buffering option. static int eager_buffering = 0; diff --git a/tests/Timed_Buffered_Oneways/server.cpp b/tests/Timed_Buffered_Oneways/server.cpp index 2a50e5d639d..612df69b35f 100644 --- a/tests/Timed_Buffered_Oneways/server.cpp +++ b/tests/Timed_Buffered_Oneways/server.cpp @@ -4,8 +4,6 @@ #include "test_i.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Timed_Buffered_Oneways, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); int @@ -30,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Timed_Buffered_Oneways/test_i.cpp b/tests/Timed_Buffered_Oneways/test_i.cpp index d27303d7a99..62fce048a11 100644 --- a/tests/Timed_Buffered_Oneways/test_i.cpp +++ b/tests/Timed_Buffered_Oneways/test_i.cpp @@ -5,8 +5,6 @@ #include "ace/OS_NS_sys_time.h" #include "ace/Time_Value.h" -ACE_RCSID(Timed_Buffered_Oneways, test_i, "$Id$") - test_i::test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { diff --git a/tests/Timed_Buffered_Oneways/test_i.h b/tests/Timed_Buffered_Oneways/test_i.h index 6a8e13412fe..7dc48785cb1 100644 --- a/tests/Timed_Buffered_Oneways/test_i.h +++ b/tests/Timed_Buffered_Oneways/test_i.h @@ -1,32 +1,31 @@ // -*- C++ -*- -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Timed_Buffered_Oneways/ -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Irfan Pyarali -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Irfan Pyarali + */ +//============================================================================= + #ifndef TAO_TIMED_BUFFERED_ONEWAYS_TEST_I_H #define TAO_TIMED_BUFFERED_ONEWAYS_TEST_I_H #include "testS.h" +/** + * @class test_i + * + * @brief Simple implementation. + */ class test_i : public POA_test { - // = TITLE - // Simple implementation. - // public: + /// ctor. test_i (CORBA::ORB_ptr orb); - // ctor. // = The test interface methods. void method (CORBA::ULong request_number, @@ -39,8 +38,8 @@ public: void shutdown (CORBA::Long start_time); private: + /// The ORB. CORBA::ORB_var orb_; - // The ORB. }; #endif /* TAO_TIMED_BUFFERED_ONEWAYS_TEST_I_H */ diff --git a/tests/Timeout/Makefile.am b/tests/Timeout/Makefile.am deleted file mode 100644 index 51dbe32d08e..00000000000 --- a/tests/Timeout/Makefile.am +++ /dev/null @@ -1,113 +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.Timeout_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.Timeout_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 \ - testC.cpp \ - test_i.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.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.Timeout_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - test_i.h - -server_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/Timeout/client.cpp b/tests/Timeout/client.cpp index 755d3da6daf..a5b94214917 100644 --- a/tests/Timeout/client.cpp +++ b/tests/Timeout/client.cpp @@ -6,8 +6,6 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/Get_Opt.h" -ACE_RCSID(Timeout, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int min_timeout = 0; int max_timeout = 20; diff --git a/tests/Timeout/server.cpp b/tests/Timeout/server.cpp index 7812e2261e4..1e66973cff6 100644 --- a/tests/Timeout/server.cpp +++ b/tests/Timeout/server.cpp @@ -4,8 +4,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID(Timeout, server, "$Id$") - const ACE_TCHAR *ior_output_file = 0; int @@ -31,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/Timeout/test_i.cpp b/tests/Timeout/test_i.cpp index e75b0e611ce..4dec77755fe 100644 --- a/tests/Timeout/test_i.cpp +++ b/tests/Timeout/test_i.cpp @@ -4,8 +4,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/High_Res_Timer.h" -ACE_RCSID(Timeout, test_i, "$Id$") - ACE_High_Res_Timer sleep_duration; diff --git a/tests/Timeout/test_i.h b/tests/Timeout/test_i.h index 8c102e3a1b7..eb3d07084a5 100644 --- a/tests/Timeout/test_i.h +++ b/tests/Timeout/test_i.h @@ -1,34 +1,32 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Timeout -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Carlos O'Ryan -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Carlos O'Ryan + */ +//============================================================================= + #ifndef TAO_TIMEOUT_TEST_I_H #define TAO_TIMEOUT_TEST_I_H #include "testS.h" +/** + * @class Simple_Server_i + * + * @brief Simpler Server implementation + * + * Implements the Simple_Server interface in test.idl + */ class Simple_Server_i : public POA_Simple_Server { - // = TITLE - // Simpler Server implementation - // - // = DESCRIPTION - // Implements the Simple_Server interface in test.idl - // public: + /// ctor Simple_Server_i (CORBA::ORB_ptr orb); - // ctor // = The Simple_Server methods. CORBA::Long echo (CORBA::Long x, @@ -36,8 +34,8 @@ public: void shutdown (void); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB }; #endif /* TAO_TIMEOUT_TEST_I_H */ diff --git a/tests/TransportCurrent/Framework/Current_Test_Impl.cpp b/tests/TransportCurrent/Framework/Current_Test_Impl.cpp index 0697c11ac4c..b3f28bd21f5 100644 --- a/tests/TransportCurrent/Framework/Current_Test_Impl.cpp +++ b/tests/TransportCurrent/Framework/Current_Test_Impl.cpp @@ -1,19 +1,16 @@ // -*- C++ -*- +// $Id$ #include "tao/TransportCurrent/TCC.h" #include "Current_Test_Impl.h" -ACE_RCSID (Transport_Current, - Current_Test_Impl, - "$Id$") - - Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - int do_collocated_calls) - : orb_ (CORBA::ORB::_duplicate (orb)) - , poa_ (PortableServer::POA::_duplicate (poa)) - , do_collocated_calls_ (do_collocated_calls) +Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + int do_collocated_calls) + : orb_ (CORBA::ORB::_duplicate (orb)) + , poa_ (PortableServer::POA::_duplicate (poa)) + , do_collocated_calls_ (do_collocated_calls) { } diff --git a/tests/TransportCurrent/Framework/Makefile.am b/tests/TransportCurrent/Framework/Makefile.am deleted file mode 100644 index 236db0d4797..00000000000 --- a/tests/TransportCurrent/Framework/Makefile.am +++ /dev/null @@ -1,103 +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) - -noinst_PROGRAMS = - -## Makefile.Framework_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS -if BUILD_TRANSPORT_CURRENT - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib \ - -I../lib - -server_SOURCES = \ - Current_Test_Impl.cpp \ - Server_Main.cpp \ - Tester.cpp \ - server.cpp - -server_LDADD = \ - $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \ - $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_TC.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_TRANSPORT_CURRENT -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.Framework_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS -if BUILD_TRANSPORT_CURRENT - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib \ - -I../lib - -client_SOURCES = \ - Tester.cpp \ - client.cpp - -client_LDADD = \ - $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \ - $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_TC.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_TRANSPORT_CURRENT -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## 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/TransportCurrent/Framework/Server_Main.cpp b/tests/TransportCurrent/Framework/Server_Main.cpp index a11a01d1f00..c6d7ad97d0f 100644 --- a/tests/TransportCurrent/Framework/Server_Main.cpp +++ b/tests/TransportCurrent/Framework/Server_Main.cpp @@ -1,5 +1,4 @@ // -*- C++ -*- - // $Id$ #include "Server_Request_Interceptor.h" diff --git a/tests/TransportCurrent/Framework/Tester.cpp b/tests/TransportCurrent/Framework/Tester.cpp index 1bc137d006e..a17fec6c9d2 100644 --- a/tests/TransportCurrent/Framework/Tester.cpp +++ b/tests/TransportCurrent/Framework/Tester.cpp @@ -5,7 +5,6 @@ using namespace TAO; - /// Test referencing the TC data outside of the context of an upcall, /// or a client-side interceptor diff --git a/tests/TransportCurrent/Framework/client-static.conf b/tests/TransportCurrent/Framework/client-static.conf index 0f63cfe7965..ecdf64130c6 100644 --- a/tests/TransportCurrent/Framework/client-static.conf +++ b/tests/TransportCurrent/Framework/client-static.conf @@ -1 +1,3 @@ +# $Id$ + static TAO_Transport_Current_Loader "" diff --git a/tests/TransportCurrent/Framework/client.conf b/tests/TransportCurrent/Framework/client.conf index aecb1923f83..4d67c4ff957 100644 --- a/tests/TransportCurrent/Framework/client.conf +++ b/tests/TransportCurrent/Framework/client.conf @@ -1 +1,3 @@ +# $Id$ + dynamic TAO_Transport_Current_Loader Service_Object * TAO_TC:_make_TAO_Transport_Current_Loader() "" diff --git a/tests/TransportCurrent/Framework/client.cpp b/tests/TransportCurrent/Framework/client.cpp index 33c1a6b83ee..48b63aaba8e 100644 --- a/tests/TransportCurrent/Framework/client.cpp +++ b/tests/TransportCurrent/Framework/client.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "ace/Task.h" @@ -13,10 +14,6 @@ #include "Client_ORBInitializer.h" -ACE_RCSID (PICurrent, - client, - "$Id$") - // Prototype int diff --git a/tests/TransportCurrent/Framework/server-static.conf b/tests/TransportCurrent/Framework/server-static.conf index 0f63cfe7965..ecdf64130c6 100644 --- a/tests/TransportCurrent/Framework/server-static.conf +++ b/tests/TransportCurrent/Framework/server-static.conf @@ -1 +1,3 @@ +# $Id$ + static TAO_Transport_Current_Loader "" diff --git a/tests/TransportCurrent/Framework/server.conf b/tests/TransportCurrent/Framework/server.conf index aecb1923f83..4d67c4ff957 100644 --- a/tests/TransportCurrent/Framework/server.conf +++ b/tests/TransportCurrent/Framework/server.conf @@ -1 +1,3 @@ +# $Id$ + dynamic TAO_Transport_Current_Loader Service_Object * TAO_TC:_make_TAO_Transport_Current_Loader() "" diff --git a/tests/TransportCurrent/Framework/server.cpp b/tests/TransportCurrent/Framework/server.cpp index 6bb4bf2412f..f4f14a14a7a 100644 --- a/tests/TransportCurrent/Framework/server.cpp +++ b/tests/TransportCurrent/Framework/server.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" @@ -10,10 +11,6 @@ #include "Server_Request_Interceptor.h" #include "Server_ORBInitializer.h" -ACE_RCSID (Transport_Current, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior"); int nthreads = 1; int use_collocated_call = 1; @@ -50,7 +47,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/tests/TransportCurrent/Framework/simple.cpp b/tests/TransportCurrent/Framework/simple.cpp index 5e6a3d92beb..0b5d3a458b2 100644 --- a/tests/TransportCurrent/Framework/simple.cpp +++ b/tests/TransportCurrent/Framework/simple.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "tao/ORB.h" #include "tao/Object.h" @@ -6,10 +7,6 @@ #include "ace/Service_Config.h" #include "ace/Dynamic_Service.h" -ACE_RCSID (Transport_Current, - simple, - "$Id$") - int testCurrentORBInitializer (int argc, ACE_TCHAR *argv[]) { diff --git a/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp index c113ed14627..82f2f56d9ea 100644 --- a/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp +++ b/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp @@ -1,15 +1,11 @@ // -*- C++ -*- +// $Id$ #include "tao/TransportCurrent/TC_IIOPC.h" #include "tao/TransportCurrent/TCC.h" #include "Current_Test_Impl.h" -ACE_RCSID (Transport_Current, - Current_Test_Impl, - "$Id$") - - Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, int do_collocated_calls) diff --git a/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp b/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp index c4ed3e82c24..3005a704841 100644 --- a/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp +++ b/tests/TransportCurrent/IIOP/IIOP_Server_Main.cpp @@ -1,5 +1,4 @@ // -*- C++ -*- - // $Id$ #include "IIOP_Server_Request_Interceptor.h" diff --git a/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp index a7d21f99423..b0918b36806 100644 --- a/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp +++ b/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp @@ -1,13 +1,10 @@ // -*- C++ -*- +// $Id$ #include "ace/Log_Msg.h" #include "tao/ORB_Constants.h" #include "tao/TransportCurrent/TC_IIOPC.h" -ACE_RCSID (ForwardRequest, - Server_Request_Interceptor, - "$Id$") - #include "IIOP_Server_Request_Interceptor.h" namespace Test { @@ -162,8 +159,6 @@ namespace Test { && !has_remaining_endpoints; } - - void IIOP_Server_Request_Interceptor::inbound_process_context (PortableInterceptor::ServerRequestInfo_ptr ri) { @@ -216,11 +211,6 @@ namespace Test { this->pop_request_info (ACE_OS::atoi (buf)); } - - - - - void IIOP_Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri) { @@ -241,7 +231,6 @@ namespace Test { } - void IIOP_Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) { diff --git a/tests/TransportCurrent/IIOP/Makefile.am b/tests/TransportCurrent/IIOP/Makefile.am deleted file mode 100644 index bfad7062390..00000000000 --- a/tests/TransportCurrent/IIOP/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_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.IIOP_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS -if BUILD_TRANSPORT_CURRENT - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib \ - -I../lib - -server_SOURCES = \ - Current_Test_Impl.cpp \ - IIOP_Server_Main.cpp \ - IIOP_Server_Request_Interceptor.cpp \ - IIOP_Tester.cpp \ - server.cpp \ - IIOP_Server_Request_Interceptor.h - -server_LDADD = \ - $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \ - $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_TC_IIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_TC.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.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_TRANSPORT_CURRENT -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.IIOP_Client.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS -if BUILD_TRANSPORT_CURRENT - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(srcdir)/../lib \ - -I../lib - -client_SOURCES = \ - IIOP_Tester.cpp \ - client.cpp \ - IIOP_Server_Request_Interceptor.h - -client_LDADD = \ - $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Client.la \ - $(top_builddir)/tests/TransportCurrent/lib/libCurrent_Test_Lib_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_TC_IIOP.la \ - $(TAO_BUILDDIR)/tao/libTAO_TC.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_TRANSPORT_CURRENT -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## 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/TransportCurrent/IIOP/client.cpp b/tests/TransportCurrent/IIOP/client.cpp index 7e7c5138f9b..5faa5e6ca69 100644 --- a/tests/TransportCurrent/IIOP/client.cpp +++ b/tests/TransportCurrent/IIOP/client.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "ace/Task.h" @@ -13,10 +14,6 @@ #include "Client_ORBInitializer.h" -ACE_RCSID (IIOP, - client, - "$Id$") - // Prototype int diff --git a/tests/TransportCurrent/IIOP/client_dynamic.conf b/tests/TransportCurrent/IIOP/client_dynamic.conf index 56ff8d9c269..804e5d98153 100644 --- a/tests/TransportCurrent/IIOP/client_dynamic.conf +++ b/tests/TransportCurrent/IIOP/client_dynamic.conf @@ -1,3 +1,5 @@ +# $Id$ + static Client_Strategy_Factory "-ORBTransportMuxStrategy exclusive" dynamic TAO_Transport_Current_Loader Service_Object * TAO_TC:_make_TAO_Transport_Current_Loader() "" dynamic TAO_Transport_IIOP_Current_Loader Service_Object * TAO_TC_IIOP:_make_TAO_Transport_IIOP_Current_Loader() "" diff --git a/tests/TransportCurrent/IIOP/client_static.conf b/tests/TransportCurrent/IIOP/client_static.conf index 56e191b9257..91095d4f9d2 100644 --- a/tests/TransportCurrent/IIOP/client_static.conf +++ b/tests/TransportCurrent/IIOP/client_static.conf @@ -1,3 +1,5 @@ +# $Id$ + static TAO_Transport_Current_Loader "" static TAO_Transport_IIOP_Current_Loader "" static Client_Strategy_Factory "-ORBTransportMuxStrategy exclusive" diff --git a/tests/TransportCurrent/IIOP/server.cpp b/tests/TransportCurrent/IIOP/server.cpp index ae2d595b403..ec3f6611858 100644 --- a/tests/TransportCurrent/IIOP/server.cpp +++ b/tests/TransportCurrent/IIOP/server.cpp @@ -1,4 +1,5 @@ // -*- C++ -*- +// $Id$ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" @@ -10,11 +11,6 @@ #include "Server_Request_Interceptor.h" #include "Server_ORBInitializer.h" - -ACE_RCSID (Transport_Current, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT ("server.ior"); int nthreads = 1; int use_collocated_call = 1; @@ -51,14 +47,11 @@ parse_args (int argc, ACE_TCHAR *argv[]) -1); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } - - /// A helper class to encapsulate a task - class Worker : public ACE_Task_Base { public: @@ -72,16 +65,13 @@ private: /// Ctor - Worker::Worker (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { } - /// Test referencing the TC data *inside* the context of a client-side /// interceptor - int Worker::svc (void) { diff --git a/tests/TransportCurrent/IIOP/server_dynamic.conf b/tests/TransportCurrent/IIOP/server_dynamic.conf index df5758abd32..2456796ebbe 100644 --- a/tests/TransportCurrent/IIOP/server_dynamic.conf +++ b/tests/TransportCurrent/IIOP/server_dynamic.conf @@ -1,2 +1,4 @@ +# $Id$ + dynamic TAO_Transport_Current_Loader Service_Object * TAO_TC:_make_TAO_Transport_Current_Loader() "" dynamic TAO_Transport_IIOP_Current_Loader Service_Object * TAO_TC_IIOP:_make_TAO_Transport_IIOP_Current_Loader() "" diff --git a/tests/TransportCurrent/IIOP/server_static.conf b/tests/TransportCurrent/IIOP/server_static.conf index a3bca724d53..580aaef1564 100644 --- a/tests/TransportCurrent/IIOP/server_static.conf +++ b/tests/TransportCurrent/IIOP/server_static.conf @@ -1,2 +1,4 @@ +# $Id$ + static TAO_Transport_Current_Loader "" static TAO_Transport_IIOP_Current_Loader "" diff --git a/tests/TransportCurrent/Makefile.am b/tests/TransportCurrent/Makefile.am deleted file mode 100644 index 31b17045a69..00000000000 --- a/tests/TransportCurrent/Makefile.am +++ /dev/null @@ -1,15 +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 = \ - lib \ - IIOP \ - Framework - diff --git a/tests/TransportCurrent/lib/Client_ORBInitializer.cpp b/tests/TransportCurrent/lib/Client_ORBInitializer.cpp index c2bf2000119..d137ab4288c 100644 --- a/tests/TransportCurrent/lib/Client_ORBInitializer.cpp +++ b/tests/TransportCurrent/lib/Client_ORBInitializer.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "ace/Log_Msg.h" -ACE_RCSID (Current_Test_Lib, - Client_ORBInitializer, - "$Id$") - #include "Client_Request_Interceptor.h" #include "Client_ORBInitializer.h" diff --git a/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp b/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp index 8a27b51a923..db233e7864e 100644 --- a/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp +++ b/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "ace/Log_Msg.h" -ACE_RCSID (ForwardRequest, - Client_Request_Interceptor, - "$Id$") - #include "Current_TestC.h" #include "Client_Request_Interceptor.h" #include "Client_ORBInitializer.h" diff --git a/tests/TransportCurrent/lib/Current_Test.idl b/tests/TransportCurrent/lib/Current_Test.idl index a7f00f7d29f..9d38734be71 100644 --- a/tests/TransportCurrent/lib/Current_Test.idl +++ b/tests/TransportCurrent/lib/Current_Test.idl @@ -13,8 +13,6 @@ */ //============================================================================= - - module Test { module Transport diff --git a/tests/TransportCurrent/lib/Makefile.am b/tests/TransportCurrent/lib/Makefile.am deleted file mode 100644 index 1c92e6dc390..00000000000 --- a/tests/TransportCurrent/lib/Makefile.am +++ /dev/null @@ -1,114 +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.Current_Test_Lib_Idl.am - -BUILT_SOURCES = \ - Current_TestC.cpp \ - Current_TestC.h \ - Current_TestC.inl \ - Current_TestS.cpp \ - Current_TestS.h \ - Current_TestS.inl - -CLEANFILES = \ - Current_Test-stamp \ - Current_TestC.cpp \ - Current_TestC.h \ - Current_TestC.inl \ - Current_TestS.cpp \ - Current_TestS.h \ - Current_TestS.inl - -Current_TestC.cpp Current_TestC.h Current_TestC.inl Current_TestS.cpp Current_TestS.h Current_TestS.inl: Current_Test-stamp - -Current_Test-stamp: $(srcdir)/Current_Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St -Wb,export_include=Current_Test_Export.h -Wb,export_macro=Current_Test_Export $(srcdir)/Current_Test.idl - @touch $@ - -noinst_HEADERS = \ - Current_Test.idl - -## Makefile.Current_Test_Lib_Client.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS -if BUILD_TRANSPORT_CURRENT - -noinst_LTLIBRARIES += libCurrent_Test_Lib_Client.la - -libCurrent_Test_Lib_Client_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I. \ - -DCURRENT_TEST_BUILD_DLL - -libCurrent_Test_Lib_Client_la_SOURCES = \ - Client_ORBInitializer.cpp \ - Client_Request_Interceptor.cpp \ - Current_TestC.cpp - -noinst_HEADERS += \ - Client_ORBInitializer.h \ - Client_Request_Interceptor.h - -endif BUILD_TRANSPORT_CURRENT -endif BUILD_INTERCEPTORS -endif BUILD_EXCEPTIONS - -## Makefile.Current_Test_Lib_Server.am - -if BUILD_EXCEPTIONS -if BUILD_INTERCEPTORS -if BUILD_TRANSPORT_CURRENT - -noinst_LTLIBRARIES += libCurrent_Test_Lib_Server.la - -libCurrent_Test_Lib_Server_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I. \ - -DCURRENT_TEST_BUILD_DLL - -libCurrent_Test_Lib_Server_la_SOURCES = \ - Current_TestC.cpp \ - Current_TestS.cpp \ - Server_ORBInitializer.cpp \ - Server_Request_Interceptor.cpp - -noinst_HEADERS += \ - Server_ORBInitializer.h \ - Server_Request_Interceptor.h - -endif BUILD_TRANSPORT_CURRENT -endif BUILD_INTERCEPTORS -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/TransportCurrent/lib/Server_ORBInitializer.cpp b/tests/TransportCurrent/lib/Server_ORBInitializer.cpp index 8e866e97052..c8d3752852d 100644 --- a/tests/TransportCurrent/lib/Server_ORBInitializer.cpp +++ b/tests/TransportCurrent/lib/Server_ORBInitializer.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "ace/Log_Msg.h" -ACE_RCSID (Current_Test_Lib, - Server_ORBInitializer, - "$Id$") - #include "Server_Request_Interceptor.h" #include "Server_ORBInitializer.h" diff --git a/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp b/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp index 27b85d96434..13a739ca479 100644 --- a/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp +++ b/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp @@ -1,11 +1,8 @@ // -*- C++ -*- +// $Id$ #include "ace/Log_Msg.h" -ACE_RCSID (Current_Test_Lib, - Server_Request_Interceptor, - "$Id$") - #include "Server_Request_Interceptor.h" #include "Server_ORBInitializer.h" diff --git a/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp b/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp index ff63da47815..cedde496a0d 100644 --- a/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp +++ b/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp @@ -60,7 +60,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ++result; } } - + if (mytransport[0].purged_count () != 1) { ACE_ERROR ((LM_ERROR, "ERROR Incorrect purged count for transport 0: %d\n", mytransport[0].purged_count ())); diff --git a/tests/Transport_Cache_Manager/mock_ps.h b/tests/Transport_Cache_Manager/mock_ps.h index 6c6631d8c07..1ac46cc79ab 100644 --- a/tests/Transport_Cache_Manager/mock_ps.h +++ b/tests/Transport_Cache_Manager/mock_ps.h @@ -4,7 +4,7 @@ class mock_ps { public: mock_ps (int max) : maximum_ (max) {} - void update_item (mock_transport*) {} + void update_item (mock_transport&) {} int cache_maximum () { return this->maximum_;} private: int maximum_; diff --git a/tests/Two_Objects/First_i.cpp b/tests/Two_Objects/First_i.cpp index ffe3470c864..ca3287f6e3d 100644 --- a/tests/Two_Objects/First_i.cpp +++ b/tests/Two_Objects/First_i.cpp @@ -9,8 +9,6 @@ #include "ace/Synch.h" #include "ace/Auto_Event.h" -ACE_RCSID(Test, First_i, "$Id$") - First_i::First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done) : orb_ (CORBA::ORB::_duplicate (orb)), two_way_done_(two_way_done) diff --git a/tests/Two_Objects/Makefile.am b/tests/Two_Objects/Makefile.am deleted file mode 100644 index b21da08d4be..00000000000 --- a/tests/Two_Objects/Makefile.am +++ /dev/null @@ -1,115 +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.Two_Objects_Idl.am - -BUILT_SOURCES = \ - Two_ObjectsC.cpp \ - Two_ObjectsC.h \ - Two_ObjectsC.inl \ - Two_ObjectsS.cpp \ - Two_ObjectsS.h \ - Two_ObjectsS.inl - -CLEANFILES = \ - Two_Objects-stamp \ - Two_ObjectsC.cpp \ - Two_ObjectsC.h \ - Two_ObjectsC.inl \ - Two_ObjectsS.cpp \ - Two_ObjectsS.h \ - Two_ObjectsS.inl - -Two_ObjectsC.cpp Two_ObjectsC.h Two_ObjectsC.inl Two_ObjectsS.cpp Two_ObjectsS.h Two_ObjectsS.inl: Two_Objects-stamp - -Two_Objects-stamp: $(srcdir)/Two_Objects.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Two_Objects.idl - @touch $@ - -noinst_HEADERS = \ - Two_Objects.idl - -## Makefile.Two_Objects_Client.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -client_SOURCES = \ - Two_ObjectsC.cpp \ - client.cpp \ - First_i.h \ - Object_Factory_i.h \ - Second_i.h \ - worker.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.Two_Objects_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - First_i.cpp \ - Object_Factory_i.cpp \ - Second_i.cpp \ - Two_ObjectsC.cpp \ - Two_ObjectsS.cpp \ - server.cpp \ - worker.cpp \ - First_i.h \ - Object_Factory_i.h \ - Second_i.h \ - worker.h - -server_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/Two_Objects/Object_Factory_i.cpp b/tests/Two_Objects/Object_Factory_i.cpp index 426ab1c5052..b7775ca7721 100644 --- a/tests/Two_Objects/Object_Factory_i.cpp +++ b/tests/Two_Objects/Object_Factory_i.cpp @@ -7,9 +7,6 @@ #include "Object_Factory_i.h" #include "ace/Synch.h" -ACE_RCSID(Test, Test, "$Id$") - - Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb, CORBA::ULong len) : orb_ (CORBA::ORB::_duplicate (orb)), length_(len) @@ -31,8 +28,8 @@ Object_Factory_i::create_first (void) CORBA::Object_var poa_object = this->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 ()); PortableServer::ObjectId_var id = root_poa->activate_object (first_impl); @@ -61,8 +58,8 @@ Object_Factory_i::create_second (void) CORBA::Object_var poa_object = this->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 ()); PortableServer::ObjectId_var id = root_poa->activate_object (second_impl); diff --git a/tests/Two_Objects/Second_i.cpp b/tests/Two_Objects/Second_i.cpp index 462864406a7..a4cc32c1562 100644 --- a/tests/Two_Objects/Second_i.cpp +++ b/tests/Two_Objects/Second_i.cpp @@ -7,12 +7,6 @@ #include "tao/Thread_Lane_Resources.h" #include "ace/Auto_Event.h" - -ACE_RCSID (Two_Objects, - Second_i, - "$Id$") - - Second_i::Second_i (CORBA::ORB_ptr orb, CORBA::ULong len, ACE_Auto_Event &two_way_done) : orb_ (CORBA::ORB::_duplicate (orb)), diff --git a/tests/Two_Objects/client.cpp b/tests/Two_Objects/client.cpp index df4b10ff103..72213d9df43 100644 --- a/tests/Two_Objects/client.cpp +++ b/tests/Two_Objects/client.cpp @@ -3,8 +3,6 @@ #include "Two_ObjectsC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Test, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int @@ -29,7 +27,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/tests/Two_Objects/server.cpp b/tests/Two_Objects/server.cpp index 18a19d7071f..c1713a14618 100644 --- a/tests/Two_Objects/server.cpp +++ b/tests/Two_Objects/server.cpp @@ -5,8 +5,6 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -ACE_RCSID(Test, server, "$Id$") - int msglen = 100; //default length of reply message is 100 bytes int nthreads = 2; const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); @@ -43,7 +41,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/tests/Typedef_String_Array/Makefile.am b/tests/Typedef_String_Array/Makefile.am deleted file mode 100644 index 65e4c0466c0..00000000000 --- a/tests/Typedef_String_Array/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.typedef_string_array_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.typedef_string_array_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 \ - testC.cpp \ - testImpl.h - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.typedef_string_array_server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testImpl.cpp \ - testS.cpp \ - testImpl.h - -server_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/Typedef_String_Array/client.cpp b/tests/Typedef_String_Array/client.cpp index 03cd26b8eaf..a405d915563 100644 --- a/tests/Typedef_String_Array/client.cpp +++ b/tests/Typedef_String_Array/client.cpp @@ -3,8 +3,6 @@ #include "testC.h" #include "ace/Get_Opt.h" -ACE_RCSID(StringArray, client, "$Id$") - const ACE_TCHAR *ior = ACE_TEXT("file://server.ior"); int @@ -29,7 +27,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/tests/Typedef_String_Array/server.cpp b/tests/Typedef_String_Array/server.cpp index d24d49cba4d..8e9538a4c4f 100644 --- a/tests/Typedef_String_Array/server.cpp +++ b/tests/Typedef_String_Array/server.cpp @@ -4,8 +4,6 @@ #include "ace/OS_NS_stdio.h" #include "testImpl.h" -ACE_RCSID(MT_Client, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("server.ior"); int @@ -29,7 +27,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/tests/UNKNOWN_Exception/Makefile.am b/tests/UNKNOWN_Exception/Makefile.am deleted file mode 100644 index b09d9f69774..00000000000 --- a/tests/UNKNOWN_Exception/Makefile.am +++ /dev/null @@ -1,103 +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.UNKNOWN_Exception_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.UNKNOWN_Exception_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 \ - testC.cpp - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS - -## Makefile.UNKNOWN_Exception_Server.am - -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - server.cpp \ - testC.cpp \ - testS.cpp - -server_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/UNKNOWN_Exception/client.cpp b/tests/UNKNOWN_Exception/client.cpp index 27aa30dd43e..c7fce7f224c 100644 --- a/tests/UNKNOWN_Exception/client.cpp +++ b/tests/UNKNOWN_Exception/client.cpp @@ -3,8 +3,6 @@ #include "ace/Get_Opt.h" #include "testC.h" -ACE_RCSID (UNKNOWN_Exception, client, "$Id$") - static const ACE_TCHAR *ior = ACE_TEXT("file://ior"); static int shutdown_server = 1; diff --git a/tests/UNKNOWN_Exception/server.cpp b/tests/UNKNOWN_Exception/server.cpp index 8d59c3a562b..df224db010e 100644 --- a/tests/UNKNOWN_Exception/server.cpp +++ b/tests/UNKNOWN_Exception/server.cpp @@ -5,8 +5,6 @@ #include "tao/PortableServer/Root_POA.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (UNKNOWN_Exception, server, "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); static int done = 0; diff --git a/tests/Xt_Stopwatch/Client.h b/tests/Xt_Stopwatch/Client.h index 45162e4daf3..f2cecb0a0a1 100644 --- a/tests/Xt_Stopwatch/Client.h +++ b/tests/Xt_Stopwatch/Client.h @@ -1,17 +1,14 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Xt_Stopwatch/Stopwatch_client -// -// = FILENAME -// Client.h -// -// = AUTHOR -// Balachandran Natarajan <bala@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file Client.h + * + * $Id$ + * + * @author Balachandran Natarajan <bala@cs.wustl.edu> + */ +//============================================================================= + #ifndef CLIENT_H #define CLIENT_H @@ -26,35 +23,35 @@ class Client { public: + /// ctor Client (CORBA::ORB_ptr orb); - // ctor + ///Dtor.. ~Client (void); - //Dtor.. + /// The callbacks static void start_callback (Widget w, XtPointer client_data, XtPointer call_data); static void stop_callback (Widget w, XtPointer client_data, XtPointer call_data); - // The callbacks + /// The hooks... void start_hook (void); void stop_hook (void); - // The hooks... + /// Adds the callbacks to the GUI underneath..... void add_callback (Control &); - // Adds the callbacks to the GUI underneath..... void parse_args (int argc, ACE_TCHAR *argv[]); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB + /// The server. Stopwatch_var server_; - // The server. }; #endif /* CLIENT_H */ diff --git a/tests/Xt_Stopwatch/Control.h b/tests/Xt_Stopwatch/Control.h index 0dea6b7eed9..4d57f38da39 100644 --- a/tests/Xt_Stopwatch/Control.h +++ b/tests/Xt_Stopwatch/Control.h @@ -1,17 +1,14 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Xt_Stopwatch/Stopwatch_client -// -// = FILENAME -// Control.h -// -// = AUTHOR -// Balachandran Natarajan <bala@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file Control.h + * + * $Id$ + * + * @author Balachandran Natarajan <bala@cs.wustl.edu> + */ +//============================================================================= + #ifndef CONTROL_H #define CONTROL_H @@ -28,34 +25,34 @@ class Control { public: + /// Stopwatch constructor Control (Widget &parent); - // Stopwatch constructor + /// Destructor virtual ~Control (void); - // Destructor + /// Manage the widget virtual void manage (void); - // Manage the widget + /// Return the start widget Widget& startwidget (void); - // Return the start widget + /// Return the stop widget.. Widget& stopwidget (void); - // Return the stop widget.. private: + /// A frame widget... Widget frame_; - // A frame widget... + /// A row column widget.. Widget rowcolumn_; - // A row column widget.. + /// Pushbutton Widget that is used to start the timer.. Widget startwidget_; - // Pushbutton Widget that is used to start the timer.. + /// Pushbutton widget that is used to stop the timer.. Widget stopwidget_; - // Pushbutton widget that is used to stop the timer.. }; diff --git a/tests/Xt_Stopwatch/Makefile.am b/tests/Xt_Stopwatch/Makefile.am deleted file mode 100644 index 8232b73765c..00000000000 --- a/tests/Xt_Stopwatch/Makefile.am +++ /dev/null @@ -1,176 +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 = -CLEANFILES = -BUILT_SOURCES = - -## Makefile.Xt_Stopwatch_Server.am - -if BUILD_ACE_XTREACTOR -if BUILD_EXCEPTIONS -if BUILD_MOTIF -if BUILD_TAO_XTRESOURCE -if BUILD_X11 -if BUILD_XT - -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_PROGRAMS += server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - $(ACE_X11_CPPFLAGS) \ - $(ACE_XT_CPPFLAGS) - -server_SOURCES = \ - Stopwatch_display.cpp \ - server.cpp \ - testC.cpp \ - testS.cpp \ - test_i.cpp \ - timer.cpp \ - Stopwatch_display.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ - test_i.h \ - timer.h - -server_LDFLAGS = \ - $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) - -server_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_XtResource.la \ - $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -lXm \ - $(ACE_XT_LIBS) \ - $(ACE_X11_LIBS) - -endif BUILD_XT -endif BUILD_X11 -endif BUILD_TAO_XTRESOURCE -endif BUILD_MOTIF -endif BUILD_EXCEPTIONS -endif BUILD_ACE_XTREACTOR - -## Makefile.Xt_Stopwatch_Client.am - -if BUILD_ACE_XTREACTOR -if BUILD_EXCEPTIONS -if BUILD_MOTIF -if BUILD_TAO_XTRESOURCE -if BUILD_X11 -if BUILD_XT - -BUILT_SOURCES += \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES += \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl 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_PROGRAMS += client - -client_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - $(ACE_X11_CPPFLAGS) \ - $(ACE_XT_CPPFLAGS) - -client_SOURCES = \ - Control.cpp \ - client.cpp \ - testC.cpp \ - Control.h \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -client_LDFLAGS = \ - $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS) - -client_LDADD = \ - $(TAO_BUILDDIR)/tao/libTAO_XtResource.la \ - $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la \ - -lXm \ - $(ACE_XT_LIBS) \ - $(ACE_X11_LIBS) - -endif BUILD_XT -endif BUILD_X11 -endif BUILD_TAO_XTRESOURCE -endif BUILD_MOTIF -endif BUILD_EXCEPTIONS -endif BUILD_ACE_XTREACTOR - -## 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/Xt_Stopwatch/Stopwatch_display.cpp b/tests/Xt_Stopwatch/Stopwatch_display.cpp index 35c42b14cbe..aa6ff78ed24 100644 --- a/tests/Xt_Stopwatch/Stopwatch_display.cpp +++ b/tests/Xt_Stopwatch/Stopwatch_display.cpp @@ -1,15 +1,8 @@ // $Id$ #include "Stopwatch_display.h" - - #include "ace/OS_NS_stdio.h" -ACE_RCSID (Xt_Stopwatch, - Stopwatch_display, - "$Id$") - - Stopwatch_display::Stopwatch_display (Widget &parent) { // Instantiate the sub-components of the Stopwatch_display diff --git a/tests/Xt_Stopwatch/Stopwatch_display.h b/tests/Xt_Stopwatch/Stopwatch_display.h index 984d90b4d35..9c5cfc6fd24 100644 --- a/tests/Xt_Stopwatch/Stopwatch_display.h +++ b/tests/Xt_Stopwatch/Stopwatch_display.h @@ -1,17 +1,13 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Xt_Stopwatch/Stopwatch_server -// -// = FILENAME -// Stopwatch.h -// -// = AUTHOR -// Balachandran Natarajan <bala@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file Stopwatch_display.h + * + * $Id$ + * + * @author Balachandran Natarajan <bala@cs.wustl.edu> + */ +//============================================================================= #ifndef STOPWATCH_H #define STOPWATCH_H @@ -26,24 +22,24 @@ class Stopwatch_display { public: + /// Stopwatch_display constructor Stopwatch_display (Widget &parent); - // Stopwatch_display constructor + /// Destructor virtual ~Stopwatch_display (void); - // Destructor + /// Manage the widget virtual void manage (void); - // Manage the widget + /// Change the displayed time void set_time (CORBA::Float value); - // Change the displayed time private: + /// A frame widget... Widget frame_; - // A frame widget... + /// Label Widget that is used to display time.. Widget label_; - // Label Widget that is used to display time.. }; diff --git a/tests/Xt_Stopwatch/client.cpp b/tests/Xt_Stopwatch/client.cpp index 1de9fca420f..61b62cb138a 100644 --- a/tests/Xt_Stopwatch/client.cpp +++ b/tests/Xt_Stopwatch/client.cpp @@ -3,12 +3,9 @@ #include "testC.h" #include "ace/Get_Opt.h" -ACE_RCSID(Xt_Stopwatch, client, "$Id$") - #include "Control.h" #include "Client.h" - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { diff --git a/tests/Xt_Stopwatch/server.cpp b/tests/Xt_Stopwatch/server.cpp index 80fc60a15f4..f42ca6922a7 100644 --- a/tests/Xt_Stopwatch/server.cpp +++ b/tests/Xt_Stopwatch/server.cpp @@ -3,11 +3,6 @@ #include "test_i.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" - -ACE_RCSID (Xt_Stopwatch, - server, - "$Id$") - #include "tao/XtResource/XtResource_Loader.h" #include <Xm/Xm.h> #include "Stopwatch_display.h" @@ -37,7 +32,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/tests/Xt_Stopwatch/test.idl b/tests/Xt_Stopwatch/test.idl index 74e2d42aa80..a3fffd63f86 100644 --- a/tests/Xt_Stopwatch/test.idl +++ b/tests/Xt_Stopwatch/test.idl @@ -1,6 +1,6 @@ // $Id$ -interface Stopwatch +interface Stopwatch { void start (); // Start the Stop watch diff --git a/tests/Xt_Stopwatch/test_i.cpp b/tests/Xt_Stopwatch/test_i.cpp index 3523135d7e3..aa38cd96551 100644 --- a/tests/Xt_Stopwatch/test_i.cpp +++ b/tests/Xt_Stopwatch/test_i.cpp @@ -2,8 +2,6 @@ #include "test_i.h" -ACE_RCSID(Xt_Stopwatch, test_i, "$Id$") - Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer) : orb_ (CORBA::ORB::_duplicate (orb)), timer_ (timer) diff --git a/tests/Xt_Stopwatch/test_i.h b/tests/Xt_Stopwatch/test_i.h index 539a82b16e0..10135d3652e 100644 --- a/tests/Xt_Stopwatch/test_i.h +++ b/tests/Xt_Stopwatch/test_i.h @@ -1,17 +1,14 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Xt_Stopwatch -// -// = FILENAME -// test_i.h -// -// = AUTHOR -// Bala -// -// ============================================================================ + +//============================================================================= +/** + * @file test_i.h + * + * $Id$ + * + * @author Bala + */ +//============================================================================= + #ifndef SERVER_TEST_I_H #define SERVER_TEST_I_H @@ -20,17 +17,18 @@ #include "timer.h" +/** + * @class Stopwatch_imp + * + * @brief Stopwatch implementation class + * + * Implements the Stopwatch interface in test.idl + */ class Stopwatch_imp : public POA_Stopwatch { - // = TITLE - // Stopwatch implementation class - // - // = DESCRIPTION - // Implements the Stopwatch interface in test.idl - // public: + /// ctor Stopwatch_imp (CORBA::ORB_ptr, Timer_imp *); - // ctor // = The Simple_Server methods. void start (void); @@ -40,11 +38,11 @@ public: void shutdown (void); private: + /// The ORB CORBA::ORB_var orb_; - // The ORB + /// Hold the timer object... Timer_imp *timer_; - // Hold the timer object... }; #endif /* SERVER_TEST_I_H */ diff --git a/tests/Xt_Stopwatch/timer.h b/tests/Xt_Stopwatch/timer.h index 1708bbc8428..e96d6c614f8 100644 --- a/tests/Xt_Stopwatch/timer.h +++ b/tests/Xt_Stopwatch/timer.h @@ -1,17 +1,14 @@ -// $Id$ - -// ============================================================================ -// -// = LIBRARY -// TAO/tests/Xt_Stopwatch -// -// = FILENAME -// timer.h -// -// = AUTHOR -// Bala <bala@cs.wustl.edu> -// -// ============================================================================ + +//============================================================================= +/** + * @file timer.h + * + * $Id$ + * + * @author Bala <bala@cs.wustl.edu> + */ +//============================================================================= + #ifndef TIMER_H #define TIMER_H @@ -26,49 +23,49 @@ class Timer_imp { public: + /// Constructor Timer_imp (XtAppContext &, CORBA::Long, Stopwatch_display *); - // Constructor + /// Destructor virtual ~Timer_imp (); - // Destructor + /// Resets, and starts the clock ticking void start (void); - // Resets, and starts the clock ticking + /// Stops the clock void stop (void); - // Stops the clock + /// Returns time since timer started CORBA::Float elapsed_time (void); - // Returns time since timer started private: + /// Static member function used for TimeOut callback. static void tick_callback (XtPointer, XtIntervalId *); - // Static member function used for TimeOut callback. + /// Called every interval_ milliseconds void tick (void); - // Called every interval_ milliseconds + /// Called at each clock tick... virtual void report_time (CORBA::Float); - // Called at each clock tick... + /// A copy of the stopwatch object Stopwatch_display *stopwatch_; - // A copy of the stopwatch object + /// Current number of ticks CORBA::Long counter_; - // Current number of ticks + /// Time in milliseconds between updates CORBA::Long interval_; - // Time in milliseconds between updates + /// Identifier of current TimeOut XtIntervalId id_; - // Identifier of current TimeOut + /// Required by Xt functions XtAppContext app_; - // Required by Xt functions }; diff --git a/tests/ZIOP/Hello.cpp b/tests/ZIOP/Hello.cpp index ab73744cbe1..e22724f5b73 100644 --- a/tests/ZIOP/Hello.cpp +++ b/tests/ZIOP/Hello.cpp @@ -3,8 +3,6 @@ // #include "Hello.h" -ACE_RCSID(Hello, Hello, "$Id$") - Hello::Hello (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { @@ -36,17 +34,17 @@ Hello::get_big_reply () return reply_mesg._retn (); } -void +void Hello::big_request (const ::Test::Octet_Seq & octet_in) { if (octet_in.length () > 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Server side BLOB received\n"))); } else { - ACE_DEBUG ((LM_ERROR, + ACE_DEBUG ((LM_ERROR, ACE_TEXT("Error recieving BLOB on server\n"))); } } diff --git a/tests/ZIOP/Hello.h b/tests/ZIOP/Hello.h index dbbd2d62e2a..6209a6541e8 100644 --- a/tests/ZIOP/Hello.h +++ b/tests/ZIOP/Hello.h @@ -28,7 +28,7 @@ private: /// Use an ORB reference to conver strings to objects and shutdown /// the application. CORBA::ULong length_; - + CORBA::ORB_var orb_; }; diff --git a/tests/ZIOP/TestCompressor/TestCompressor.cpp b/tests/ZIOP/TestCompressor/TestCompressor.cpp index ef1bba0bc57..8c711ba1536 100644 --- a/tests/ZIOP/TestCompressor/TestCompressor.cpp +++ b/tests/ZIOP/TestCompressor/TestCompressor.cpp @@ -1,9 +1,6 @@ -#include "TestCompressor.h" - -ACE_RCSID (TEST, - TestCompressor, - "$Id$") +// $Id$ +#include "TestCompressor.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp b/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp index 276edc0c121..a61e71d60f3 100644 --- a/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp +++ b/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp @@ -1,10 +1,8 @@ +// $Id$ + #include "TestCompressor_Factory.h" #include "TestCompressor.h" -ACE_RCSID (TEST, - TestCompressor_Factory, - "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/tests/ZIOP/client.cpp b/tests/ZIOP/client.cpp index 15e2b51cc37..9a4dcab1601 100644 --- a/tests/ZIOP/client.cpp +++ b/tests/ZIOP/client.cpp @@ -3,13 +3,10 @@ #include "TestC.h" #include "ace/Get_Opt.h" #include "tao/ZIOP/ZIOP.h" -#include "ace/OS.h" #include "tao/Compression/zlib/ZlibCompressor_Factory.h" #include "tao/Compression/bzip2/Bzip2Compressor_Factory.h" #include "TestCompressor//TestCompressor_Factory.h" -ACE_RCSID(Hello, client, "$Id$") - #define DEFAULT_COMPRESSION_LEVEL 6 ::Compression::CompressionManager_var compression_manager = 0; const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); @@ -43,7 +40,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/tests/ZIOP/server.cpp b/tests/ZIOP/server.cpp index 5fdd724b921..2b2abfc7190 100644 --- a/tests/ZIOP/server.cpp +++ b/tests/ZIOP/server.cpp @@ -11,10 +11,6 @@ #include "tao/Policy_CurrentC.h" #include "tao/Transport.h" -ACE_RCSID (Hello, - server, - "$Id$") - const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); int test = 1; @@ -43,7 +39,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/tests/objref_comparison_test/Makefile.am b/tests/objref_comparison_test/Makefile.am deleted file mode 100644 index dd46876c7c6..00000000000 --- a/tests/objref_comparison_test/Makefile.am +++ /dev/null @@ -1,78 +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) - - -## Makefile.objref_comparison_test.am - -if BUILD_EXCEPTIONS - -BUILT_SOURCES = \ - fooC.cpp \ - fooC.h \ - fooC.inl \ - fooS.cpp \ - fooS.h \ - fooS.inl - -CLEANFILES = \ - foo-stamp \ - fooC.cpp \ - fooC.h \ - fooC.inl \ - fooS.cpp \ - fooS.h \ - fooS.inl - -fooC.cpp fooC.h fooC.inl fooS.cpp fooS.h fooS.inl: foo-stamp - -foo-stamp: $(srcdir)/foo.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/foo.idl - @touch $@ - -noinst_PROGRAMS = server - -server_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) - -server_SOURCES = \ - fooC.cpp \ - fooS.cpp \ - main.cpp \ - fooC.h \ - fooC.inl \ - fooS.h \ - fooS.inl - -server_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/objref_comparison_test/foo.idl b/tests/objref_comparison_test/foo.idl index 4e6dc131bea..6c5acbe1288 100644 --- a/tests/objref_comparison_test/foo.idl +++ b/tests/objref_comparison_test/foo.idl @@ -3,7 +3,7 @@ #ifndef FOO_IDL #define FOO_IDL -interface foo +interface foo { boolean match_references (); }; |