diff options
Diffstat (limited to 'tests/NestedUpcall/Triangle_Test')
| -rw-r--r-- | tests/NestedUpcall/Triangle_Test/Initiator_i.cpp | 32 | ||||
| -rw-r--r-- | tests/NestedUpcall/Triangle_Test/Initiator_i.h | 49 | ||||
| -rw-r--r-- | tests/NestedUpcall/Triangle_Test/Makefile.am | 148 | ||||
| -rw-r--r-- | tests/NestedUpcall/Triangle_Test/Object_A_i.cpp | 45 | ||||
| -rw-r--r-- | tests/NestedUpcall/Triangle_Test/Object_A_i.h | 47 | ||||
| -rw-r--r-- | tests/NestedUpcall/Triangle_Test/Object_B_i.cpp | 45 | ||||
| -rw-r--r-- | tests/NestedUpcall/Triangle_Test/Object_B_i.h | 47 | ||||
| -rw-r--r-- | tests/NestedUpcall/Triangle_Test/Triangle_Test.idl | 36 | ||||
| -rw-r--r-- | tests/NestedUpcall/Triangle_Test/initiator.cpp | 43 | ||||
| -rw-r--r-- | tests/NestedUpcall/Triangle_Test/initiator.h | 76 | ||||
| -rwxr-xr-x | tests/NestedUpcall/Triangle_Test/run_test.pl | 4 | ||||
| -rw-r--r-- | tests/NestedUpcall/Triangle_Test/server_A.cpp | 35 | ||||
| -rw-r--r-- | tests/NestedUpcall/Triangle_Test/server_A.h | 66 | ||||
| -rw-r--r-- | tests/NestedUpcall/Triangle_Test/server_B.cpp | 35 | ||||
| -rw-r--r-- | tests/NestedUpcall/Triangle_Test/server_B.h | 66 |
15 files changed, 307 insertions, 467 deletions
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 */ |