Repo restructuring

17 files changed, 0 insertions, 709 deletions

diff --git a/TAO/tests/MT_Client/.cvsignore b/TAO/tests/MT_Client/.cvsignore
deleted file mode 100644
index f2ad85300eb..00000000000
--- a/TAO/tests/MT_Client/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-client
-server
diff --git a/TAO/tests/MT_Client/MT_Client.mpc b/TAO/tests/MT_Client/MT_Client.mpc
deleted file mode 100644
index 1974ade69bd..00000000000
--- a/TAO/tests/MT_Client/MT_Client.mpc
+++ /dev/null
@@ -1,19 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver {
-  idlflags += -Sa -St
-  Source_Files {
-    test_i.cpp
-    server.cpp
-  }
-}
-
-project(*Client): taoclient {
-  after += *Server
-  Source_Files {
-    testC.cpp
-    client.cpp
-  }
-}
-
diff --git a/TAO/tests/MT_Client/README b/TAO/tests/MT_Client/README
deleted file mode 100644
index 64e499a3524..00000000000
--- a/TAO/tests/MT_Client/README
+++ /dev/null
@@ -1,18 +0,0 @@
-
-# $Id$
-
-Description:
-
-	This is a simple test for multi-threaded clients; it just
-creates a simple server process and runs a client with multiple thread 
-sharing the same object reference.
-
-Expected output:
-	The server prints out the IOR of the object it serves. The
-client shouldn't print out anything, it returns 0 on success.
-
-How to run:
-	You can use the run_test.pl script to run it or:
-
-$ server -o test.ior
-$ client -k file://test.ior -n 4 -i 1000
diff --git a/TAO/tests/MT_Client/client.conf b/TAO/tests/MT_Client/client.conf
deleted file mode 100644
index 73d9e3ccee4..00000000000
--- a/TAO/tests/MT_Client/client.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-
-static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
diff --git a/TAO/tests/MT_Client/client.conf.xml b/TAO/tests/MT_Client/client.conf.xml
deleted file mode 100644
index df1fe9c2c4d..00000000000
--- a/TAO/tests/MT_Client/client.conf.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./tests/MT_Client/client.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <static id="Client_Strategy_Factory" params="-ORBClientConnectionHandler RW"/>
-</ACE_Svc_Conf>
diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp
deleted file mode 100644
index aaab6575632..00000000000
--- a/TAO/tests/MT_Client/client.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-// $Id$
-
-#include "testC.h"
-#include "tao/debug.h"
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-
-ACE_RCSID(MT_Client, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int nthreads = 5;
-int niterations = 5;
-int server_shutdown = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:n:i:x");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-      case 'n':
-        nthreads = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      case 'x':
-        server_shutdown = 1;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-n <nthreads> "
-                           "-i <niterations> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-class Client : public ACE_Task_Base
-{
-  // = TITLE
-  //   Run the client thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run the client threads.
-  //
-public:
-  Client (Simple_Server_ptr server, int niterations);
-  // ctor
-
-  virtual int svc (void);
-  // The thread entry point.
-
-private:
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
-  // Validate the connection
-
-private:
-  Simple_Server_var server_;
-  // The server.
-
-  int niterations_;
-  // The number of iterations on each client thread.
-};
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Object reference <%s> is nil\n",
-                             ior),
-                            1);
-        }
-
-      Client client (server.in (), niterations);
-      if (client.activate (THR_NEW_LWP | THR_JOINABLE,
-                           nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot activate client threads\n"),
-                          1);
-
-      client.thr_mgr ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
-
-      if (server_shutdown)
-        {
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-// ****************************************************************
-
-Client::Client (Simple_Server_ptr server,
-                int niterations)
-  :  server_ (Simple_Server::_duplicate (server)),
-     niterations_ (niterations)
-{
-}
-
-void
-Client::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Ping the object 100 times, ignoring all exceptions.
-  // It would be better to use validate_connection() but the test must
-  // run on minimum CORBA builds too!
-  for (int j = 0; j != 100; ++j)
-    {
-      ACE_TRY
-        {
-          this->server_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY {} ACE_ENDTRY;
-    }
-}
-
-int
-Client::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      for (int i = 0; i < this->niterations_; ++i)
-        {
-          this->server_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (TAO_debug_level > 0 && i % 100 == 0)
-            ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n",
-                        i));
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "MT_Client: exception raised");
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/MT_Client/client_muxed.conf b/TAO/tests/MT_Client/client_muxed.conf
deleted file mode 100644
index 05145bd0896..00000000000
--- a/TAO/tests/MT_Client/client_muxed.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler MT  -ORBTransportMuxStrategy MUXED"
diff --git a/TAO/tests/MT_Client/client_muxed.conf.xml b/TAO/tests/MT_Client/client_muxed.conf.xml
deleted file mode 100644
index ba4727350fc..00000000000
--- a/TAO/tests/MT_Client/client_muxed.conf.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./tests/MT_Client/client_muxed.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <static id="Client_Strategy_Factory" params="-ORBProfileLock null -ORBClientConnectionHandler MT  -ORBTransportMuxStrategy MUXED"/>
-</ACE_Svc_Conf>
diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp
deleted file mode 100644
index 6a6f1db233d..00000000000
--- a/TAO/tests/MT_Client/orb_creation.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-// $Id$
-
-#include "testC.h"
-#include "tao/debug.h"
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-
-ACE_RCSID(MT_Client, orb_creation, "$Id$")
-
-const char *ior = "file://test.ior";
-int nthreads = 5;
-int niterations = 5;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:n:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-      case 'n':
-        nthreads = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-n <nthreads> "
-                           "-i <niterations> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-class Client : public ACE_Task_Base
-{
-  // = TITLE
-  //   Run the client thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run the client threads.
-  //
-public:
-  Client (int niterations,
-          const char* ior);
-  // ctor
-
-  virtual int svc (void);
-  // The thread entry point.
-
-private:
-  int niterations_;
-  // The number of iterations on each client thread.
-
-  const char* ior_;
-  // The IOR that we should use.
-};
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Object reference <%s> is nil\n",
-                             ior),
-                            1);
-        }
-
-      Client client (niterations, ior);
-      if (client.activate (THR_NEW_LWP | THR_JOINABLE,
-                           nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot activate client threads\n"),
-                          1);
-
-      client.thr_mgr ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
-
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-// ****************************************************************
-
-Client::Client (int niterations,
-                const char* ior)
-  :  niterations_ (niterations),
-     ior_ (ior)
-{
-}
-
-int
-Client::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      for (int i = 0; i < this->niterations_; ++i)
-        {
-          // If we are using a global ORB this is a nop, otherwise it
-          // initializes the ORB resources for this thread.
-          int argc = 0;
-          CORBA::String_var argv0 = CORBA::string_dup ("dummy_argv");
-          char* argv[1] = { argv0.inout () };
-          CORBA::ORB_var orb =
-            CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          CORBA::Object_var object =
-            orb->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          Simple_Server_var server =
-            Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (CORBA::is_nil (server.in ()))
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%P|%t) Object reference <%s> is nil\n",
-                                 ior),
-                                1);
-            }
-
-          server->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          if (TAO_debug_level > 0 && i % 100 == 0)
-            ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "MT_Client: exception raised");
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/MT_Client/run_test.pl b/TAO/tests/MT_Client/run_test.pl
deleted file mode 100755
index faf34e8312e..00000000000
--- a/TAO/tests/MT_Client/run_test.pl
+++ /dev/null
@@ -1,68 +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;
-
-$client_conf = PerlACE::LocalFile ("client.global$PerlACE::svcconf_ext");
-$server_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext");
-$client_process = "client";
-$debug_level = '0';
-$threads = '4';
-$status = 0;
-
-foreach $i (@ARGV) {
-    if ($i eq '-tss') {
-        $client_conf = PerlACE::LocalFile ("client.tss$PerlACE::svcconf_ext");
-    } elsif ($i eq '-debug') {
-        $debug_level = '1';
-    } elsif ($i eq '-creation') {
-        $client_process = 'orb_creation';
-    }
-}
-
-$iorfile = PerlACE::LocalFile ("server.ior");
-
-unlink $iorfile;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-ORBsvcconf server$PerlACE::svcconf_ext -ORBdebuglevel $debug_level -o server.ior");
-}
-else {
-    $SV = new PerlACE::Process ("server", "-ORBsvcconf $server_conf -ORBdebuglevel $debug_level -o $iorfile");
-}
-$CL = new PerlACE::Process ($client_process, 
-                            "-ORBdebuglevel $debug_level "
-                            . "-k file://$iorfile "
-                            . "-n $threads -i 1000 -x");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 30) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (240);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (30);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/tests/MT_Client/server.conf b/TAO/tests/MT_Client/server.conf
deleted file mode 100644
index faf9c6c874b..00000000000
--- a/TAO/tests/MT_Client/server.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-static Server_Strategy_Factory "-ORBconcurrency thread-per-connection"
diff --git a/TAO/tests/MT_Client/server.conf.xml b/TAO/tests/MT_Client/server.conf.xml
deleted file mode 100644
index d233dd6213f..00000000000
--- a/TAO/tests/MT_Client/server.conf.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./tests/MT_Client/server.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <!--  -->
- <static id="Server_Strategy_Factory" params="-ORBconcurrency thread-per-connection"/>
-</ACE_Svc_Conf>
diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp
deleted file mode 100644
index bf5e6312642..00000000000
--- a/TAO/tests/MT_Client/server.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "test_i.h"
-#include "ace/OS_NS_stdio.h"
-
-ACE_RCSID(MT_Client, server, "$Id$")
-
-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_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      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;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Simple_Server_i server_impl (orb.in ());
-
-      Simple_Server_var server =
-        server_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_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/MT_Client/test.idl b/TAO/tests/MT_Client/test.idl
deleted file mode 100644
index cbb8054de28..00000000000
--- a/TAO/tests/MT_Client/test.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * $Id$
- */
-
-/// A simple interface to test the ORB
-interface Simple_Server
-{
-  /// This method is a noop, and it is used just to exercise the
-  /// critical path
-  void test_method ();
-
-  /// Shutdown the server
-  /**
-   * Provide a simple way to cleanup the test when it finishes 
-   */
-  oneway void shutdown ();
-};
diff --git a/TAO/tests/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp
deleted file mode 100644
index 61e2bf25496..00000000000
--- a/TAO/tests/MT_Client/test_i.cpp
+++ /dev/null
@@ -1,22 +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$")
-
-void
-Simple_Server_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/tests/MT_Client/test_i.h b/TAO/tests/MT_Client/test_i.h
deleted file mode 100644
index 8e9f0794f76..00000000000
--- a/TAO/tests/MT_Client/test_i.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/MT_Client
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
-
-#ifndef TAO_MT_CLIENT_TEST_I_H
-#define TAO_MT_CLIENT_TEST_I_H
-
-#include "testS.h"
-
-class Simple_Server_i : 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
-
-  // = The Simple_Server methods.
-  void test_method (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_;
-};
-
-#if defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_MT_CLIENT_TEST_I_H */
diff --git a/TAO/tests/MT_Client/test_i.i b/TAO/tests/MT_Client/test_i.i
deleted file mode 100644
index 97524552ff4..00000000000
--- a/TAO/tests/MT_Client/test_i.i
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-ACE_INLINE
-Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb))
-{
-}