diff options
Diffstat (limited to 'tests/POA')
123 files changed, 1253 insertions, 4208 deletions
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" |