Repo restructuring

10 files changed, 0 insertions, 834 deletions

diff --git a/TAO/tests/Muxed_GIOP_Versions/.cvsignore b/TAO/tests/Muxed_GIOP_Versions/.cvsignore
deleted file mode 100644
index f2ad85300eb..00000000000
--- a/TAO/tests/Muxed_GIOP_Versions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-client
-server
diff --git a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
deleted file mode 100644
index bfb96e8b536..00000000000
--- a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
+++ /dev/null
@@ -1,18 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver {
-  Source_Files {
-    test_i.cpp
-    server.cpp
-  }
-}
-
-project(*Client): taoclient, anytypecode {
-  after += *Server
-  Source_Files {
-    testC.cpp
-    client.cpp
-  }
-}
-
diff --git a/TAO/tests/Muxed_GIOP_Versions/README b/TAO/tests/Muxed_GIOP_Versions/README
deleted file mode 100644
index 195cc3067c3..00000000000
--- a/TAO/tests/Muxed_GIOP_Versions/README
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
-
-@page Muxed_GIOP_Versions Test README File
-      This is stress test to make sure that TAO doesnt share the GIOP
-parsers between threads processing different GIOP versions.
-
-
-	To run the test use the run_test.pl script:
-
-$ ./run_test.pl
-
-	the script returns 0 if the test was successful.
-
-*/
-
diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp
deleted file mode 100644
index 6a9cb60d163..00000000000
--- a/TAO/tests/Muxed_GIOP_Versions/client.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-// $Id$
-
-#include "testC.h"
-#include "tao/debug.h"
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-
-ACE_RCSID(MT_Client, client, "client.cpp,v 1.16 2002/01/29 20:21:08 okellogg Exp")
-
-const char *ior = "file://test.ior";
-const char *corbaloc_arg = "corbaloc:iiop:1.0@localhost:12000/ObjectName";
-int nthreads = 5;
-int niterations = 5;
-int server_shutdown = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "l:k:n:i:x");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-      case 'l':
-        corbaloc_arg = 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);
-
-      // While those threads are busy sending 1.2 messages
-      // send some corba loc requests, don't really care if there is an
-      // object there to find
-      if (!server_shutdown)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "starting string_to_object %s \n",
-                      corbaloc_arg));
-
-          for (int c = 0; c < (niterations * 2); c++)
-            {
-              ACE_TRY_EX (CORBALOC)
-                {
-                  CORBA::Object_var probably_not_exist =
-                    orb->string_to_object(corbaloc_arg
-                                          ACE_ENV_ARG_PARAMETER);
-
-                  ACE_TRY_CHECK_EX (CORBALOC);
-
-                  if (CORBA::is_nil(probably_not_exist.in()))
-                    {
-                      ACE_DEBUG ((LM_DEBUG, "not found\n", corbaloc_arg));
-                    }
-                  else
-                    {
-                      Simple_Server_var newserver =
-                        Simple_Server::_narrow (probably_not_exist.in ()
-                                                ACE_ENV_ARG_PARAMETER);
-                      ACE_TRY_CHECK_EX (CORBALOC);
-
-                      // should throw an exception
-                      if (CORBA::is_nil(newserver.in()))
-                        {
-                          ACE_DEBUG ((LM_DEBUG, "not found it\n", corbaloc_arg));
-                        }
-                      else
-                        {
-                          ACE_DEBUG ((LM_DEBUG, "found it\n", corbaloc_arg));
-                        }
-                    }
-                }
-              ACE_CATCHANY
-                {
-                  // ACE_DEBUG ((LM_DEBUG, "caught exception\n", corbaloc_arg));
-                }
-              ACE_ENDTRY;
-            }
-        }
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) waiting for threads\n"));
-
-      client.thr_mgr ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) 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 (j ACE_ENV_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 (i ACE_ENV_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/Muxed_GIOP_Versions/run_test.pl b/TAO/tests/Muxed_GIOP_Versions/run_test.pl
deleted file mode 100755
index 21ba72cf028..00000000000
--- a/TAO/tests/Muxed_GIOP_Versions/run_test.pl
+++ /dev/null
@@ -1,124 +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;
-$iorfile = PerlACE::LocalFile ("test.ior");
-
-$TARGETHOSTNAME = "localhost";
-$orb_port=12000 + PerlACE::uniqueid ();
-$logfile = PerlACE::LocalFile("orb.$orb_port.log");
-unlink $iorfile;
-unlink $logfile;
-
-
-# Testing Options:
-# most effective is $serveriterations=1000 (with or without clients)
-$verbose = 1;
-$serverthreads = '10';
-$selfabusethreads = '5';
-$clientthreads = '5';
-$serveriterations = 1000;
-$clientiterations = 1000;
-$clients = 1;
-
-# use GIOP 1.0
-$corbaloc_str = "corbaloc:iiop:1.0\@$TARGETHOSTNAME:$orb_port/SomeObjectNameThatDontExist";
-
-
-# ORBDebugLevel 10 seems to encourage the problem
-# -ORBCollocation no  is required for server to produce the problem
-$serverargs = "-ORBCollocation no -ORBdebuglevel 10 -ORBLogFile $logfile " .
-              "-ORBEndpoint iiop://$TARGETHOSTNAME:$orb_port -o $iorfile " .
-              "-i $serveriterations -n $serverthreads -c $selfabusethreads " .
-              "-l $corbaloc_str";
-
-$SV = new PerlACE::Process ("server", $serverargs);
-
-$clientargs = "-ORBdebuglevel 10 -ORBLogFile $logfile -l $corbaloc_str -k file://$iorfile -n $clientthreads -i $clientiterations";
-
-$CL1 = new PerlACE::Process ("client", $clientargs);
-$CL2 = new PerlACE::Process ("client", $clientargs);
-$CL3 = new PerlACE::Process ("client", $clientargs);
-$CLS = new PerlACE::Process ("client", "-l $corbaloc_str -k file://$iorfile -i 1 -x ");
-
-
-#print STDERR $SV->CommandLine(), "\n" if $verbose;
-
-print STDERR "***** Start the server*** \n" if $verbose;
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 50) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-# leave server reap some self abuse before clients start abusing it
-if ($serveriterations > 20) {
-  $server = $SV->TimedWait(10);
-}
-
-print STDERR "****** Start the clients*** \n" if $verbose;
-if ($clients > 0) {
-  print STDERR $CL1->CommandLine(), "\n" if $verbose;
-  $CL1->Spawn ();
-}
-if ($clients > 1) { $CL2->Spawn (); }
-if ($clients > 2) { $CL3->Spawn (); }
-
-
-if ($clients > 0) {
-  $client = $CL1->WaitKill (210);
-
-  if ($client != 0) {
-    print STDERR "ERROR: client 1 returned $client\n";
-    $status = 1;
-  }
-}
-
-if ($clients > 1) {
-  $client = $CL2->WaitKill (5);
-
-  if ($client != 0) {
-    print STDERR "ERROR: client 2 returned $client\n";
-    $status = 1;
-  }
-}
-
-if ($clients > 2) {
-  $client = $CL3->WaitKill (5);
-
-  if ($client != 0) {
-    print STDERR "ERROR: client 3 returned $client\n";
-    $status = 1;
-}
-
-}
-
-$client = $CLS->SpawnWaitKill (15);
-
-if ($client != 0) {
-    print STDERR "ERROR: client 4 returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (150);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-unlink $logfile;
-
-exit $status;
-
diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp
deleted file mode 100644
index e911f5aa83c..00000000000
--- a/TAO/tests/Muxed_GIOP_Versions/server.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-#include "ace/Synch_T.h"
-
-ACE_RCSID(MT_Server, server, "server.cpp,v 1.7 2002/01/29 20:21:08 okellogg Exp")
-
-const char *ior_output_file = 0;
-const char *corbaloc_arg = "corbaloc:iiop:1.0@localhost:12000/ObjectName";
-int niterations = 5;
-
-int nthreads = 4;
-int nclient_threads = nthreads;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "c:l:i:o:n:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'c':
-        nclient_threads = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case 'l':
-        corbaloc_arg = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case 'n':
-        nthreads = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-c <# client threads> "
-                           "-i <# iterations> "
-                           "-l <corba loc> "
-                           "-n <# server threads> "
-                           "-o <iorfile> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-/*****************************************************/
-
-class Worker : public ACE_Task_Base
-{
-  // = TITLE
-  //   Run a server thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run server threads
-  //
-public:
-  /// ctor
-  Worker (CORBA::ORB_ptr orb);
-
-  /// The thread entry point.
-  virtual int svc (void);
-
-private:
-
-  /// The orb
-  CORBA::ORB_var orb_;
-};
-
-/*****************************************************/
-
-class SelfClient : public ACE_Task_Base
-{
-  // = TITLE
-  //   Run the client thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run the client threads.
-  //
-public:
-  SelfClient (CORBA::ORB_ptr orb, Simple_Server_ptr server, int niterations);
-  // ctor
-
-  virtual int svc (void);
-  // The thread entry point.
-
-private:
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
-  // Validate the connection
-
-private:
-
-  /// The server.
-  Simple_Server_var server_;
-
-  CORBA::ORB_var orb_;
-
-  /// The number of iterations on each client thread.
-  int niterations_;
-
-
-  ACE_SYNCH_MUTEX mutex_;
-};
-
-/***************************************************/
-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 = 0;
-      ACE_NEW_RETURN (server_impl,
-                      Simple_Server_i (orb.in ()),
-                      -1);
-
-      PortableServer::ServantBase_var owner_transfer(server_impl);
-
-      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,
-                               "(%P|%t) 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;
-
-      Worker worker (orb.in ());
-      if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
-                           nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) Cannot activate client threads\n"),
-                          1);
-
-      SelfClient selfabuse (orb.in(), server.in(), niterations);
-      if (selfabuse.activate (THR_NEW_LWP | THR_JOINABLE,
-                              nclient_threads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) Cannot activate abusive threads\n"),
-                          1);
-
-      selfabuse.thr_mgr()->wait();
-
-      worker.thr_mgr ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) event loop finished\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-// ****************************************************************
-
-Worker::Worker (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-int
-Worker::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      ACE_Time_Value tv (140, 0);
-      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// ****************************************************************
-
-SelfClient::SelfClient (CORBA::ORB_ptr orb, Simple_Server_ptr server,
-                int niterations)
-  :  server_ (Simple_Server::_duplicate (server)),
-         orb_ (CORBA::ORB::_duplicate (orb)),
-     niterations_ (niterations)
-{
-}
-
-void
-SelfClient::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!
-  ACE_GUARD (ACE_SYNCH_MUTEX, guard, mutex_);
-
-  for (int j = 0; j != 100; ++j)
-    {
-      ACE_TRY
-        {
-          this->server_->test_method (j ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY {} ACE_ENDTRY;
-    }
-}
-
-int
-SelfClient::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)
-        {
-          ACE_TRY_EX (CORBALOC)
-            {
-              CORBA::Object_var probably_not_exist =
-                orb_->string_to_object (corbaloc_arg
-                                        ACE_ENV_ARG_PARAMETER);
-
-              ACE_TRY_CHECK_EX (CORBALOC);
-
-              if (CORBA::is_nil (probably_not_exist.in()))
-                {
-                  ACE_DEBUG ((LM_DEBUG, "not found\n", corbaloc_arg));
-                }
-              else
-                {
-                  Simple_Server_var newserver =
-                    Simple_Server::_narrow (probably_not_exist.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (CORBALOC);
-
-                  // should throw an exception
-                  if (CORBA::is_nil (newserver.in()))
-                    {
-                      ACE_DEBUG ((LM_DEBUG,
-                                  "(%P|%t)  Not found it \n"));
-
-                    }
-                  else
-                    {
-                      ACE_DEBUG ((LM_DEBUG,
-                                  "(%P|%t) Found it \n"));
-                    }
-                }
-
-            }
-          ACE_CATCHANY
-            {
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                   "MT_SelfClient: exception raised");
-            }
-          ACE_ENDTRY;
-
-          // Just make a call
-          this->server_->test_method (i ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "MT_SelfClient: exception raised");
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/Muxed_GIOP_Versions/test.idl b/TAO/tests/Muxed_GIOP_Versions/test.idl
deleted file mode 100644
index aa227c3b110..00000000000
--- a/TAO/tests/Muxed_GIOP_Versions/test.idl
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// $Id$
-//
-
-interface Simple_Server
-{
-  long test_method (in long x);
-
-  oneway void shutdown ();
-};
diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
deleted file mode 100644
index 07e359a2f52..00000000000
--- a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-#include "tao/debug.h"
-
-#if !defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/OS_NS_unistd.h"
-
-ACE_RCSID(MT_Server, test_i, "test_i.cpp,v 1.6 2002/01/29 20:21:08 okellogg Exp")
-
-CORBA::Long
-Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "Request in thread %t\n"));
-  ACE_Time_Value tv (0, (x % 1000));
-  ACE_OS::sleep (tv);
-  return x;
-}
-
-void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // We dont shutdown the ORB. We allow the server to go away as it
-  // wants.
-  // this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.h b/TAO/tests/Muxed_GIOP_Versions/test_i.h
deleted file mode 100644
index 65fa40ed8b2..00000000000
--- a/TAO/tests/Muxed_GIOP_Versions/test_i.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/MT_Server
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
-
-#ifndef TAO_MT_SERVER_TEST_I_H
-#define TAO_MT_SERVER_TEST_I_H
-
-#include "testS.h"
-
-class Simple_Server_i : 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.
-  CORBA::Long test_method (CORBA::Long x ACE_ENV_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_;
-  // The ORB
-};
-
-#if defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_MT_SERVER_TEST_I_H */
diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.i b/TAO/tests/Muxed_GIOP_Versions/test_i.i
deleted file mode 100644
index 97524552ff4..00000000000
--- a/TAO/tests/Muxed_GIOP_Versions/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))
-{
-}