summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/FaultTolerance/IOGR
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/FaultTolerance/IOGR')
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h45
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc31
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am150
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp404
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h66
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/README20
-rwxr-xr-xTAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl61
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp106
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml7
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/test.idl9
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp38
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h47
12 files changed, 0 insertions, 984 deletions
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
deleted file mode 100644
index 110808818f7..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-// test
-//
-// = FILENAME
-// Client_i.h
-//
-// = DESCRIPTION
-// A helper class for the client
-//
-// = AUTHOR
-// Bala Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TEST_FT_IOGR_CLIENT_I_H
-#define TEST_FT_IOGR_CLIENT_I_H
-
-#include /**/ "ace/pre.h"
-#include "tao/ORB.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class Client_i
-{
-public:
- Client_i (CORBA::ORB_ptr orb);
- // Our constructor
-
- void init (ACE_ENV_SINGLE_ARG_DECL);
- // Initialize the ORB etc.
-
-private:
- CORBA::ORB_var orb_;
-
-};
-
-#include /**/ "ace/post.h"
-#endif /*TEST_FT_IOGR_CLIENT_I_H*/
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc b/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc
deleted file mode 100644
index bdc5ba72437..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/FaultTolerance_IOGR.mpc
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*idl): taoidldefaults {
- IDL_Files {
- test.idl
- }
- custom_only = 1
-}
-
-project(*server): portableserver, orbsvcsexe, iormanip, ftorb, messaging {
- after += *idl
- Source_Files {
- test_i.cpp
- testS.cpp
- testC.cpp
- server.cpp
- }
- IDL_Files {
- }
-}
-
-project(*Manager): portableserver, orbsvcsexe, iormanip, ftorb {
- after += *idl
- Source_Files {
- testC.cpp
- Manager.cpp
- }
- IDL_Files {
- }
-}
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
deleted file mode 100644
index 27be663173a..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
+++ /dev/null
@@ -1,150 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.FaultTolerance_IOGR_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.FaultTolerance_IOGR_Manager.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-if !BUILD_MINIMUM_CORBA
-
-noinst_PROGRAMS += Manager
-
-Manager_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR) \
- -I$(TAO_ROOT)/orbsvcs \
- -I$(TAO_BUILDDIR)/orbsvcs
-
-Manager_SOURCES = \
- Manager.cpp \
- testC.cpp \
- Manager.h
-
-Manager_LDADD = \
- $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
- $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
- $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
- $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
- $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.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)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
- $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.FaultTolerance_IOGR_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-if !BUILD_MINIMUM_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR) \
- -I$(TAO_ROOT)/orbsvcs \
- -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
- server.cpp \
- testC.cpp \
- testS.cpp \
- test_i.cpp \
- test_i.h
-
-server_LDADD = \
- $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
- $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
- $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
- $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
- $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.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)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
- $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
deleted file mode 100644
index 543da3eff4f..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ /dev/null
@@ -1,404 +0,0 @@
-//$Id$
-#include "Manager.h"
-#include "Client_i.h"
-#include "testC.h"
-#include "ace/Get_Opt.h"
-#include "ace/Read_Buffer.h"
-#include "tao/IORManipulation/IORManip_Loader.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/OS_NS_fcntl.h"
-
-// Files which have the IOR
-const char *first_ior = 0;
-const char *second_ior = 0;
-const char *ior_output_file = 0;
-
-// Objects
-CORBA::Object_var object_primary = 0;
-CORBA::Object_var object_secondary = 0;
-
-// Reference to the IOR manipulator
-TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
- ACE_Get_Opt get_opts (argc, argv, "a:b:c:");
- int c;
-
- while ((c = get_opts ()) != -1)
- switch (c)
- {
- case 'a':
- first_ior = get_opts.opt_arg ();
- break;
- case 'b':
- second_ior = get_opts.opt_arg ();
- break;
- case 'c':
- ior_output_file = get_opts.opt_arg ();
- break;
- case '?':
- default:
- ACE_ERROR_RETURN ((LM_ERROR,
- "usage: %s "
- "-a <iorfile>"
- "-b <iorfile>"
- "-c <output ior file>"
- "\n",
- argv [0]),
- -1);
- }
- // Indicates sucessful parsing of the command line
- return 0;
-}
-
-
-int
-main (int argc,
- char *argv[])
-{
- ACE_DECLARE_NEW_CORBA_ENV;
-
- Manager manager;
-
- ACE_TRY
- {
- // Initilaize the ORB, POA etc.
- manager.init (argc,
- argv
- ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- // the command line arguments
- if (parse_args (argc, argv) == -1)
- return -1;
-
- // Merge the different IORS
- manager.make_merged_iors (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- // Set properties. This is the most important portion of the
- // test
- manager.set_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- // Write IOR to file
- manager.write_to_file ();
-
- // Client, who is going to use the merged IOR
- // Construct that with the managers ORB
- Client_i client_imp (manager.orb ());
- client_imp.init (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- }
- ACE_CATCHANY
- {
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- "Caught");
- return -1;
- }
- ACE_ENDTRY;
-
- return 0;
-}
-
-Manager::Manager (void)
- :orb_ (0),
- merged_set_ (0)
-{
- //no-op
-}
-
-void
-Manager::init (int argc,
- char *argv[]
- ACE_ENV_ARG_DECL)
-{
- this->orb_ = CORBA::ORB_init (argc,
- argv,
- 0
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
-
- // Obtain the RootPOA.
- CORBA::Object_var obj_var =
- this->orb_->resolve_initial_references ("RootPOA"
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
-
- // Get the POA_var object from Object_var.
- PortableServer::POA_var root_poa_var =
- PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
-
- // Get the POAManager of the RootPOA.
- PortableServer::POAManager_var poa_manager_var =
- root_poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-
- poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_CHECK;
-}
-
-int
-Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
-{
- // First server
- object_primary =
- this->orb_->string_to_object (first_ior
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
-
- //Second server
- object_secondary =
- this->orb_->string_to_object (second_ior
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
-
- // Get an object reference for the ORBs IORManipultion object!
- CORBA::Object_var IORM =
- this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
- 0
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
-
- iorm =
- TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
-
-
- // Create the list
- TAO_IOP::TAO_IOR_Manipulation::IORList iors (2);
- iors.length(2);
- iors [0] = CORBA::Object::_duplicate (object_primary.in ());
- iors [1] = CORBA::Object::_duplicate (object_secondary.in ());
-
- // Create a merged set 1;
- merged_set_ =
- iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
-
- return 0;
-}
-
-int
-Manager::set_properties (ACE_ENV_SINGLE_ARG_DECL)
-{
- FT::TagFTGroupTaggedComponent ft_tag_component;
-
- // Property values
-
- // Major and Minor revision numbers
- ft_tag_component.component_version.major = (CORBA::Octet) 1;
- ft_tag_component.component_version.minor = (CORBA::Octet) 0;
-
- // Domain id
- const char *id = "iogr_testing";
- ft_tag_component.group_domain_id = id;
-
- // Object group id
- ft_tag_component.object_group_id =
- (CORBA::ULongLong) 10;
-
- // Version
- ft_tag_component.object_group_ref_version =
- (CORBA::ULong) 5;
-
- // Construct the IOGR Property class
- TAO_FT_IOGR_Property iogr_prop (ft_tag_component);
-
- // Set the property
- CORBA::Boolean retval = iorm->set_property (&iogr_prop,
- this->merged_set_.in ()
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
-
- // Set the primary
- // See we are setting the second ior as the primary
- if (retval != 0)
- {
- retval = iorm->set_primary (&iogr_prop,
- object_secondary.in (),
- this->merged_set_.in ()
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (-1);
- }
-
- return 0;
-}
-
-int
-Manager::run (ACE_ENV_SINGLE_ARG_DECL)
-{
- ACE_TRY
- {
- this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- }
- ACE_CATCHANY
- {
- ACE_ERROR_RETURN ((LM_DEBUG,
- "Error in run \n"),
- -1);
- }
- ACE_ENDTRY;
-
- return 0;
-}
-
-int
-Manager::write_to_file (void)
-{
- //
- CORBA::String_var iorref =
- this->orb_->object_to_string (this->merged_set_.in ());
-
- if (ior_output_file != 0)
- {
- FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
- if (output_file == 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "Cannot open output file for writing IOR: %s",
- ior_output_file),
- 1);
- ACE_OS::fprintf (output_file, "%s", iorref.in ());
- ACE_OS::fclose (output_file);
- }
-
- return 0;
-}
-
-CORBA::ORB_ptr
-Manager::orb (void)
-{
- return this->orb_.in ();
-}
-
-Client_i::Client_i (CORBA::ORB_ptr orb)
- :orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-void
-run_test (Simple_Server_ptr server
- ACE_ENV_ARG_DECL);
-
-void
-Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
-{
- // Open the file for reading.
- ACE_HANDLE f_handle = ACE_OS::open (ior_output_file,
- 0);
-
- if (f_handle == ACE_INVALID_HANDLE)
- ACE_ERROR ((LM_ERROR,
- "Unable to open %s for writing: %p\n",
- ior_output_file));
-
- ACE_Read_Buffer ior_buffer (f_handle);
-
- char *data = ior_buffer.read ();
-
- if (data == 0)
- ACE_ERROR ((LM_ERROR,
- "Unable to read ior: %p\n"));
-
-
- int argc = 0;
- char **argv = 0;
- this->orb_ = CORBA::ORB_init (argc,
- argv,
- 0
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
-
- CORBA::Object_var object =
- this->orb_->string_to_object (data
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
-
- // Combined IOR stuff
- Simple_Server_var server =
- Simple_Server::_narrow (object.in ()
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
-
- if (CORBA::is_nil (server.in ()))
- {
- ACE_ERROR ((LM_ERROR,
- "Object reference <%s> is nil\n",
- data));
- }
-
- run_test (server.in ()
- ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
-
- ior_buffer.alloc ()->free (data);
- ACE_OS::close (f_handle);
-}
-
-
-void run_test (Simple_Server_ptr server
- ACE_ENV_ARG_DECL)
-{
- // We do this twice as we know that there are only two servers.
- for (CORBA::ULong i = 0;
- i < 2;
- i++)
- {
- ACE_TRY
- {
- for (CORBA::ULong j = 0;
- j < 10;
- j++)
- {
- // Make a remote call
- server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- }
-
- ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT ("*********************************\n")));
- ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT ("I am going to shutdown the server\n")));
- server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
- ACE_OS::sleep (2);
- }
- ACE_CATCH (CORBA::TRANSIENT, t)
- {
- if (t.completed () != CORBA::COMPLETED_NO)
- {
- ACE_PRINT_EXCEPTION (t, "Unexpected kind of TRANSIENT");
- }
- else
- {
- ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT ("The completed status %d\n"), t.completed ()));
- ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT ("Automagically re-issuing request on TRANSIENT\n")));
- ACE_OS::sleep (1);
- }
- }
- ACE_CATCH (CORBA::COMM_FAILURE, f)
- {
- ACE_PRINT_EXCEPTION (f, "A (sort of) expected COMM_FAILURE");
- ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT ("Automagically re-issuing request on COMM_FAILURE\n")));
- }
- ACE_CATCHANY
- {
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- "Unexpected exception");
- ACE_RE_THROW;
- }
- ACE_ENDTRY;
- ACE_CHECK;
- }
-}
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
deleted file mode 100644
index 6bdc3e7cf1c..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//$Id$
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-// test
-//
-// = FILENAME
-// Manager.h
-//
-// = DESCRIPTION
-// A manager class that merger IORS and designates primary
-//
-// = AUTHOR
-// Bala Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
-#ifndef TEST_FT_IOGR_MANAGER_H
-#define TEST_FT_IOGR_MANAGER_H
-
-#include "tao/ORB.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Object.h"
-
-class Manager
-{
-public:
-
- Manager (void);
- // Ctor
-
- void init (int argc,
- char *argv[]
- ACE_ENV_ARG_DECL);
-
- // Initialize the ORB, POA etc.
-
- int make_merged_iors (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
- // Merges the different IORS
-
- int set_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
- // Sets the properties for the profiles
-
- int run (ACE_ENV_SINGLE_ARG_DECL);
- // Run the ORB event loop..
-
- int write_to_file (void);
- // Write the merged IOR to a file
-
- CORBA::ORB_ptr orb (void);
- // Return the pointer to the copy of our ORB
-private:
- CORBA::ORB_var orb_;
- // Our ORB
-
- CORBA::Object_var merged_set_;
- // The merged IOR set
-};
-
-#endif /*TEST_FT_IOGR_MANAGER_H */
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/README b/TAO/orbsvcs/tests/FaultTolerance/IOGR/README
deleted file mode 100644
index 5c209a35df4..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/README
+++ /dev/null
@@ -1,20 +0,0 @@
-This program tests the basic FT IOGR implementation. The aim is to set
-a primary server and see whether the client gives preference to
-contact a primary for its first invocation. When the primary is killed
-it contacts the secondary for next invocation.
-
-Two copies of the server are started. A manager is then to merge these
-two iors and designate the second as primary. The merged IOR is then
-written to another file. This merged IOR is then used to make
-invocations on the server.
-
-
-Run the application as follows:
-
-$./server -o <file1.ior>
-$./server -o <file2.ior>
-$./Manager -a file://<file1.ior> -b file://<file2.ior> -c <output.ior>
-
-Due to teh transparent reinvocation functaionality for FT CORBA, the
-application would switch to the new profile without throwing an
-exception to the application. \ No newline at end of file
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl b/TAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl
deleted file mode 100755
index c45335861ed..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/run_test.pl
+++ /dev/null
@@ -1,61 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
- & eval 'exec perl -S $0 $argv:q'
- if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-
-$file1ior = PerlACE::LocalFile ("file1.ior");
-$file2ior = PerlACE::LocalFile ("file2.ior");
-$outputior = PerlACE::LocalFile ("output.ior");
-
-unlink $file1ior, $file2ior, $outputior;
-
-$SERV1 = new PerlACE::Process ("server", "-o $file1ior");
-$SERV2 = new PerlACE::Process ("server", "-o $file2ior");
-$MANAGER = new PerlACE::Process ("Manager", "-a file://$file1ior -b file://$file2ior -c $outputior");
-
-print STDERR "Starting Server\n";
-
-$SERV1->Spawn ();
-
-if (PerlACE::waitforfile_timed ($file1ior, 20) == -1) {
- print STDERR "ERROR: cannot find file <$file1ior>\n";
- $SERV1->Kill ();
- exit 1;
-}
-
-print STDERR "Starting Server\n";
-
-$SERV2->Spawn ();
-
-if (PerlACE::waitforfile_timed ($file2ior, 20) == -1) {
- print STDERR "ERROR: cannot find file <$file2ior>\n";
- $SERV1->Kill ();
- $SERV2->Kill ();
- exit 1;
-}
-
-print STDERR "Starting Manager\n";
-
-$MANAGER->Spawn ();
-
-$manager = $MANAGER->WaitKill (30);
-
-$SERV1->WaitKill(5);
-
-$SERV2->WaitKill(5);
-
-if ($manager != 0) {
- print STDERR "ERROR: Manager returned $manager\n";
- $status = 1;
-}
-
-unlink $file1ior, $file2ior, $outputior;
-
-exit $status
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
deleted file mode 100644
index ade1a560f4d..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-const char *ior_output_file = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
- ACE_Get_Opt get_opts (argc, argv, "o:");
- int c;
-
- while ((c = get_opts ()) != -1)
- switch (c)
- {
- case 'o':
- ior_output_file = get_opts.opt_arg ();
- break;
-
- case '?':
- default:
- ACE_ERROR_RETURN ((LM_ERROR,
- "usage: %s "
- "-o <iorfile>"
- "\n",
- argv [0]),
- -1);
- }
- // Indicates sucessful parsing of the command line
- return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-
-
- ACE_DECLARE_NEW_CORBA_ENV;
- ACE_TRY
- {
- CORBA::ORB_var orb =
- CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- // We do the command line parsing first
- if (parse_args (argc, argv) != 0)
- return 1;
- CORBA::Object_var poa_object =
- orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- if (CORBA::is_nil (poa_object.in ()))
- ACE_ERROR_RETURN ((LM_ERROR,
- " (%P|%t) Unable to initialize the POA.\n"),
- 1);
-
- PortableServer::POA_var root_poa =
- PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- PortableServer::POAManager_var poa_manager =
- root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- // Instantiate the LCD_Display implementation class
- Simple_Server_i display_impl (orb.in ());
-
- Simple_Server_var server =
- display_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- CORBA::String_var ior =
- orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
-
- // If the ior_output_file exists, output the ior to it
- if (ior_output_file != 0)
- {
- FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
- if (output_file == 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "Cannot open output file for writing IOR: %s",
- ior_output_file),
- 1);
- ACE_OS::fprintf (output_file, "%s", ior.in ());
- ACE_OS::fclose (output_file);
- }
-
- poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- orb->run ();
-
- }
- ACE_CATCHANY
- {
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
- "Caught exception:");
- return 1;
- }
- ACE_ENDTRY;
- return 0;
-}
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml b/TAO/orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml
deleted file mode 100644
index b26c9398b5b..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./orbsvcs/tests/FaultTolerance/IOGR/svc.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <dynamic id="FT_ClientService_Activate" type="Service_Object">
- <initializer path="TAO_FT_ClientORB" init="_make_TAO_FT_ClientService_Activate"/>
- </dynamic>
-</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test.idl b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test.idl
deleted file mode 100644
index c3e5912526d..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test.idl
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * $Id$
- */
-
-interface Simple_Server
-{
- void remote_call ();
- oneway void shutdown ();
-};
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
deleted file mode 100644
index 9813825c275..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-
-#if !defined(__ACE_INLINE__)
-//#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(MT_Client, test_i, "$Id$")
-
-Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
- : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Simple_Server_i::Simple_Server_i (void)
- : orb_ (0)
-{
- // no-op
-}
-
-void
-Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
- ACE_THROW_SPEC ((CORBA::SystemException))
-{
- ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT ("Print out from process id (%P) hosting the servant \n")));
-
- return;
-}
-
-
-void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
- ACE_THROW_SPEC ((CORBA::SystemException))
-{
- this->orb_->shutdown (0);
-}
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
deleted file mode 100644
index f7944307d55..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-// TAO/orbsvcs/tests/FaultTolerance/IOGR
-//
-// = FILENAME
-// test_i.h
-//
-// = AUTHOR
-// Bala Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_FT_IOGR_TEST_I_H
-#define TAO_FT_IOGR_TEST_I_H
-
-#include "testS.h"
-
-class Simple_Server_i : public POA_Simple_Server
-{
- // = TITLE
- // Simpler Server implementation
- //
- // = DESCRIPTION
- // Implements the Simple_Server interface in test.idl
- //
-public:
- Simple_Server_i (CORBA::ORB_ptr orb);
- // ctor
-
- Simple_Server_i (void);
- // ctor
-
- // = The Simple_Server methods.
- void remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
- ACE_THROW_SPEC ((CORBA::SystemException));
-
- void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
- ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
- CORBA::ORB_var orb_;
-};
-
-#endif /* TAO_FT_IOGR_TEST_I_H */