Repo restructuring

158 files changed, 0 insertions, 8667 deletions

diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am b/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am
deleted file mode 100644
index 2f02b708355..00000000000
--- a/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am
+++ /dev/null
@@ -1,118 +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.Secure_BiDir_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.Secure_BiDir_SSL_Client.am
-
-if !BUILD_MINIMUM_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.inl
-
-client_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_MINIMUM_CORBA
-
-## Makefile.Secure_BiDir_SSL_Server.am
-
-if !BUILD_MINIMUM_CORBA
-
-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 \
-  test_i.inl
-
-server_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_MINIMUM_CORBA
-
-## 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/Security/BiDirectional/README b/TAO/orbsvcs/tests/Security/BiDirectional/README
deleted file mode 100644
index 14e5d33aaf8..00000000000
--- a/TAO/orbsvcs/tests/Security/BiDirectional/README
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id$
-
-This is a test that exercises the birectional GIOP connection
-implementation in TAO over SSLIOP connection. 
-
-Basicaly, the test is a copy of the $TAO_ROOT/tests/BiDirectional with
-added support for SSLIOP
-
-Start the server like this
-
-$ server -ORBSvcConf server.conf -o <file.ior> -i <no_iterations>
-$ client -ORBSvcConf client.conf -k file://<file.ior> -x 
-
-Or, simply
-
-$ ./run_test.pl -ssl
-
-The server starts up writing the IOR to the file. The client then starts
-up, creates its own object and passes the reference to the server. Then
-it invokes a method on the server to indicate that it is ready for
-callback. The server then callsback the client on the same connection
-<no_iterations> times. If the server creates a new connection the server
-would crash itself.
-
-To determine that no new connections have been opened or used the test
-relies on the fact that TAO uses a transport cache. It can provide us
-iwith the number of currently cashed transports before and after making an
-invocation. Both the client and at the server make this check. 
-
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc b/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc
deleted file mode 100644
index 2b128347974..00000000000
--- a/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc
+++ /dev/null
@@ -1,33 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*SSL Server): taoexe, portableserver, minimum_corba, bidir_giop {
-  after += *idl
-  Source_Files {
-    test_i.cpp
-    testS.cpp
-    testC.cpp
-    server.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*SSL Client): taoexe, portableserver, minimum_corba, bidir_giop {
-  after += *idl
-  Source_Files {
-    test_i.cpp
-    testS.cpp
-    testC.cpp
-    client.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.conf b/TAO/orbsvcs/tests/Security/BiDirectional/client.conf
deleted file mode 100644
index c827b49249a..00000000000
--- a/TAO/orbsvcs/tests/Security/BiDirectional/client.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-dynamic SSLIOP_Factory Service_Object * 
-  TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() 
-  "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey 'PEM:ssl/client-key.pem' -SSLCertificate 'PEM:ssl/client-cert.pem' -SSLCAFile 'PEM:ssl/ca.pem'" 
-
-dynamic Advanced_Resource_Factory Service_Object* 
-  TAO_Strategies:_make_TAO_Advanced_Resource_Factory () 
-  "-ORBProtocolFactory SSLIOP_Factory"
-  
-static Client_Strategy_Factory  "-ORBConnectStrategy blocked"
-
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
deleted file mode 100644
index fb15517f37e..00000000000
--- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "test_i.h"
-#include "tao/BiDir_GIOP/BiDirGIOP.h"
-#include "tao/AnyTypeCode/Any.h"
-
-#include "tao/ORB_Core.h"
-#include "tao/Transport_Cache_Manager.h"
-#include "tao/Thread_Lane_Resources.h"
-
-ACE_RCSID(BiDirectional, client, "$Id$")
-
-const char *ior = "file://test.ior";
-
-void do_nothing (void)
-{
-}
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "\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;
-
-      // Policies for the childPOA to be created.
-      CORBA::PolicyList policies (1);
-      policies.length (1);
-
-      CORBA::Any pol;
-      pol <<= BiDirPolicy::BOTH;
-      policies[0] =
-        orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Create POA as child of RootPOA with the above policies.  This POA
-      // will receive request in the same connection in which it sent
-      // the request
-      PortableServer::POA_var child_poa =
-        root_poa->create_POA ("childPOA",
-                              poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Creation of childPOA is over. Destroy the Policy objects.
-      for (CORBA::ULong i = 0;
-           i < policies.length ();
-           ++i)
-        {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      poa_manager->activate (ACE_ENV_SINGLE_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);
-        }
-
-
-      Callback_i callback_impl (orb.in ());
-
-      PortableServer::ObjectId_var id =
-        PortableServer::string_to_ObjectId ("client_callback");
-
-      child_poa->activate_object_with_id (id.in (),
-                                          &callback_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var callback_object =
-        child_poa->id_to_reference (id.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Callback_var callback =
-        Callback::_narrow (callback_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-
-      CORBA::String_var ior =
-        orb->object_to_string (callback.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client callback activated as <%s>\n", ior.in ()));
-
-      // Send the calback object to the server
-      server->callback_object (callback.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // This is a non-portable, but the only currently available way of
-      // determining the number of currently open connections.
-      size_t pre_call_connections =
-        orb->orb_core ()->lane_resources ().transport_cache ().current_size ();
-
-      // A  method to kickstart callbacks from the server
-      CORBA::Long r =
-        server->test_method (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (r != 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) unexpected result = %d ",
-                      r));
-        }
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // This is a non-portable, but the only currently available way of
-      // determining the number of currently open connections.
-      size_t cur_connections =
-        orb->orb_core()->lane_resources().transport_cache().current_size ();
-
-      if (cur_connections > pre_call_connections)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) Expected %d "
-                      "connections in the transport cache, but found "
-                      "%d instead.  Aborting.\n",
-                      pre_call_connections,
-                      cur_connections));
-
-          ACE_OS::abort ();
-        }
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl b/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl
deleted file mode 100755
index 7a181ebc862..00000000000
--- a/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl
+++ /dev/null
@@ -1,187 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::Run_Test;
-use Getopt::Long;
-
-$status = 0;
-$opt = "";
-$conf_client = "";
-$conf_server = "";
-$iorfile = PerlACE::LocalFile ("test.ior");
-$iter = 10;        
-
-sub options () { 
-  my $help = 0;       # handled locally 
-  my $man = 0;        # handled locally
-  my $ssl = 0;        # handled locally
-  my $dotdec = 0;     # handled locally
-  my $debug;        # handled locally
-  my $shost;        # handled locally
-  my $chost;        # handled locally
-
-  # Process options.
-  if ( @ARGV > 0 ) { 
-    GetOptions ('help|?' => \$help, 
-                'manual' => \$man, 
-                'iter=i' => \$iter, 
-                'ssl' => \$ssl, 
-                'dd=s' => \$dotdec, 
-                'shost=s' => \$shost, 
-                'chost=s' => \$chost, 
-                'debug=i' => \$debug) or pod2usage(2); 
-  }
-
-  if ($ssl) {
-    $conf_client = " -ORBSvcConf client.conf";
-    $conf_server = " -ORBSvcConf server.conf";
-  }
-
-  if ($debug) {
-    $opt = "$opt -ORBDebugLevel $debug";
-  }
-  
-  if ($dotdec) {
-    if ($dotdec =~ /client/) {
-      $conf_client = "$conf_client -ORBDottedDecimalAddresses 1";
-    }
-    if ($dotdec =~ /server/) {
-      $conf_server = "$conf_server -ORBDottedDecimalAddresses 1";
-    }
-  }
-  
-  if ($shost) {
-    $conf_server = "$conf_server -ORBListenEndpoints iiop:///hostname_in_ior=$shost";
-  }
-  
-  if ($chost) {
-    $conf_client = "$conf_client -ORBListenEndpoints iiop:///hostname_in_ior=$chost";
-  }
-  
-  if ( $man or $help ) {
-    # Load Pod::Usage only if needed.
-    require "Pod/Usage.pm"; 
-    import Pod::Usage; 
-    pod2usage(1) if $help;
-    pod2usage(VERBOSE => 2) if $man; 
-    return 0;
-  } 
-
-  return 1;
-}
-
-options () or die "Nothing executed";
-
-unlink $iorfile;
-
-print STDERR "Executing, server options=$conf_server $opt -o $iorfile -i $iter\n";
-$SV = new PerlACE::Process ("server", 
-                            "$conf_server $opt -o $iorfile -i $iter");
-
-print STDERR "Executing, client options=$conf_client $opt -k file://$iorfile\n";
-$CL = new PerlACE::Process ("client", 
-                            "$conf_client $opt -k file://$iorfile");
-#                            "$conf_client -k file://$iorfile");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (20);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-if ($status != 0) {
-  print STDERR "Test failed\n";
-}
-else {
-  print STDERR "Test succeded\n";
-}
-
-exit $status;
-
-__END__
-
-=head1 NAME
-
-run_test.pl - A driver to run the test
-
-=head1 SYNOPSIS
-
-B<run_test.pl> [B<-help|?>] [B<-iter iterations>] [B<-chost host>]
-               [B<-dd who>] [B<-shost host>] [B<-man>] [B<-ssl>] 
-               [B<-debug level>]
-
-
-=head1 DESCRIPTION
-
-This is a test that exercises the birectional GIOP connection
-implementation in TAO over SSLIOP connection. Start the server like this
-
-  $ server -ORBSvcConf server.conf -o <file.ior> -i <no_iterations>
-  $ client -ORBSvcConf client.conf -k file://<file.ior> -x 
-
-Or, simply
-
-  $ ./run_test.pl -ssl
-
-The server starts up writing the IOR to the file. The client then starts
-up, creates its own object and passes the reference to the server. Then
-it invokes a method on the server to indicate that it is ready for
-callback. The server then callsback the client on the same connection
-<no_iterations> times. If the server creates a new connection the server
-would crash itself.
-
-Basicaly, the test is a copy of the $TAO_ROOT/tests/BiDirectional with
-added support for SSLIOP
-
-=head1 OPTIONS
-
-[B<-help|?>]
-  Print a short help message
-
-[B<-iter iterations>] 
-  The number of iterations to make. Default is 10.
-  
-[B<-chost hostname>] 
-  The hostname_in_ior for the client. Used only if specified.
-  
-[B<-shost hostname>] 
-  The hostname_in_ior for the server. Used only if specified.
-  
-[B<-man>]
-  Prints this nice manual page
-
-[B<-dd who>]
-  Request the usage of -ORBDottedDecimalAddresses 1" for the client, the
-  server or both. Values of who can be "client", "server" or
-  "client,server".
-
-[B<-ssl>] 
-  Enables the use of SSLIOP instead of IIOP
-  
-[B<-debug level>]
-  Enables debugging. Values for level are 1-10
-
-=cut
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.conf b/TAO/orbsvcs/tests/Security/BiDirectional/server.conf
deleted file mode 100644
index 6ad7e6d78a8..00000000000
--- a/TAO/orbsvcs/tests/Security/BiDirectional/server.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-dynamic SSLIOP_Factory Service_Object * 
-  TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() 
-  "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey 'PEM:ssl/server-key.pem' -SSLCertificate 'PEM:ssl/server-cert.pem' -SSLCAFile 'PEM:ssl/ca.pem'"
-
-dynamic Advanced_Resource_Factory Service_Object* 
-  TAO_Strategies:_make_TAO_Advanced_Resource_Factory () 
-  "-ORBProtocolFactory SSLIOP_Factory"
-  
-static Client_Strategy_Factory  "-ORBConnectStrategy blocked"
-
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
deleted file mode 100644
index 44ddec21390..00000000000
--- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "test_i.h"
-#include "tao/BiDir_GIOP/BiDirGIOP.h"
-#include "tao/AnyTypeCode/Any.h"
-
-ACE_RCSID(BiDirectional, server, "$Id$")
-
-const char *ior_output_file = 0;
-int no_iterations = 10;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-      case 'i':
-        no_iterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "-i <no_iterations>"
-                           "\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;
-
-      // Policies for the childPOA to be created.
-      CORBA::PolicyList policies (1);
-      policies.length (1);
-
-      CORBA::Any pol;
-      pol <<= BiDirPolicy::BOTH;
-      policies[0] =
-        orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Create POA as child of RootPOA with the above policies.  This POA
-      // will receive request in the same connection in which it sent
-      // the request
-      PortableServer::POA_var child_poa =
-        root_poa->create_POA ("childPOA",
-                              poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Creation of childPOA is over. Destroy the Policy objects.
-      for (CORBA::ULong i = 0;
-           i < policies.length ();
-           ++i)
-        {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Simple_Server_i server_impl (orb.in (),
-                                   no_iterations);
-
-      PortableServer::ObjectId_var id =
-        PortableServer::string_to_ObjectId ("simple_server");
-
-      child_poa->activate_object_with_id (id.in (),
-                                          &server_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var obj =
-        child_poa->id_to_reference (id.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server 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);
-        }
-
-      int retval = 0;
-      while (retval == 0)
-        {
-          // Just process one upcall. We know that we would get the
-          // clients IOR in that call.
-          CORBA::Boolean pending =
-            orb->work_pending(ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (pending)
-            {
-              orb->perform_work(ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-            }
-
-          // Now that hopefully we have the clients IOR, just start
-          // making remote calls to the client.
-          retval = server_impl.call_client (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;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem
deleted file mode 100644
index d64a1754e82..00000000000
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICuDCCAiGgAwIBAgIBADANBgkqhkiG9w0BAQQFADBNMQswCQYDVQQGEwJVUzEL
-MAkGA1UECBMCTU8xEjAQBgNVBAcTCVN0LiBMb3VpczEMMAoGA1UEChMDT0NJMQ8w
-DQYDVQQDEwZzZXJ2ZXIwHhcNMDUwNDE4MjAzNDQxWhcNMDYwNDE4MjAzNDQxWjBN
-MQswCQYDVQQGEwJVUzELMAkGA1UECBMCTU8xEjAQBgNVBAcTCVN0LiBMb3VpczEM
-MAoGA1UEChMDT0NJMQ8wDQYDVQQDEwZzZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBANCcDTCxc5DlaXJtflPMTkCUook5uOF1N56inw0eyaLx8zucv3TL
-LU1cORInZDzie7+ImiQ8tmiB+3rCy/UER5F0zv8Pc0aklyysK+cjMlA0mu7D26Ut
-M/YlDp18kyBmSWEtx3AobTUo5Ry5dqXjN96oJGUc+WypIJX6yvs3CsKNAgMBAAGj
-gacwgaQwHQYDVR0OBBYEFElH1lMSF2uqjpL29w0U3+NNVLsvMHUGA1UdIwRuMGyA
-FElH1lMSF2uqjpL29w0U3+NNVLsvoVGkTzBNMQswCQYDVQQGEwJVUzELMAkGA1UE
-CBMCTU8xEjAQBgNVBAcTCVN0LiBMb3VpczEMMAoGA1UEChMDT0NJMQ8wDQYDVQQD
-EwZzZXJ2ZXKCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQB8Tttf
-Yf+9cjjdw01L1ERXjJIcwH5ZhhKoCguDV0BmbkDmTD8DhIMLZG3mKkJnS7g0JRT3
-7Gs4okPK+sPW7elRLxTvlYZeO4O9ra6TF9+esSw03h3p10/MdCFyt5YK7i6DHWMJ
-hYUnQ6tBMvDuTamwWoxJGWDxkkBSRrGgVRb3IQ==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIICuDCCAiGgAwIBAgIBADANBgkqhkiG9w0BAQQFADBNMQswCQYDVQQGEwJVUzEL
-MAkGA1UECBMCTU8xEjAQBgNVBAcTCVN0LiBMb3VpczEMMAoGA1UEChMDT0NJMQ8w
-DQYDVQQDEwZjbGllbnQwHhcNMDUwNDE4MjAzNDQxWhcNMDYwNDE4MjAzNDQxWjBN
-MQswCQYDVQQGEwJVUzELMAkGA1UECBMCTU8xEjAQBgNVBAcTCVN0LiBMb3VpczEM
-MAoGA1UEChMDT0NJMQ8wDQYDVQQDEwZjbGllbnQwgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBAKlt5waXlc4y4i8T4kJ+z0DGHAdjJCl5f+CAAhiAGnM6ojV7YNbH
-KHZW2qGBvq5jsy2DXGJC7/hxV3IKerv1Us9znbFypAgJNwqERBlwC0enBcfrQkIa
-umzheCyr6xSDSAB9Kmgtsrm1JGuq7eOIfqiUUBCovpg+Y3Q1eLvD34eJAgMBAAGj
-gacwgaQwHQYDVR0OBBYEFKYlVQvY/ngeBTk9SsDbu/1S8e6PMHUGA1UdIwRuMGyA
-FKYlVQvY/ngeBTk9SsDbu/1S8e6PoVGkTzBNMQswCQYDVQQGEwJVUzELMAkGA1UE
-CBMCTU8xEjAQBgNVBAcTCVN0LiBMb3VpczEMMAoGA1UEChMDT0NJMQ8wDQYDVQQD
-EwZjbGllbnSCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQAU9c+R
-NCKu/jkIkUUACc+yTiNb2DvLJtRpWsrUSTLj8KK9wXlwyk3Zm/0h7PjGMUyE7nPi
-4vWXDrXBgQ3gXbcmbMygFJikAO6jVlyE+49AsJET/HzTorTgu7n+/Y3D9+J5GTDA
-jFzmjtaMPErQwhjRvG15ekJOZeqR8NjIRPm/OQ==
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem
deleted file mode 100644
index 27b6c182238..00000000000
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICuDCCAiGgAwIBAgIBADANBgkqhkiG9w0BAQQFADBNMQswCQYDVQQGEwJVUzEL
-MAkGA1UECBMCTU8xEjAQBgNVBAcTCVN0LiBMb3VpczEMMAoGA1UEChMDT0NJMQ8w
-DQYDVQQDEwZjbGllbnQwHhcNMDUwNDE4MjAzNDQxWhcNMDYwNDE4MjAzNDQxWjBN
-MQswCQYDVQQGEwJVUzELMAkGA1UECBMCTU8xEjAQBgNVBAcTCVN0LiBMb3VpczEM
-MAoGA1UEChMDT0NJMQ8wDQYDVQQDEwZjbGllbnQwgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBAKlt5waXlc4y4i8T4kJ+z0DGHAdjJCl5f+CAAhiAGnM6ojV7YNbH
-KHZW2qGBvq5jsy2DXGJC7/hxV3IKerv1Us9znbFypAgJNwqERBlwC0enBcfrQkIa
-umzheCyr6xSDSAB9Kmgtsrm1JGuq7eOIfqiUUBCovpg+Y3Q1eLvD34eJAgMBAAGj
-gacwgaQwHQYDVR0OBBYEFKYlVQvY/ngeBTk9SsDbu/1S8e6PMHUGA1UdIwRuMGyA
-FKYlVQvY/ngeBTk9SsDbu/1S8e6PoVGkTzBNMQswCQYDVQQGEwJVUzELMAkGA1UE
-CBMCTU8xEjAQBgNVBAcTCVN0LiBMb3VpczEMMAoGA1UEChMDT0NJMQ8wDQYDVQQD
-EwZjbGllbnSCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQAU9c+R
-NCKu/jkIkUUACc+yTiNb2DvLJtRpWsrUSTLj8KK9wXlwyk3Zm/0h7PjGMUyE7nPi
-4vWXDrXBgQ3gXbcmbMygFJikAO6jVlyE+49AsJET/HzTorTgu7n+/Y3D9+J5GTDA
-jFzmjtaMPErQwhjRvG15ekJOZeqR8NjIRPm/OQ==
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem
deleted file mode 100644
index 8d5282eeaa5..00000000000
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQCpbecGl5XOMuIvE+JCfs9AxhwHYyQpeX/ggAIYgBpzOqI1e2DW
-xyh2Vtqhgb6uY7Mtg1xiQu/4cVdyCnq79VLPc52xcqQICTcKhEQZcAtHpwXH60JC
-Grps4Xgsq+sUg0gAfSpoLbK5tSRrqu3jiH6olFAQqL6YPmN0NXi7w9+HiQIDAQAB
-AoGAMUz3kqV9Q9julABXMD4yFIkREt04YpEmMq9M7NAp4inHlYRnM1gUYAr551EX
-qSr9slqtATK1HTft2BNQj2zdQWLLs4rJ7FvVYLYdBBCAFdYugjnjkxHafaOYX/Sb
-HGHiGZxM/6N5BUijGfNBc4qF+jeONDyGDZoxW//uqaslpmECQQDeqG+QF3Kqe272
-HPol81WpLL8M6Vtk8woLB9/T7oKHEbw4C/ZzHqJQPGcEUxStm3z9Bo+rb1wjAMp/
-r/TL0i3VAkEAwsz0C3JPbt9PC0UwqrgXfsvYuVNwJ60HGGe29mQ+5xpFQgzOPgUI
-XRaXpCtnMYinedsGeGEBvDHZkESibkZo5QJAYCeBNkrJ/BGeE67j4Cu7nHl0cBD+
-pRPIDId0A8QGnmnsTI/t+D0Mf3X2TwnJ7kctrN9+f9xxf7RBvu6v2q2DmQJAd5+O
-efz/ZHGDQ8OAaEXWP8oEU4I2jFbH1afTBil3K0nJoA7nE9TZVvjJtEnm+9cUKVNj
-/MZtX1kpZluPd7KLNQJATm3ZjpwPsK/wz2W0cIfZjswh7ARW3ie3UzWI7ryBumQB
-q0wXd5VXuG2hmWI2S0SfuRRDWxCW/KmPVYCaSY+HQg==
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIICuDCCAiGgAwIBAgIBADANBgkqhkiG9w0BAQQFADBNMQswCQYDVQQGEwJVUzEL
-MAkGA1UECBMCTU8xEjAQBgNVBAcTCVN0LiBMb3VpczEMMAoGA1UEChMDT0NJMQ8w
-DQYDVQQDEwZjbGllbnQwHhcNMDUwNDE4MjAzNDQxWhcNMDYwNDE4MjAzNDQxWjBN
-MQswCQYDVQQGEwJVUzELMAkGA1UECBMCTU8xEjAQBgNVBAcTCVN0LiBMb3VpczEM
-MAoGA1UEChMDT0NJMQ8wDQYDVQQDEwZjbGllbnQwgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBAKlt5waXlc4y4i8T4kJ+z0DGHAdjJCl5f+CAAhiAGnM6ojV7YNbH
-KHZW2qGBvq5jsy2DXGJC7/hxV3IKerv1Us9znbFypAgJNwqERBlwC0enBcfrQkIa
-umzheCyr6xSDSAB9Kmgtsrm1JGuq7eOIfqiUUBCovpg+Y3Q1eLvD34eJAgMBAAGj
-gacwgaQwHQYDVR0OBBYEFKYlVQvY/ngeBTk9SsDbu/1S8e6PMHUGA1UdIwRuMGyA
-FKYlVQvY/ngeBTk9SsDbu/1S8e6PoVGkTzBNMQswCQYDVQQGEwJVUzELMAkGA1UE
-CBMCTU8xEjAQBgNVBAcTCVN0LiBMb3VpczEMMAoGA1UEChMDT0NJMQ8wDQYDVQQD
-EwZjbGllbnSCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQAU9c+R
-NCKu/jkIkUUACc+yTiNb2DvLJtRpWsrUSTLj8KK9wXlwyk3Zm/0h7PjGMUyE7nPi
-4vWXDrXBgQ3gXbcmbMygFJikAO6jVlyE+49AsJET/HzTorTgu7n+/Y3D9+J5GTDA
-jFzmjtaMPErQwhjRvG15ekJOZeqR8NjIRPm/OQ==
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/make-client-keys b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/make-client-keys
deleted file mode 100755
index 6ba5894dde9..00000000000
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/make-client-keys
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash -x
-
-openssl req -new -x509 -days 365 -nodes -newkey rsa:1024 \
-    -out server-cert.pem -keyout server-key.pem \
-    -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=server"
-
-cat server-cert.pem >>server-key.pem
-cat server-cert.pem >ca.pem
-        
-openssl req -new -x509 -days 365 -nodes -newkey rsa:1024 \
-    -out client-cert.pem -keyout client-key.pem \
-    -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=client"
-
-cat client-cert.pem >>client-key.pem
-cat client-cert.pem >>ca.pem
-        
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem
deleted file mode 100644
index 94354a922a7..00000000000
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICuDCCAiGgAwIBAgIBADANBgkqhkiG9w0BAQQFADBNMQswCQYDVQQGEwJVUzEL
-MAkGA1UECBMCTU8xEjAQBgNVBAcTCVN0LiBMb3VpczEMMAoGA1UEChMDT0NJMQ8w
-DQYDVQQDEwZzZXJ2ZXIwHhcNMDUwNDE4MjAzNDQxWhcNMDYwNDE4MjAzNDQxWjBN
-MQswCQYDVQQGEwJVUzELMAkGA1UECBMCTU8xEjAQBgNVBAcTCVN0LiBMb3VpczEM
-MAoGA1UEChMDT0NJMQ8wDQYDVQQDEwZzZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBANCcDTCxc5DlaXJtflPMTkCUook5uOF1N56inw0eyaLx8zucv3TL
-LU1cORInZDzie7+ImiQ8tmiB+3rCy/UER5F0zv8Pc0aklyysK+cjMlA0mu7D26Ut
-M/YlDp18kyBmSWEtx3AobTUo5Ry5dqXjN96oJGUc+WypIJX6yvs3CsKNAgMBAAGj
-gacwgaQwHQYDVR0OBBYEFElH1lMSF2uqjpL29w0U3+NNVLsvMHUGA1UdIwRuMGyA
-FElH1lMSF2uqjpL29w0U3+NNVLsvoVGkTzBNMQswCQYDVQQGEwJVUzELMAkGA1UE
-CBMCTU8xEjAQBgNVBAcTCVN0LiBMb3VpczEMMAoGA1UEChMDT0NJMQ8wDQYDVQQD
-EwZzZXJ2ZXKCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQB8Tttf
-Yf+9cjjdw01L1ERXjJIcwH5ZhhKoCguDV0BmbkDmTD8DhIMLZG3mKkJnS7g0JRT3
-7Gs4okPK+sPW7elRLxTvlYZeO4O9ra6TF9+esSw03h3p10/MdCFyt5YK7i6DHWMJ
-hYUnQ6tBMvDuTamwWoxJGWDxkkBSRrGgVRb3IQ==
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem b/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem
deleted file mode 100644
index 1f430348d55..00000000000
--- a/TAO/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDQnA0wsXOQ5WlybX5TzE5AlKKJObjhdTeeop8NHsmi8fM7nL90
-yy1NXDkSJ2Q84nu/iJokPLZogft6wsv1BEeRdM7/D3NGpJcsrCvnIzJQNJruw9ul
-LTP2JQ6dfJMgZklhLcdwKG01KOUcuXal4zfeqCRlHPlsqSCV+sr7NwrCjQIDAQAB
-AoGAf5gDRVY0XlrDbVblXrHm5v9CjvZ8S4Jbm67R47+CCyU75alRPUmMkvWmfqET
-YV4R3Kvbw/BSjYd7XrHI+Ds+3e/0grBK4MM0DpWT1Dqa/EklACt5DlJ3UPmAUnAp
-IvuLgcC/8e88VWylQ1vRJ2qoTvrY3yZI5NQXfuaxf7eQLyECQQD+jh5pX4qL7MDQ
-FskGqB4CUDy/UO/Ye2hTY/ILIj7H5X/Rpn82fEItx9NfAuW4loaKBrpGElwqJJJw
-9EeN2sMpAkEA0csr6f/hBaxyenaZ72fTNDFvX1EsnqVpOdcYFgJYFsizcjpHNjkj
-GlBo7WTrfKPgJCVHrSd7zqpz6a8Dj6R0xQJAOpKpHMYHMzs/AqK7jvSQMygTUlJl
-XgLHdqjAwR8YIxcD2lHdY8Qj1jTsxif8hATe4FO7+POwkWHo8GTFMjbsQQJBALaW
-Svv3NRLJCUFII6VXCVwtgi7E6T6R28j5SP8uvxflSTgrPHsWs1Rdk1S5NrJdtd//
-iihLatdtRkClj0Xe7bkCQQCM/JaBwb7UyHFmGhSk/6teiTc+GiRQkbTV7ssbIB6N
-1KPKXPguFf4bemVjadw6d9mljTat/QcgJRdaW8iAjqa1
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIICuDCCAiGgAwIBAgIBADANBgkqhkiG9w0BAQQFADBNMQswCQYDVQQGEwJVUzEL
-MAkGA1UECBMCTU8xEjAQBgNVBAcTCVN0LiBMb3VpczEMMAoGA1UEChMDT0NJMQ8w
-DQYDVQQDEwZzZXJ2ZXIwHhcNMDUwNDE4MjAzNDQxWhcNMDYwNDE4MjAzNDQxWjBN
-MQswCQYDVQQGEwJVUzELMAkGA1UECBMCTU8xEjAQBgNVBAcTCVN0LiBMb3VpczEM
-MAoGA1UEChMDT0NJMQ8wDQYDVQQDEwZzZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBANCcDTCxc5DlaXJtflPMTkCUook5uOF1N56inw0eyaLx8zucv3TL
-LU1cORInZDzie7+ImiQ8tmiB+3rCy/UER5F0zv8Pc0aklyysK+cjMlA0mu7D26Ut
-M/YlDp18kyBmSWEtx3AobTUo5Ry5dqXjN96oJGUc+WypIJX6yvs3CsKNAgMBAAGj
-gacwgaQwHQYDVR0OBBYEFElH1lMSF2uqjpL29w0U3+NNVLsvMHUGA1UdIwRuMGyA
-FElH1lMSF2uqjpL29w0U3+NNVLsvoVGkTzBNMQswCQYDVQQGEwJVUzELMAkGA1UE
-CBMCTU8xEjAQBgNVBAcTCVN0LiBMb3VpczEMMAoGA1UEChMDT0NJMQ8wDQYDVQQD
-EwZzZXJ2ZXKCAQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQB8Tttf
-Yf+9cjjdw01L1ERXjJIcwH5ZhhKoCguDV0BmbkDmTD8DhIMLZG3mKkJnS7g0JRT3
-7Gs4okPK+sPW7elRLxTvlYZeO4O9ra6TF9+esSw03h3p10/MdCFyt5YK7i6DHWMJ
-hYUnQ6tBMvDuTamwWoxJGWDxkkBSRrGgVRb3IQ==
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test.idl b/TAO/orbsvcs/tests/Security/BiDirectional/test.idl
deleted file mode 100644
index 4839f8a67b1..00000000000
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// $Id$
-//
-
-interface Callback
-{
-  /// A safe way to shutdown the client, using either clean shutdowns
-  /// or "catastrophic failures".
-  oneway void shutdown ();
-
-  /// A simple remote call
-  void callback_method ();
-};
-
-interface Simple_Server
-{
-  /// Just call a method on the server,
-  long test_method (in boolean do_callback);
-
-  /// send the callback object to the server
-  void callback_object (in Callback cb);
-
-  /// A safe way to shutdown the server, it is a oneway function so we
-  /// will never get a COMM_FAILURE error
-  oneway void shutdown ();
-};
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
deleted file mode 100644
index af19f459239..00000000000
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-#include "tao/Transport_Cache_Manager.h"
-#include "tao/Thread_Lane_Resources.h"
-
-#if !defined(__ACE_INLINE__)
-#include "test_i.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(BiDirectional, test_i, "$Id$")
-
-void
-Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
-
-void
-Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "Callback method called \n"));
-}
-
-
-// ****************************************************************
-
-CORBA::Long
-Simple_Server_i::test_method (CORBA::Boolean do_callback
-                              ACE_ENV_ARG_DECL_NOT_USED )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (do_callback)
-    {
-      this->flag_ = 1;
-    }
-
-  return 0;
-}
-
-void
-Simple_Server_i::callback_object (Callback_ptr callback
-                                  ACE_ENV_ARG_DECL_NOT_USED )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Store the callback object
-  this->callback_ = Callback::_duplicate (callback);
-}
-
-int
-Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
-{
-  size_t pre_call_connections =
-    this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size ();
-
-  if (this->flag_)
-    {
-      for (int times = 0; times < this->no_iterations_; ++times)
-        {
-          this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          size_t cur_connections =
-            this->orb_->orb_core()->lane_resources().transport_cache().current_size ();
-
-          if (cur_connections > pre_call_connections)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          "(%P|%t) TEST OUTPUT: expected to find %d "
-                          "connections in the transport cache, but found "
-                          "%d instead.  Aborting.\n",
-                          pre_call_connections,
-                          cur_connections));
-
-              ACE_OS::abort ();
-            }
-        }
-
-      this->callback_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-      this->flag_ = 0;
-
-      return 1;
-    }
-
-  return 0;
-}
-
-
-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/orbsvcs/tests/Security/BiDirectional/test_i.h b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
deleted file mode 100644
index 9cf3cb4977c..00000000000
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/BiDirectional
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_BIDIRECTIONAL_TEST_I_H
-#define TAO_BIDIRECTIONAL_TEST_I_H
-
-#include "testS.h"
-
-class Callback_i : public POA_Callback
-{
-  // = TITLE
-  //   A callback object to the "client"
-  //
-  // = DESCRIPTION
-  //   To test that the server can call the client on the same
-  //   connection that was established by the client
-  //
-public:
-  Callback_i (CORBA::ORB_ptr orb);
-  // ctor
-
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Safe way to shutdown
-
-  void callback_method (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // The callback method
-
-private:
-  CORBA::ORB_var orb_;
-  // The orb
-
-};
-
-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, int no_iterations);
-  // ctor
-
-  // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Boolean do_callback
-                           ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void callback_object (Callback_ptr callback
-                        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));
-
-  int call_client (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
-
-private:
-  CORBA::ORB_var orb_;
-  // The ORB
-
-  int flag_;
-  // Flag to indicate, whether we are ready for a remote call.
-
-  Callback_var callback_;
-  // Callback Object
-
-  int no_iterations_;
-  // Number of times the callback needs to be called
-};
-
-#if defined(__ACE_INLINE__)
-#include "test_i.inl"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_BIDIRECTIONAL_TEST_I_H */
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.inl b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.inl
deleted file mode 100644
index 799be9fdcbe..00000000000
--- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.inl
+++ /dev/null
@@ -1,17 +0,0 @@
-// $Id$
-
-ACE_INLINE
-Callback_i::Callback_i (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-ACE_INLINE
-Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
-                                  int no_iterations)
-  :  orb_ (CORBA::ORB::_duplicate (orb)),
-     flag_ (0),
-     callback_ (0),
-     no_iterations_ (no_iterations)
-{
-}
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
deleted file mode 100644
index c5089718b4d..00000000000
--- a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
+++ /dev/null
@@ -1,34 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*idl): taoidldefaults {
-  IDL_Files {
-    TX_Object.idl
-  }
-  custom_only = 1
-}
-
-project(*security client): taoclient, anytypecode, ssl {
-  after += *idl
-
-  Source_Files {
-    TX_ObjectC.cpp
-    client.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*security server): taoserver, ssl {
-  after += *idl
-
-  Source_Files {
-    TX_Object_i.cpp
-    TX_ObjectS.cpp
-    TX_ObjectC.cpp
-    server.cpp
-  }
-  IDL_Files {
-  }
-}
-
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am b/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am
deleted file mode 100644
index 21c8934a1bd..00000000000
--- a/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am
+++ /dev/null
@@ -1,125 +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.Big_Request_Idl.am
-
-BUILT_SOURCES = \
-  TX_ObjectC.cpp \
-  TX_ObjectC.h \
-  TX_ObjectC.inl \
-  TX_ObjectS.cpp \
-  TX_ObjectS.h \
-  TX_ObjectS.inl
-
-CLEANFILES = \
-  TX_Object-stamp \
-  TX_ObjectC.cpp \
-  TX_ObjectC.h \
-  TX_ObjectC.inl \
-  TX_ObjectS.cpp \
-  TX_ObjectS.h \
-  TX_ObjectS.inl
-
-TX_ObjectC.cpp TX_ObjectC.h TX_ObjectC.inl TX_ObjectS.cpp TX_ObjectS.h TX_ObjectS.inl: TX_Object-stamp
-
-TX_Object-stamp: $(srcdir)/TX_Object.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/TX_Object.idl
-	@touch $@
-
-
-noinst_HEADERS = \
-  TX_Object.idl
-
-## Makefile.Big_Request_Security_Client.am
-
-if BUILD_SSL
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-client_SOURCES = \
-  TX_ObjectC.cpp \
-  client.cpp \
-  TX_Object_i.h
-
-client_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-client_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_SSL
-
-## Makefile.Big_Request_Security_Server.am
-
-if BUILD_SSL
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  TX_ObjectC.cpp \
-  TX_ObjectS.cpp \
-  TX_Object_i.cpp \
-  server.cpp \
-  TX_Object_i.h
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_SSL
-
-## 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/Security/Big_Request/README b/TAO/orbsvcs/tests/Security/Big_Request/README
deleted file mode 100644
index 31790e131fb..00000000000
--- a/TAO/orbsvcs/tests/Security/Big_Request/README
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-
----
-The initial version of this test was contributed by Andrew Finnell.
-Additional modifications (simplifications, improvements, etc) were
-made by the DOC Group prior to inclusion in the TAO distribution.
----
-
-This test excercises the ability of the SSLIOP pluggable protocol to
-send very large requests and replies.  It is intended to make the ORB
-send the message and reply in multiple parts (e.g. chains in a message
-block that fill several elements of an "iovec" vector to be sent
-through a scatter write/send interface).  In particular, it is
-difficult to completely reproduce the semantics of the writev() system
-call with SSL_write().  As such, if the semantics are not emulated
-properly, large requests and replies will fail.
-
-All that is really done is to send a 3MB octet sequence as an "in"
-argument, and receive the same 3MB octet sequence from the server
-through an "out" argument.
-
-The expected test output is the following:
-
-==== Running SSLIOP Big_Request test
-Activated as <IOR:010000001200000049...0a410>
-Sending  octet sequence of length:	3461724
-Received octet sequence of length:	3461724
-Sending  octet sequence of length:	3461724
-Received octet sequence of length:	3461724
-
-Event loop finished.
-
-SSLIOP Big_Request test passed.
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object.idl b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object.idl
deleted file mode 100644
index 5a1b4019323..00000000000
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-// -*- IDL -*-
-
-//=============================================================================
-/**
- * @file TX_Object.idl
- *
- * $Id$
- *
- * IDL for the SSLIOP Big_Request test.
- *
- * @author Andrew Finnell
- * @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-
-typedef sequence<octet> DataSeq;
-
-interface TX_Object
-{
-
-  void send (in DataSeq data);
-  void recv (out DataSeq data);
-
-  oneway void shutdown ();
-
-};
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
deleted file mode 100644
index b3910364baf..00000000000
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-
-#include "TX_Object_i.h"
-
-
-ACE_RCSID (Big_Request,
-           TX_Object_i,
-           "$Id$")
-
-
-TX_Object_i::TX_Object_i (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb)),
-    data_ ()
-{
-}
-
-TX_Object_i::~TX_Object_i (void)
-{
-}
-
-void
-TX_Object_i::send (const DataSeq & data
-                   ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->data_ = data;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Received octet sequence of length:\t%u\n",
-              data.length ()));
-}
-
-void
-TX_Object_i::recv (DataSeq_out data
-                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_NEW_THROW_EX (data,
-                    DataSeq,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
-
-  (*data) = this->data_;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Sending  octet sequence of length:\t%u\n",
-              data->length ()));
-}
-
-void
-TX_Object_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
deleted file mode 100644
index 53bc2e447c9..00000000000
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file TX_Object_i.h
- *
- * $Id$
- *
- * Header for the SSLIOP Big_Request test server implementation.
- *
- * @author Andrew Finnell
- * @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-#ifndef TX_OBJECT_I_H
-#define TX_OBJECT_I_H
-
-#include "TX_ObjectS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-class  TX_Object_i : public virtual POA_TX_Object
-{
-public:
-
-  // Constructor
-  TX_Object_i (CORBA::ORB_ptr orb);
-
-  // Destructor
-  virtual ~TX_Object_i (void);
-
-  virtual void send (const DataSeq & data
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void recv (DataSeq_out data
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
-  CORBA::ORB_var orb_;
-
-  DataSeq data_;
-
-};
-
-
-#endif  /* TX_OBJECT_I_H */
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/cacert.pem b/TAO/orbsvcs/tests/Security/Big_Request/cacert.pem
deleted file mode 100644
index a9e905f4e6c..00000000000
--- a/TAO/orbsvcs/tests/Security/Big_Request/cacert.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDfTCCAuagAwIBAgIBADANBgkqhkiG9w0BAQQFADCBjDELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkNBMQ8wDQYDVQQHEwZJcnZpbmUxEjAQBgNVBAoTCURPQyBHcm91
-cDEQMA4GA1UECxYHVUNJX0RPQzERMA8GA1UEAxMIUHJpeWFua2ExJjAkBgkqhkiG
-9w0BCQEWF3Bnb250bGFAZG9jLmVjZS51Y2kuZWR1MB4XDTAxMDYxMTE3MjI0MVoX
-DTExMDYwOTE3MjI0MVowgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyFiCRDUH
-nGJqQG9jT/2PhZUAgfwXvIwfDM8m/WujCt/buDcrOz767shBsk4HZhW91Vm4mE03
-K1zfCzojRigf28uyB/rlp60p2Fq0wvZBNNU5Muia6esleR4unb4QslOpcFhct/9n
-UPnlnnsZOTaGWaELNKEjYfHqPh8PQ0lYurECAwEAAaOB7DCB6TAdBgNVHQ4EFgQU
-0Y6IZjkLbLbtZ5aoKLcfd7Yc/kYwgbkGA1UdIwSBsTCBroAU0Y6IZjkLbLbtZ5ao
-KLcfd7Yc/kahgZKkgY8wgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GB
-AHYi8ulIzUI3p3+Ma16rumZxvKcmkJJbU6fpAv4ZvK6AWyy+6Ja0GD5N3SGEx+xU
-nMffTR+LePa9PAZiR7dNkF6ikPxXZu4jn8KY2zFT3SB/VjCoEetR9i9QI//O0Fea
-3yZ0NygNWe5cyVDLCb4meucJpsClfyL28DWzMwD2liX3
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.conf b/TAO/orbsvcs/tests/Security/Big_Request/client.conf
deleted file mode 100644
index 5847fa22a03..00000000000
--- a/TAO/orbsvcs/tests/Security/Big_Request/client.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-
-dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"
-static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.conf.xml b/TAO/orbsvcs/tests/Security/Big_Request/client.conf.xml
deleted file mode 100644
index d14d7475b5d..00000000000
--- a/TAO/orbsvcs/tests/Security/Big_Request/client.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./orbsvcs/tests/Security/Big_Request/client.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <dynamic id="SSLIOP_Factory" type="Service_Object">
-   <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/>
- </dynamic>
- <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
-</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
deleted file mode 100644
index 44eeca19e7d..00000000000
--- a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-#include "TX_ObjectC.h"
-#include "ace/OS_NS_stdlib.h"
-#include "ace/OS_NS_string.h"
-#include "ace/Get_Opt.h"
-#include "ace/SString.h"
-
-ACE_RCSID (Big_Request,
-           client,
-           "$Id$")
-
-const char *ior = "file://test.ior";
-const char *cert_file = "cacert.pem";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Usage:  %s "
-                           "-k <ior> "
-                           "\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
-    {
-      ACE_TString env ("SSL_CERT_FILE=");
-      env += cert_file;
-      ACE_OS::putenv (env.c_str ());
-
-      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 obj =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "ERROR: Nil server object reference\n"),
-                          -1);
-
-      TX_Object_var txObject =
-        TX_Object::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      DataSeq data_input;
-
-      const CORBA::ULong len = 3461724;
-
-      data_input.length (len);
-
-      // Fill in some useless data.
-      for (CORBA::ULong i = 0; i < len; ++i)
-        data_input[i] = i % 9;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Sending  octet sequence of length:\t%u\n",
-                  data_input.length ()));
-
-      txObject->send (data_input ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      DataSeq_var data_output;
-
-      txObject->recv (data_output.out () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Received octet sequence of length:\t%u\n",
-                  data_output->length ()));
-
-      txObject->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Sanity check
-      if (data_output->length () != len
-          || ACE_OS::memcmp (data_input.get_buffer (),
-                             data_output->get_buffer (),
-                             len) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "ERROR: Received octet sequence does not match "
-                           "the one that was sent.\n"),
-                          -1);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "ERROR");
-
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n"
-              "SSLIOP Big_Request test passed.\n"));
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client_cert.pem b/TAO/orbsvcs/tests/Security/Big_Request/client_cert.pem
deleted file mode 100644
index 0bebb696cfc..00000000000
--- a/TAO/orbsvcs/tests/Security/Big_Request/client_cert.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICgzCCAewCAQYwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExODEwMzRaFw0xMTA2
-MDkxODEwMzRaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEQMA4GA1UEChMHVEFPK09DSTEMMAoGA1UECxMDT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL6f8pBX7Mi3FPY/OYBOq+kb
-wQ3WX0Z8+nDxd7AiWDAx2AL5EaX8xnUiRi96OJ+CYPCYOUlavGVzZkRVMFdOuHAn
-RvY2sCpvU2rkKpEx9Pd50l7FLnXJuflnRc6zIEKOvuQcPJvsP4AaxaFxTnZExXQJ
-kDEiQP3mGID/eXtUzywbAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAuvSoOnMB6sxj
-ft9YbdLeyATTPzHbxAb6zQo72DUmM3roNowUrefHymU8jZoC6HeaROeKCU0MkVes
-l/jYlz/OwSYkbyGNIUkq4DHEWKzXEg8M603fsWK6IK3T5iPBHY+l/mYSEHJPfypZ
-fl/y4YSNJZlrz6kCIHTcwfHXDRC1mjM=
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client_key.pem b/TAO/orbsvcs/tests/Security/Big_Request/client_key.pem
deleted file mode 100644
index 1428b501712..00000000000
--- a/TAO/orbsvcs/tests/Security/Big_Request/client_key.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC+n/KQV+zItxT2PzmATqvpG8EN1l9GfPpw8XewIlgwMdgC+RGl
-/MZ1IkYvejifgmDwmDlJWrxlc2ZEVTBXTrhwJ0b2NrAqb1Nq5CqRMfT3edJexS51
-ybn5Z0XOsyBCjr7kHDyb7D+AGsWhcU52RMV0CZAxIkD95hiA/3l7VM8sGwIDAQAB
-AoGABGaa6fwtqkCXykuRX0XxsBME9PXTA0SVX5AjjDxuvsYXz5HCd4uLZV7iMexn
-bD9NT6CkCe5/VPRCEyfIUuutVFc7lkPwuRw5FvNcf4gMH9ltufQfH/KeR7d2Jvge
-zrTOH7nicshy67mfOEOaoDphWoT9uy+7ayym+EsJLJU37VkCQQD6xLRu5r9tKX2/
-NfIQsGxF3TZyXgxcuxMh9JOq5E9nBwhr1JaXDbXktXfIK/F3XWHLFS8CIg6PhgGY
-i/+UtGzvAkEAwpoHp89U2jLdVRoIcwy5o7Ocwk3HCXem3UgFWXzzunGM1x+ozDFA
-uo5nyXiAO6Buka9C2czje275kE18BbqLlQJBAMJNf/EeYdzXdVOfHPzJdlt72CAt
-ty5y1ZRNyc10MgIGdQP4KObJ/NJFuZYkVmjCtm+A7neco+OZVcs5TsOOOYkCQBHQ
-6EKEyM/xODJCX+OolpZWK1PeqwpC2hQIM/Uta2L2Yl6Pl3SaTcLGptnbHmJXHchY
-s1YdW/ZBArgjX+dmXMECQApTKWbVLmNsEoOlHU/I/KhGsfuojrzBMMe3FKLiHpmu
-u86L3vu3OGZFcPgjazxWZcip8JekeJ7c+6suLNNRQ5I=
------END RSA PRIVATE KEY-----
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl b/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl
deleted file mode 100755
index c2806f6c246..00000000000
--- a/TAO/orbsvcs/tests/Security/Big_Request/run_test.pl
+++ /dev/null
@@ -1,54 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-# $Id$
-
-use lib  '../../../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-$file = PerlACE::LocalFile ("test.ior");
-
-unlink $file;
-
-$status = 0;
-
-# Set the SSL environment
-# This doesn't work on Windows.  For some reason,
-# environment variables aren't propagated to child processes.
-#$ENV{'SSL_CERT_FILE'} = 'cacert.pem';
-
-$SV = new PerlACE::Process ("server",
-			    "-o $file -ORBSvcConf server$PerlACE::svcconf_ext");
-$CL = new PerlACE::Process ("client",
-			    "-ORBSvcConf client$PerlACE::svcconf_ext -k file://$file");
-
-print STDERR "\n\n==== Running SSLIOP Big_Request test\n";
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$file>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (180);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $file;
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.conf b/TAO/orbsvcs/tests/Security/Big_Request/server.conf
deleted file mode 100644
index ee0ef1aa57c..00000000000
--- a/TAO/orbsvcs/tests/Security/Big_Request/server.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-
-dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"
-static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.conf.xml b/TAO/orbsvcs/tests/Security/Big_Request/server.conf.xml
deleted file mode 100644
index 5e92069a8c2..00000000000
--- a/TAO/orbsvcs/tests/Security/Big_Request/server.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./orbsvcs/tests/Security/Big_Request/server.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <dynamic id="SSLIOP_Factory" type="Service_Object">
-   <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/>
- </dynamic>
- <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
-</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
deleted file mode 100644
index a2a09539439..00000000000
--- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-
-#include "TX_Object_i.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_string.h"
-#include "ace/SString.h"
-
-ACE_RCSID (Big_Request,
-           server,
-           "$Id$")
-
-const char *ior_output_file = 0;
-const char *cert_file = "cacert.pem";
-
-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
-    {
-      ACE_TString env ("SSL_CERT_FILE=");
-      env += cert_file;
-      ACE_OS::putenv (env.c_str ());
-
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poaObj =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var rootPoa =
-        PortableServer::POA::_narrow (poaObj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        rootPoa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (::parse_args (argc, argv) != 0)
-        return 1;
-
-      TX_Object_i implObject (orb.in ());
-
-      TX_Object_var txObject = implObject._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (txObject.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\n",
-                               ior_output_file),
-                              1);
-          ACE_OS::fprintf (output_file, "%s", ior.in ());
-          ACE_OS::fclose (output_file);
-        }
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "\n"
-                  "Event loop finished.\n"));
-
-      rootPoa->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,
-                           "ERROR");
-
-      return -1;
-    }
-  ACE_ENDTRY;
-
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server_cert.pem b/TAO/orbsvcs/tests/Security/Big_Request/server_cert.pem
deleted file mode 100644
index 0fc394c24d7..00000000000
--- a/TAO/orbsvcs/tests/Security/Big_Request/server_cert.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICgzCCAewCAQMwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExNzQ4NTVaFw0xMTA2
-MDkxNzQ4NTVaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEMMAoGA1UEChMDT0NJMRAwDgYDVQQLEwdUQU8rT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANKXmudWiLVu/zdBlSr0/dlr
-pRe+Ie26cPyMo5lKiYNY77tABTiOXe5qLUEryjQ/fZ74gmBe4AYFwb7nu/f58X4A
-0tzSg2M4spWM7N4tzf+YbcUipRt9sEISxwfUxNNWTKnLxvCmkzOsISisukdzTkqJ
-fdzEcPfhO2BZKOdmlg1hAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAjUl3ami01tPY
-P1vMp2642dsIKLZis0TmeWp6HNpm52TbiGZOCqDrvtSQ9+2vGz0BkHvGqWKtD+wv
-zJH23fNnqFuzy1C1xtjoeqhXECTsWVTVdoEox8hSWxPiYRE2dioraZQQ5ENDosh+
-V9YcqJJpnKDUOSGVGuyaU7DpR8yK0pc=
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server_key.pem b/TAO/orbsvcs/tests/Security/Big_Request/server_key.pem
deleted file mode 100644
index 567a41da6dc..00000000000
--- a/TAO/orbsvcs/tests/Security/Big_Request/server_key.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDSl5rnVoi1bv83QZUq9P3Za6UXviHtunD8jKOZSomDWO+7QAU4
-jl3uai1BK8o0P32e+IJgXuAGBcG+57v3+fF+ANLc0oNjOLKVjOzeLc3/mG3FIqUb
-fbBCEscH1MTTVkypy8bwppMzrCEorLpHc05KiX3cxHD34TtgWSjnZpYNYQIDAQAB
-AoGAC/TxpZrjLjH8KZ3+oy6/zv1upTd1Y7MHQT+W9lgmEKAXFHGhGkHzEVtT8HRV
-CbxlHIaNmH0qiQ0AoB82K/E0BdIMvE+y2qQwlpMfBMX6/TACORReJN3NXGsXwHP4
-/pNlS4LX7/NZbxlReAlDNP+FO8sdKZTyM3VXHFWJbmm4wsECQQD06zQ4uthp0zI9
-WTZiiAUgYwOcnLnXwfWOLAr8RCnYgwiS7MBCcmhZAgWX5SZJYVCwEJ12DAHy02NJ
-EhiSgo+JAkEA3B7PcS5FqZFi6wVjEG6yF8OuSb/rl+FZfV6utZdCVdMPxacEVxlD
-q7H/dk23O4WwASBriU0PR9/KG3T/LvKBGQJAaYRn1EUTdcxKqcmkt6CYbNKbvL59
-BqqGq4DoHrUTPjd92ybq0fXOZQKM/Fr6OsUVaTVPUYtsz3wpG1MTiRN82QJACX6+
-vggb8yuVU8QAuPW9cu769q1zsTKEVLcf3C9xKhiXppQEyOkLFT3xYh4KGGQ06meG
-m/6Z+SS7KCIM2+6UCQJBANHIzgxDWtrLuWJviNh9EbCsdMioxBH+LGaqFKLC70xD
-Pyoqn+QJQu/ekT+FUb0BeFJfGPzFjh1mFYn4tXxWqMs=
------END RSA PRIVATE KEY-----
diff --git a/TAO/orbsvcs/tests/Security/Callback/Callback.mpc b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
deleted file mode 100644
index e2a379ae985..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
+++ /dev/null
@@ -1,40 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*idl): taoidldefaults {
-  IDL_Files {
-    server.idl
-    client.idl
-  }
-  custom_only = 1
-}
-
-project(*security server): taoexe, portableserver, ssl {
-  after += *idl
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    clientC.cpp
-    serverC.cpp
-    serverS.cpp
-    server_i.cpp
-    server.cpp
-  }
-}
-
-project(*security client): taoexe, portableserver, ssl {
-  after += *idl
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    clientC.cpp
-    clientS.cpp
-    serverC.cpp
-    client_i.cpp
-    client.cpp
-  }
-}
diff --git a/TAO/orbsvcs/tests/Security/Callback/Makefile.am b/TAO/orbsvcs/tests/Security/Callback/Makefile.am
deleted file mode 100644
index 43e645ea98f..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/Makefile.am
+++ /dev/null
@@ -1,154 +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.Callback_Idl.am
-
-BUILT_SOURCES = \
-  serverC.cpp \
-  serverC.h \
-  serverC.inl \
-  serverS.cpp \
-  serverS.h \
-  serverS.inl
-
-CLEANFILES = \
-  server-stamp \
-  serverC.cpp \
-  serverC.h \
-  serverC.inl \
-  serverS.cpp \
-  serverS.h \
-  serverS.inl
-
-serverC.cpp serverC.h serverC.inl serverS.cpp serverS.h serverS.inl: server-stamp
-
-server-stamp: $(srcdir)/server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/server.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  clientC.cpp \
-  clientC.h \
-  clientC.inl \
-  clientS.cpp \
-  clientS.h \
-  clientS.inl
-
-CLEANFILES += \
-  client-stamp \
-  clientC.cpp \
-  clientC.h \
-  clientC.inl \
-  clientS.cpp \
-  clientS.h \
-  clientS.inl
-
-clientC.cpp clientC.h clientC.inl clientS.cpp clientS.h clientS.inl: client-stamp
-
-client-stamp: $(srcdir)/client.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/client.idl
-	@touch $@
-
-
-noinst_HEADERS = \
-  client.idl \
-  server.idl
-
-## Makefile.Callback_Security_Client.am
-
-if BUILD_SSL
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-client_SOURCES = \
-  client.cpp \
-  clientC.cpp \
-  clientS.cpp \
-  client_i.cpp \
-  serverC.cpp \
-  client_i.h
-
-client_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-client_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_SSL
-
-## Makefile.Callback_Security_Server.am
-
-if BUILD_SSL
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  clientC.cpp \
-  server.cpp \
-  serverC.cpp \
-  serverS.cpp \
-  server_i.cpp \
-  server_i.h
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_SSL
-
-## 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/Security/Callback/README b/TAO/orbsvcs/tests/Security/Callback/README
deleted file mode 100644
index 5c8153c6672..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/README
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# $Id$
-#
-
-This test is designed to excercise the connection cache related code
-in a complex pluggable protocol such as SSLIOP.
-
-An object reference is sent to the target as an "in" parameter.  The
-target then uses that object reference to invoke a callback method on
-an object residing at the client.
-
-If the secure connection is not cached properly, then it will not be
-possible to invoke the callback method on the client.
diff --git a/TAO/orbsvcs/tests/Security/Callback/cacert.pem b/TAO/orbsvcs/tests/Security/Callback/cacert.pem
deleted file mode 100644
index a9e905f4e6c..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/cacert.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDfTCCAuagAwIBAgIBADANBgkqhkiG9w0BAQQFADCBjDELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkNBMQ8wDQYDVQQHEwZJcnZpbmUxEjAQBgNVBAoTCURPQyBHcm91
-cDEQMA4GA1UECxYHVUNJX0RPQzERMA8GA1UEAxMIUHJpeWFua2ExJjAkBgkqhkiG
-9w0BCQEWF3Bnb250bGFAZG9jLmVjZS51Y2kuZWR1MB4XDTAxMDYxMTE3MjI0MVoX
-DTExMDYwOTE3MjI0MVowgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyFiCRDUH
-nGJqQG9jT/2PhZUAgfwXvIwfDM8m/WujCt/buDcrOz767shBsk4HZhW91Vm4mE03
-K1zfCzojRigf28uyB/rlp60p2Fq0wvZBNNU5Muia6esleR4unb4QslOpcFhct/9n
-UPnlnnsZOTaGWaELNKEjYfHqPh8PQ0lYurECAwEAAaOB7DCB6TAdBgNVHQ4EFgQU
-0Y6IZjkLbLbtZ5aoKLcfd7Yc/kYwgbkGA1UdIwSBsTCBroAU0Y6IZjkLbLbtZ5ao
-KLcfd7Yc/kahgZKkgY8wgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GB
-AHYi8ulIzUI3p3+Ma16rumZxvKcmkJJbU6fpAv4ZvK6AWyy+6Ja0GD5N3SGEx+xU
-nMffTR+LePa9PAZiR7dNkF6ikPxXZu4jn8KY2zFT3SB/VjCoEetR9i9QI//O0Fea
-3yZ0NygNWe5cyVDLCb4meucJpsClfyL28DWzMwD2liX3
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.conf b/TAO/orbsvcs/tests/Security/Callback/client.conf
deleted file mode 100644
index 5847fa22a03..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/client.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-
-dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"
-static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.conf.xml b/TAO/orbsvcs/tests/Security/Callback/client.conf.xml
deleted file mode 100644
index c82a523bd48..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/client.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./orbsvcs/tests/Security/Callback/client.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <dynamic id="SSLIOP_Factory" type="Service_Object">
-   <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/>
- </dynamic>
- <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
-</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp
deleted file mode 100644
index 2ddfbc0be3d..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/client.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-#include "ace/Log_Msg.h"
-#include "serverC.h"
-#include "client_i.h"
-#include "ace/SString.h"
-
-ACE_RCSID (Callback,
-           client,
-           "$Id$")
-
-const char *cert_file = "cacert.pem";
-
-int
-main (int argc, char *argv[])
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      ACE_TString env ("SSL_CERT_FILE=");
-      env += cert_file;
-      ACE_OS::putenv (env.c_str ());
-
-      //
-      // Initialize the ORB
-      //
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      //
-      // Get the Root POA.
-      //
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      //
-      // Get a reference to the server.
-      //
-      obj = orb->string_to_object ("file://server.ior"
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (obj.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("(%P) orb->string_to_object ")
-                             ACE_TEXT ("(\"file://server.ior\") failed.\n")),
-                            -1);
-        }
-
-      //
-      // Downcast the IOR to the appropriate object type.
-      //
-      server_var server_obj =
-        server::_narrow (obj.in ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server_obj.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("(%P) server::_narrow(obj) failed.\n")),
-                            -1);
-        }
-
-      //
-      // Create and activate the client.
-      //
-      client_i *servant = 0;
-      ACE_NEW_RETURN (servant,
-                      client_i (server_obj.in ()),
-                      -1);
-      PortableServer::ServantBase_var theClient = servant;
-
-      client_var client_ref = servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      //
-      // Activate the POA manager.
-      //
-      PortableServer::POAManager_var mgr =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      //
-      // Set the server's callback and invoke the test request.
-      //
-      server_obj->set_client (client_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      server_obj->test_request ("first secure callback to client"
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      //
-      // Repeat the callback test.
-      //
-      server_obj->set_client (client_ref.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      server_obj->test_request ("second secure callback to client"
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      server_obj->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      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,
-                           ACE_TEXT ("Caught exception\n"));
-
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.idl b/TAO/orbsvcs/tests/Security/Callback/client.idl
deleted file mode 100644
index 9ac07bd3cd5..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/client.idl
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-// Client interface definition.
-//
-// $Id$
-//
-
-
-interface client
-{
-  void test_reply (in string msg);
-};
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_cert.pem b/TAO/orbsvcs/tests/Security/Callback/client_cert.pem
deleted file mode 100644
index 0bebb696cfc..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/client_cert.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICgzCCAewCAQYwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExODEwMzRaFw0xMTA2
-MDkxODEwMzRaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEQMA4GA1UEChMHVEFPK09DSTEMMAoGA1UECxMDT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL6f8pBX7Mi3FPY/OYBOq+kb
-wQ3WX0Z8+nDxd7AiWDAx2AL5EaX8xnUiRi96OJ+CYPCYOUlavGVzZkRVMFdOuHAn
-RvY2sCpvU2rkKpEx9Pd50l7FLnXJuflnRc6zIEKOvuQcPJvsP4AaxaFxTnZExXQJ
-kDEiQP3mGID/eXtUzywbAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAuvSoOnMB6sxj
-ft9YbdLeyATTPzHbxAb6zQo72DUmM3roNowUrefHymU8jZoC6HeaROeKCU0MkVes
-l/jYlz/OwSYkbyGNIUkq4DHEWKzXEg8M603fsWK6IK3T5iPBHY+l/mYSEHJPfypZ
-fl/y4YSNJZlrz6kCIHTcwfHXDRC1mjM=
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
deleted file mode 100644
index ff5ecb97cb4..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "ace/Log_Msg.h"
-#include "client_i.h"
-
-ACE_RCSID (Callback,
-           client_i,
-           "$Id$")
-
-client_i::client_i (server_ptr s)
-  : server_ (server::_duplicate (s))
-{
-}
-
-client_i::~client_i (void)
-{
-}
-
-void
-client_i::test_reply (const char *msg
-                      ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG((LM_INFO,
-             ACE_TEXT("(%N) message received was ")
-             ACE_TEXT("(%s)\n"),
-             msg));
-}
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.h b/TAO/orbsvcs/tests/Security/Callback/client_i.h
deleted file mode 100644
index e5d6603aca9..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file client_i.h
- *
- * $Id$ *
- * Header for the SSLIOP Callback test client callback implementation.
- *
- * @author Robert Martin <martin_r@ociweb.com>
- */
-//=============================================================================
-
-#ifndef CLIENT_I_H
-#define CLIENT_I_H
-
-#include "clientS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "serverC.h"
-
-class client_i
-  : public virtual POA_client
-{
-public:
-
-  client_i (server_ptr s);
-  virtual ~client_i (void);
-
-  virtual void test_reply (const char *msg
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
-  server_var server_;
-
-};
-
-#endif  /* CLIENT_I_H */
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_key.pem b/TAO/orbsvcs/tests/Security/Callback/client_key.pem
deleted file mode 100644
index 1428b501712..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/client_key.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC+n/KQV+zItxT2PzmATqvpG8EN1l9GfPpw8XewIlgwMdgC+RGl
-/MZ1IkYvejifgmDwmDlJWrxlc2ZEVTBXTrhwJ0b2NrAqb1Nq5CqRMfT3edJexS51
-ybn5Z0XOsyBCjr7kHDyb7D+AGsWhcU52RMV0CZAxIkD95hiA/3l7VM8sGwIDAQAB
-AoGABGaa6fwtqkCXykuRX0XxsBME9PXTA0SVX5AjjDxuvsYXz5HCd4uLZV7iMexn
-bD9NT6CkCe5/VPRCEyfIUuutVFc7lkPwuRw5FvNcf4gMH9ltufQfH/KeR7d2Jvge
-zrTOH7nicshy67mfOEOaoDphWoT9uy+7ayym+EsJLJU37VkCQQD6xLRu5r9tKX2/
-NfIQsGxF3TZyXgxcuxMh9JOq5E9nBwhr1JaXDbXktXfIK/F3XWHLFS8CIg6PhgGY
-i/+UtGzvAkEAwpoHp89U2jLdVRoIcwy5o7Ocwk3HCXem3UgFWXzzunGM1x+ozDFA
-uo5nyXiAO6Buka9C2czje275kE18BbqLlQJBAMJNf/EeYdzXdVOfHPzJdlt72CAt
-ty5y1ZRNyc10MgIGdQP4KObJ/NJFuZYkVmjCtm+A7neco+OZVcs5TsOOOYkCQBHQ
-6EKEyM/xODJCX+OolpZWK1PeqwpC2hQIM/Uta2L2Yl6Pl3SaTcLGptnbHmJXHchY
-s1YdW/ZBArgjX+dmXMECQApTKWbVLmNsEoOlHU/I/KhGsfuojrzBMMe3FKLiHpmu
-u86L3vu3OGZFcPgjazxWZcip8JekeJ7c+6suLNNRQ5I=
------END RSA PRIVATE KEY-----
diff --git a/TAO/orbsvcs/tests/Security/Callback/run_test.pl b/TAO/orbsvcs/tests/Security/Callback/run_test.pl
deleted file mode 100755
index 910425441aa..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/run_test.pl
+++ /dev/null
@@ -1,54 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-# $Id$
-
-use lib  '../../../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-$file = PerlACE::LocalFile ("server.ior");
-
-unlink $file;
-
-$status = 0;
-
-# Set the SSL environment
-# This doesn't work on Windows.  For some reason,
-# environment variables aren't propagated to child processes.
-#$ENV{'SSL_CERT_FILE'} = 'cacert.pem';
-
-$SV = new PerlACE::Process ("server",
-			    "-o $file -ORBSvcConf server$PerlACE::svcconf_ext");
-$CL = new PerlACE::Process ("client",
-			    "-ORBSvcConf client$PerlACE::svcconf_ext");
-
-print STDERR "\n\n==== Running SSLIOP Callback test\n";
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$file>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $file;
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.conf b/TAO/orbsvcs/tests/Security/Callback/server.conf
deleted file mode 100644
index ee0ef1aa57c..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/server.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-
-dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"
-static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.conf.xml b/TAO/orbsvcs/tests/Security/Callback/server.conf.xml
deleted file mode 100644
index dab23b5d802..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/server.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./orbsvcs/tests/Security/Callback/server.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <dynamic id="SSLIOP_Factory" type="Service_Object">
-   <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/>
- </dynamic>
- <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
-</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp
deleted file mode 100644
index 881d7d2ca58..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/server.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-#include "ace/Log_Msg.h"
-#include "server_i.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/SString.h"
-
-ACE_RCSID (Callback,
-           server,
-           "$Id$")
-
-const char *cert_file = "cacert.pem";
-
-int
-main (int argc, char *argv[])
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      ACE_TString env ("SSL_CERT_FILE=");
-      env += cert_file;
-      ACE_OS::putenv (env.c_str ());
-
-      //
-      // Initialize the ORB
-      //
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      //
-      // Get the Root POA.
-      //
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      //
-      // Create the server, get object reference,
-      // and create "stringified" IOR.
-      //
-      server_i *tmp = 0;
-      ACE_NEW_RETURN (tmp,
-                      server_i (orb.in ()),
-                      -1);
-      PortableServer::ServantBase_var theServer = tmp;
-
-      PortableServer::ObjectId_var oid =
-        poa->activate_object (theServer.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CORBA::Object_var server_obj =
-        poa->id_to_reference (oid.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CORBA::String_var server_IORString =
-        orb->object_to_string (server_obj.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      //
-      // Write the IOR to a file.
-      //
-      // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen ("server.ior", "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR\n"),
-                            -1);
-      ACE_OS::fprintf (output_file, "%s", server_IORString.in ());
-      ACE_OS::fclose (output_file);
-
-      //
-      // Activate the POA manager.
-      //
-      PortableServer::POAManager_var mgr =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_INFO,
-                  ACE_TEXT ("(%P) calling orb->run () ...\n")));
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      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,
-                           ACE_TEXT ("Caught exception\n"));
-
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.idl b/TAO/orbsvcs/tests/Security/Callback/server.idl
deleted file mode 100644
index 66e11c7fa4b..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/server.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// Server interface definition.
-//
-// $Id$
-//
-
-#include "client.idl"
-
-interface server
-{
-  void set_client (in client c);
-  void test_request (in string msg);
-  oneway void shutdown ();
-};
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_cert.pem b/TAO/orbsvcs/tests/Security/Callback/server_cert.pem
deleted file mode 100644
index 0fc394c24d7..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/server_cert.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICgzCCAewCAQMwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExNzQ4NTVaFw0xMTA2
-MDkxNzQ4NTVaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEMMAoGA1UEChMDT0NJMRAwDgYDVQQLEwdUQU8rT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANKXmudWiLVu/zdBlSr0/dlr
-pRe+Ie26cPyMo5lKiYNY77tABTiOXe5qLUEryjQ/fZ74gmBe4AYFwb7nu/f58X4A
-0tzSg2M4spWM7N4tzf+YbcUipRt9sEISxwfUxNNWTKnLxvCmkzOsISisukdzTkqJ
-fdzEcPfhO2BZKOdmlg1hAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAjUl3ami01tPY
-P1vMp2642dsIKLZis0TmeWp6HNpm52TbiGZOCqDrvtSQ9+2vGz0BkHvGqWKtD+wv
-zJH23fNnqFuzy1C1xtjoeqhXECTsWVTVdoEox8hSWxPiYRE2dioraZQQ5ENDosh+
-V9YcqJJpnKDUOSGVGuyaU7DpR8yK0pc=
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
deleted file mode 100644
index f4a66db526f..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "server_i.h"
-
-ACE_RCSID (Callback,
-           server_i,
-           "$Id$")
-
-server_i::server_i (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb)),
-    client_ ()
-{
-}
-
-server_i::~server_i (void)
-{
-}
-
-void
-server_i::set_client (client_ptr c
-                      ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->client_ = client::_duplicate (c);
-}
-
-void
-server_i::test_request (const char *msg
-                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->client_->test_reply (msg ACE_ENV_ARG_PARAMETER);
-}
-
-void
-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/orbsvcs/tests/Security/Callback/server_i.h b/TAO/orbsvcs/tests/Security/Callback/server_i.h
deleted file mode 100644
index 443bd091a04..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file server_i.h
- *
- * $Id$
- *
- * Header for the SSLIOP Callback test server implementation.
- *
- * @author Robert Martin <martin_r@ociweb.com>
- */
-//=============================================================================
-
-#ifndef SERVER_I_H
-#define SERVER_I_H
-
-#include "serverS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-class server_i
-  : public virtual POA_server
-{
-public:
-
-  server_i (CORBA::ORB_ptr orb);
-  virtual ~server_i (void);
-
-  virtual void set_client (client_ptr c
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void test_request (const char *msg
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
-  CORBA::ORB_var orb_;
-
-  client_var client_;
-
-};
-
-#endif  /* SERVER_I_H */
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_key.pem b/TAO/orbsvcs/tests/Security/Callback/server_key.pem
deleted file mode 100644
index 567a41da6dc..00000000000
--- a/TAO/orbsvcs/tests/Security/Callback/server_key.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDSl5rnVoi1bv83QZUq9P3Za6UXviHtunD8jKOZSomDWO+7QAU4
-jl3uai1BK8o0P32e+IJgXuAGBcG+57v3+fF+ANLc0oNjOLKVjOzeLc3/mG3FIqUb
-fbBCEscH1MTTVkypy8bwppMzrCEorLpHc05KiX3cxHD34TtgWSjnZpYNYQIDAQAB
-AoGAC/TxpZrjLjH8KZ3+oy6/zv1upTd1Y7MHQT+W9lgmEKAXFHGhGkHzEVtT8HRV
-CbxlHIaNmH0qiQ0AoB82K/E0BdIMvE+y2qQwlpMfBMX6/TACORReJN3NXGsXwHP4
-/pNlS4LX7/NZbxlReAlDNP+FO8sdKZTyM3VXHFWJbmm4wsECQQD06zQ4uthp0zI9
-WTZiiAUgYwOcnLnXwfWOLAr8RCnYgwiS7MBCcmhZAgWX5SZJYVCwEJ12DAHy02NJ
-EhiSgo+JAkEA3B7PcS5FqZFi6wVjEG6yF8OuSb/rl+FZfV6utZdCVdMPxacEVxlD
-q7H/dk23O4WwASBriU0PR9/KG3T/LvKBGQJAaYRn1EUTdcxKqcmkt6CYbNKbvL59
-BqqGq4DoHrUTPjd92ybq0fXOZQKM/Fr6OsUVaTVPUYtsz3wpG1MTiRN82QJACX6+
-vggb8yuVU8QAuPW9cu769q1zsTKEVLcf3C9xKhiXppQEyOkLFT3xYh4KGGQ06meG
-m/6Z+SS7KCIM2+6UCQJBANHIzgxDWtrLuWJviNh9EbCsdMioxBH+LGaqFKLC70xD
-Pyoqn+QJQu/ekT+FUb0BeFJfGPzFjh1mFYn4tXxWqMs=
------END RSA PRIVATE KEY-----
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am
deleted file mode 100644
index 769f94456f8..00000000000
--- a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am
+++ /dev/null
@@ -1,152 +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.Security_Crash_Test_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.Security_Crash_Test_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-client_SOURCES = \
-  client.cpp \
-  testC.cpp \
-  test_i.h \
-  test_i.i
-
-client_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.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 \
-  @ACE_TLS_LIBS@
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Security_Crash_Test_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-if !BUILD_ACE_FOR_TAO
-
-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 \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  test_i.h \
-  test_i.i
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.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 \
-  @ACE_TLS_LIBS@
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-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/TAO/orbsvcs/tests/Security/Crash_Test/README b/TAO/orbsvcs/tests/Security/Crash_Test/README
deleted file mode 100644
index e284c627fd1..00000000000
--- a/TAO/orbsvcs/tests/Security/Crash_Test/README
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# $Id$
-#
-
-This test verifies that the ORB's connection management mechanism is
-functioning properly while using SSLIOP as inter-orb protocol.  
-It does so by doing the following:
-
-	- Starting server with persisten POA.
-
-	- Starting client which makes series of invocations using
-	  SSLIOP.
-
-	- Crashing the server.
-
-	- The client waits for the server to come back and
-	  tries to connect using the same IOR.
-
-To run the test simply execute run_test.pl
-
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc b/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
deleted file mode 100644
index 7229bd380e4..00000000000
--- a/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*server): taoexe, portableserver, ssliop, pi_server, codecfactory, interceptors {
-  after += *idl
-  Source_Files {
-    server.cpp
-    test_i.cpp
-    testS.cpp
-    testC.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*client): taoexe, portableserver, ssliop, pi_server, codecfactory, interceptors {
-  after += *idl
-  Source_Files {
-    client.cpp
-    testC.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/cacert.pem b/TAO/orbsvcs/tests/Security/Crash_Test/cacert.pem
deleted file mode 100644
index a9e905f4e6c..00000000000
--- a/TAO/orbsvcs/tests/Security/Crash_Test/cacert.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDfTCCAuagAwIBAgIBADANBgkqhkiG9w0BAQQFADCBjDELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkNBMQ8wDQYDVQQHEwZJcnZpbmUxEjAQBgNVBAoTCURPQyBHcm91
-cDEQMA4GA1UECxYHVUNJX0RPQzERMA8GA1UEAxMIUHJpeWFua2ExJjAkBgkqhkiG
-9w0BCQEWF3Bnb250bGFAZG9jLmVjZS51Y2kuZWR1MB4XDTAxMDYxMTE3MjI0MVoX
-DTExMDYwOTE3MjI0MVowgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyFiCRDUH
-nGJqQG9jT/2PhZUAgfwXvIwfDM8m/WujCt/buDcrOz767shBsk4HZhW91Vm4mE03
-K1zfCzojRigf28uyB/rlp60p2Fq0wvZBNNU5Muia6esleR4unb4QslOpcFhct/9n
-UPnlnnsZOTaGWaELNKEjYfHqPh8PQ0lYurECAwEAAaOB7DCB6TAdBgNVHQ4EFgQU
-0Y6IZjkLbLbtZ5aoKLcfd7Yc/kYwgbkGA1UdIwSBsTCBroAU0Y6IZjkLbLbtZ5ao
-KLcfd7Yc/kahgZKkgY8wgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GB
-AHYi8ulIzUI3p3+Ma16rumZxvKcmkJJbU6fpAv4ZvK6AWyy+6Ja0GD5N3SGEx+xU
-nMffTR+LePa9PAZiR7dNkF6ikPxXZu4jn8KY2zFT3SB/VjCoEetR9i9QI//O0Fea
-3yZ0NygNWe5cyVDLCb4meucJpsClfyL28DWzMwD2liX3
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.conf b/TAO/orbsvcs/tests/Security/Crash_Test/client.conf
deleted file mode 100644
index 5847fa22a03..00000000000
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-
-dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"
-static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
deleted file mode 100644
index dd70e280f98..00000000000
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "ace/Read_Buffer.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/SString.h"
-#include "testC.h"
-
-ACE_RCSID (Send_File, 
-           client, 
-           "$Id$")
-
-const char *ior = "file://test.ior";
-const char *cert_file = "cacert.pem";
-
-CORBA::Boolean call_shutdown = 0;
-int wait_time = 10;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "sk:w:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-      case 's':
-        call_shutdown = 1;
-        break;
-      case 'w':
-        wait_time = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "CLIENT (%P): usage:  %s "
-                           "-k <ior> [-s] -w <wait-time>"
-                           "\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
-    {
-      ACE_TString env ("SSL_CERT_FILE=");
-      env += cert_file;
-      ACE_OS::putenv (env.c_str ());
-
-      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,
-                             "CLIENT (%P): Object reference <%s> is nil\n",
-                             ior),
-                            1);
-        }
-
-      for (CORBA::ULong i = 0; i < 2; i++)
-        {
-          ACE_TRY_EX(nested_try)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "CLIENT (%P): Connecting to the server...\n"));
-
-              // If we are retrying then make just one request.
-              do
-                {
-                  server->send_line ("some data" ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK_EX (nested_try);
-
-                }
-              while (i == 0);
-            }
-          ACE_CATCH (CORBA::COMM_FAILURE, ex)
-            {
-              // If this happens second time then we are done.
-              if (i != 0) ACE_RE_THROW;
-
-              // Waiting for server to come back
-              ACE_DEBUG ((LM_DEBUG,
-                          "CLIENT (%P): Caught CORBA::COMM_FAILURE. "
-                          "Assuming server crashed and will come up soon.\n"
-                          "CLIENT (%P): Waiting for %d seconds...\n",
-                          wait_time));
-              ACE_OS::sleep (wait_time);
-            }
-          ACE_ENDTRY;
-          ACE_TRY_CHECK;
-        }
-
-      if (call_shutdown)
-        {
-
-          // Let other clients to finish their task if any
-          ACE_OS::sleep (3);
-
-          ACE_DEBUG ((LM_DEBUG,
-                      "CLIENT (%P): Calling shutdown...\n"));
-
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "CLIENT (%P): Done.\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "CLIENT (%P): Caught exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client_cert.pem b/TAO/orbsvcs/tests/Security/Crash_Test/client_cert.pem
deleted file mode 100644
index 0bebb696cfc..00000000000
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client_cert.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICgzCCAewCAQYwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExODEwMzRaFw0xMTA2
-MDkxODEwMzRaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEQMA4GA1UEChMHVEFPK09DSTEMMAoGA1UECxMDT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL6f8pBX7Mi3FPY/OYBOq+kb
-wQ3WX0Z8+nDxd7AiWDAx2AL5EaX8xnUiRi96OJ+CYPCYOUlavGVzZkRVMFdOuHAn
-RvY2sCpvU2rkKpEx9Pd50l7FLnXJuflnRc6zIEKOvuQcPJvsP4AaxaFxTnZExXQJ
-kDEiQP3mGID/eXtUzywbAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAuvSoOnMB6sxj
-ft9YbdLeyATTPzHbxAb6zQo72DUmM3roNowUrefHymU8jZoC6HeaROeKCU0MkVes
-l/jYlz/OwSYkbyGNIUkq4DHEWKzXEg8M603fsWK6IK3T5iPBHY+l/mYSEHJPfypZ
-fl/y4YSNJZlrz6kCIHTcwfHXDRC1mjM=
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client_key.pem b/TAO/orbsvcs/tests/Security/Crash_Test/client_key.pem
deleted file mode 100644
index 1428b501712..00000000000
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client_key.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC+n/KQV+zItxT2PzmATqvpG8EN1l9GfPpw8XewIlgwMdgC+RGl
-/MZ1IkYvejifgmDwmDlJWrxlc2ZEVTBXTrhwJ0b2NrAqb1Nq5CqRMfT3edJexS51
-ybn5Z0XOsyBCjr7kHDyb7D+AGsWhcU52RMV0CZAxIkD95hiA/3l7VM8sGwIDAQAB
-AoGABGaa6fwtqkCXykuRX0XxsBME9PXTA0SVX5AjjDxuvsYXz5HCd4uLZV7iMexn
-bD9NT6CkCe5/VPRCEyfIUuutVFc7lkPwuRw5FvNcf4gMH9ltufQfH/KeR7d2Jvge
-zrTOH7nicshy67mfOEOaoDphWoT9uy+7ayym+EsJLJU37VkCQQD6xLRu5r9tKX2/
-NfIQsGxF3TZyXgxcuxMh9JOq5E9nBwhr1JaXDbXktXfIK/F3XWHLFS8CIg6PhgGY
-i/+UtGzvAkEAwpoHp89U2jLdVRoIcwy5o7Ocwk3HCXem3UgFWXzzunGM1x+ozDFA
-uo5nyXiAO6Buka9C2czje275kE18BbqLlQJBAMJNf/EeYdzXdVOfHPzJdlt72CAt
-ty5y1ZRNyc10MgIGdQP4KObJ/NJFuZYkVmjCtm+A7neco+OZVcs5TsOOOYkCQBHQ
-6EKEyM/xODJCX+OolpZWK1PeqwpC2hQIM/Uta2L2Yl6Pl3SaTcLGptnbHmJXHchY
-s1YdW/ZBArgjX+dmXMECQApTKWbVLmNsEoOlHU/I/KhGsfuojrzBMMe3FKLiHpmu
-u86L3vu3OGZFcPgjazxWZcip8JekeJ7c+6suLNNRQ5I=
------END RSA PRIVATE KEY-----
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl b/TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl
deleted file mode 100755
index 512fc0883d9..00000000000
--- a/TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl
+++ /dev/null
@@ -1,116 +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 ("server.ior");
-unlink $iorfile;
-
-$server_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext");
-$client_conf = PerlACE::LocalFile ("client$PerlACE::svcconf_ext");
-
-$server_startup_wait_time = 5; 
-$client_wait_time         = 15;
-
-$client_args = "-ORBSvcConf $client_conf -w $client_wait_time -k file://$iorfile";
-
-# Set the SSL environment
-# This doesn't work on Windows.  For some reason,
-# environment variables aren't propagated to child processes.
-#$ENV{'SSL_CERT_FILE'} = 'cacert.pem';
-
-$SV = new PerlACE::Process ("server",
-			    "-o $iorfile " .
-			    "-ORBSvcConf $server_conf " .
-			    "-ORBdotteddecimaladdresses 1 " .
-			    "-ORBEndpoint iiop://:/ssl_port=1235");
-
-$CL1 = new PerlACE::Process ("client", "-s $client_args");
-$CL2 = new PerlACE::Process ("client", "$client_args");
-$CL3 = new PerlACE::Process ("client", "$client_args");
-
-
-local $start_time = time();
-local $max_running_time = 500; # < 10 minutes
-local $elapsed = time() - $start_time;
-
-while($status == 0 && $elapsed < $max_running_time)
-{
-    # Start the server
-    $SV->Spawn ();
-
-    if (PerlACE::waitforfile_timed ($iorfile, $server_startup_wait_time) == -1)
-    {
-	print STDERR "ERROR: cannot find file <$iorfile>\n";
-	$SV->Kill (); $SV->TimedWait (1);
-	exit 1;
-    }
-
-    # Start all clients in parallel
-    $CL1->Spawn ();
-    $CL2->Spawn ();
-    $CL3->Spawn ();
-
-    # Let our clients to execute few requests
-    sleep (3);
-
-    # Now kill the server and start it again.
-    $SV->Kill ();
-    $SV->TimedWait (5);
-    
-    unlink $iorfile;
-    
-    $SV->Spawn ();
-
-    if (PerlACE::waitforfile_timed ($iorfile, $server_startup_wait_time) == -1)
-    {
-	print STDERR "ERROR: cannot find file <$iorfile>\n";
-	$SV->Kill (); $SV->TimedWait (1);
-	exit 1;
-    }
-
-    # Wait for the server and clients to finish
-
-    # Waiting for the first client longer because it waits for others and shutdowns the server.
-    $client1 = $CL1->WaitKill ($client_wait_time * 2); 
-    $client2 = $CL2->WaitKill ($client_wait_time * 2);
-    $client3 = $CL3->WaitKill ($client_wait_time * 2);
-    $server = $SV->WaitKill (5); # should be down already
-
-    unlink $iorfile;
-
-    if ($client1)
-    {
-	print STDERR "ERROR: client #1 returned $client1\n";
-	$status = 1;
-    }
-
-    if ($client2)
-    {
-	print STDERR "ERROR: client #2 returned $client2\n";
-	$status = 1;
-    }
-
-    if ($client3)
-    {
-	print STDERR "ERROR: client #3 returned $client3\n";
-	$status = 1;
-    }
-
-    if ($server)
-    {
-	print STDERR "ERROR: server returned $server\n";
-	$status = 1;
-    }
-
-    $elapsed = time() - $start_time;
-}
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.conf b/TAO/orbsvcs/tests/Security/Crash_Test/server.conf
deleted file mode 100644
index ee0ef1aa57c..00000000000
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-
-dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"
-static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
deleted file mode 100644
index c880f1e4858..00000000000
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/SString.h"
-#include "test_i.h"
-
-ACE_RCSID (Send_File, 
-           server, 
-           "$Id$")
-
-const char *ior_output_file = 0;
-const char *cert_file = "cacert.pem";
-
-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,
-                           "SERVER (%P): usage:  %s "
-                           "-o <iorfile> -w <wait-time>"
-                           "\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
-    {
-      ACE_TString env ("SSL_CERT_FILE=");
-      env += cert_file;
-      ACE_OS::putenv (env.c_str ());
-
-      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,
-                           "SERVER (%P): 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 ());
-
-      CORBA::PolicyList policies (2);
-      policies.length (2);
-
-      policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var persistent_poa =
-        root_poa->create_POA ("PersistentPOA",
-                              poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::ObjectId_var oid =
-        PortableServer::string_to_ObjectId ("object1");
-      ACE_TRY_CHECK;
-
-      persistent_poa->activate_object_with_id (oid.in (),
-                                               &server_impl
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-
-      CORBA::Object_var server =
-        persistent_poa->create_reference_with_id (oid.in (),
-                                                  "IDL:Simple_Server:1.0"
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // 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,
-                               "SERVER (%P): 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);
-
-          ACE_DEBUG ((LM_DEBUG,
-                      "SERVER (%P): Activated as file://%s\n",
-                      ior_output_file));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "SERVER (%P): Activated as <%s>\n",
-                      ior.in ()));
-        }
-
-
-      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, "SERVER (%P): Event loop finished.\n"));
-
-      persistent_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_OS::sleep (1);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "SERVER (%P): Caught exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server_cert.pem b/TAO/orbsvcs/tests/Security/Crash_Test/server_cert.pem
deleted file mode 100644
index 0fc394c24d7..00000000000
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server_cert.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICgzCCAewCAQMwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExNzQ4NTVaFw0xMTA2
-MDkxNzQ4NTVaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEMMAoGA1UEChMDT0NJMRAwDgYDVQQLEwdUQU8rT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANKXmudWiLVu/zdBlSr0/dlr
-pRe+Ie26cPyMo5lKiYNY77tABTiOXe5qLUEryjQ/fZ74gmBe4AYFwb7nu/f58X4A
-0tzSg2M4spWM7N4tzf+YbcUipRt9sEISxwfUxNNWTKnLxvCmkzOsISisukdzTkqJ
-fdzEcPfhO2BZKOdmlg1hAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAjUl3ami01tPY
-P1vMp2642dsIKLZis0TmeWp6HNpm52TbiGZOCqDrvtSQ9+2vGz0BkHvGqWKtD+wv
-zJH23fNnqFuzy1C1xtjoeqhXECTsWVTVdoEox8hSWxPiYRE2dioraZQQ5ENDosh+
-V9YcqJJpnKDUOSGVGuyaU7DpR8yK0pc=
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server_key.pem b/TAO/orbsvcs/tests/Security/Crash_Test/server_key.pem
deleted file mode 100644
index 567a41da6dc..00000000000
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server_key.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDSl5rnVoi1bv83QZUq9P3Za6UXviHtunD8jKOZSomDWO+7QAU4
-jl3uai1BK8o0P32e+IJgXuAGBcG+57v3+fF+ANLc0oNjOLKVjOzeLc3/mG3FIqUb
-fbBCEscH1MTTVkypy8bwppMzrCEorLpHc05KiX3cxHD34TtgWSjnZpYNYQIDAQAB
-AoGAC/TxpZrjLjH8KZ3+oy6/zv1upTd1Y7MHQT+W9lgmEKAXFHGhGkHzEVtT8HRV
-CbxlHIaNmH0qiQ0AoB82K/E0BdIMvE+y2qQwlpMfBMX6/TACORReJN3NXGsXwHP4
-/pNlS4LX7/NZbxlReAlDNP+FO8sdKZTyM3VXHFWJbmm4wsECQQD06zQ4uthp0zI9
-WTZiiAUgYwOcnLnXwfWOLAr8RCnYgwiS7MBCcmhZAgWX5SZJYVCwEJ12DAHy02NJ
-EhiSgo+JAkEA3B7PcS5FqZFi6wVjEG6yF8OuSb/rl+FZfV6utZdCVdMPxacEVxlD
-q7H/dk23O4WwASBriU0PR9/KG3T/LvKBGQJAaYRn1EUTdcxKqcmkt6CYbNKbvL59
-BqqGq4DoHrUTPjd92ybq0fXOZQKM/Fr6OsUVaTVPUYtsz3wpG1MTiRN82QJACX6+
-vggb8yuVU8QAuPW9cu769q1zsTKEVLcf3C9xKhiXppQEyOkLFT3xYh4KGGQ06meG
-m/6Z+SS7KCIM2+6UCQJBANHIzgxDWtrLuWJviNh9EbCsdMioxBH+LGaqFKLC70xD
-Pyoqn+QJQu/ekT+FUb0BeFJfGPzFjh1mFYn4tXxWqMs=
------END RSA PRIVATE KEY-----
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test.idl b/TAO/orbsvcs/tests/Security/Crash_Test/test.idl
deleted file mode 100644
index a62d8becc91..00000000000
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test.idl
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * $Id$
- */
-
-interface Simple_Server
-{
-  void send_line (in string line);
-
-  oneway void shutdown ();
-};
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
deleted file mode 100644
index f1eff4cd4bb..00000000000
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-
-#if !defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (Send_File, 
-           test_i, 
-           "$Id$")
-
-void
-Simple_Server_i::send_line (const char *
-                            ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-
-  /*
-  static unsigned long count = 0;
-
-  count++;
-
-  if (count == 1)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                "Executed 128 requests. Now it's time to crash!\n"));
-    ACE_OS::abort ();
-  }
-  */
-
-  // ACE_DEBUG ((LM_DEBUG, "%s\n", line));
-}
-
-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/Security/Crash_Test/test_i.h b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
deleted file mode 100644
index 10b18e60116..00000000000
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Send_File
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
-
-#ifndef TAO_SEND_FILE_TEST_I_H
-#define TAO_SEND_FILE_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 send_line (const char *line
-                  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_;
-};
-
-#if defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_SEND_FILE_TEST_I_H */
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.i b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.i
deleted file mode 100644
index 97524552ff4..00000000000
--- a/TAO/orbsvcs/tests/Security/Crash_Test/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))
-{
-}
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
deleted file mode 100644
index ea6e49c399d..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// $Id$
-
-#include "Client_Worker.h"
-#include "tao/debug.h"
-
-Client_Worker::Client_Worker (Simple_Server_ptr server,
-                              int niterations)
-  : server_ (Simple_Server::_duplicate(server)),
-    niterations_ (niterations)
-{
-}
-
-void
-Client_Worker::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_->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if(TAO_debug_level > 0)
-            ACE_DEBUG (( LM_DEBUG,
-                         "******** VALIDATED ******* \n"));
-        }
-      ACE_CATCHANY
-        {
-        }
-      ACE_ENDTRY;
-   }
-}
-
-int
-Client_Worker::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // Validate connections befire doing any actual work..
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-       ACE_TRY_CHECK;
-
-       this->server_->validate_protocol (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)
-             ACE_DEBUG ((LM_DEBUG,
-                         " (%P|%t) iteration = %d\n",
-                         i));
-         }
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) Got an exception \n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client_Worker : Exception Raised");
-
-      return -1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
deleted file mode 100644
index c1f1015fb1b..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// $Id$
-
-// ===========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Security/MT_SSLIOP
-//
-// = FILENAME
-//   Client_Worker.h
-//
-// = AUTHOR
-//   Anand Krishnan
-//
-// ===========================================================================
-
-#ifndef MT_SSLIOP_CLIENT_WORKER_H
-#define MT_SSLIOP_CLIENT_WORKER_H
-#include /**/ "ace/pre.h"
-#include "ace/Task.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-#include "testC.h"
-
-
-class Client_Worker : public ACE_Task_Base
-{
-  // = TITLE
-  //   Run the Client_Worker Thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run the client threads
-  //
-
-public:
-  Client_Worker (Simple_Server_ptr server, int niterations);
-  // ctor
-
-  virtual int svc (void);
-  // 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.
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* MT_SSLIOP_CLIENT_WORKER_H */
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
deleted file mode 100644
index 9203ea80711..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
+++ /dev/null
@@ -1,33 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*idl) : taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*security server): orbsvcslib, portableserver, ssl, ssliop, pi_server, codecfactory, interceptors {
-  after += *idl
-  Source_Files {
-    Server_Worker.cpp
-    test_i.cpp
-    server.cpp
-    testS.cpp
-    testC.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*security client): orbsvcslib {
-  after += *idl
-  Source_Files {
-    testC.cpp
-    Client_Worker.cpp
-    client.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am
deleted file mode 100644
index 68fcc5c24a8..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am
+++ /dev/null
@@ -1,130 +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)
-
-
-## Makefile.MT_IIOP_SSL_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.MT_IIOP_SSL_Security_Client.am
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Client_Worker.cpp \
-  client.cpp \
-  testC.cpp \
-  Client_Worker.h \
-  test_i.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Makefile.MT_IIOP_SSL_Security_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-if !BUILD_ACE_FOR_TAO
-
-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 \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  Server_Worker.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_Worker.h \
-  test_i.h \
-  test_i.inl
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-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/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/README b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/README
deleted file mode 100644
index 1c182b4983a..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/README
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
-
-@page MT_IIOP_SSL Test README File
-
-	This is a stress test for the IIOP_SSL features.  This test should
-serve as a stress test for
-
-http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=1421
-
-        If SSL cannot be used (for whatever reason) we expect the
-communication to take place  over an insecure TCP/IP port. This test
-just makes sure that the fallback port actually works!
-
-	To run the test use the run_test.pl script:
-
-$ ./run_test.pl
-
-	the script returns 0 if the test was successful.
-
-@NOTE: 
-       
-       This test links *and* loads the SSLIOP library. They are needed
-due to the way the test is setup.
-
-*/
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
deleted file mode 100644
index cad95255acd..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-#include "Server_Worker.h"
-
-Server_Worker::Server_Worker (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-int
-Server_Worker::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h
deleted file mode 100644
index d2cb2b78e18..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Server_Worker.h
- *
- *  $Id$
- *
- *  @author Anand Krishnan
- */
-//=============================================================================
-
-#ifndef MT_SSLIOP_SERVER_WORKER_H
-#define MT_SSLIOP_SERVER_WORKER_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Task.h"
-#include "tao/ORB.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/**
- * @class Server_Worker
- *
- * @brief Run a server thread
- *
- * Use the ACE_Task_Base class to run server threads.
- */
-class Server_Worker : public ACE_Task_Base
-{
-public:
-
-  /// Constructor
-  Server_Worker (CORBA::ORB_ptr orb);
-
-  /// The thread entry point.
-  virtual int svc (void);
-
-
-private:
-  /// The ORB
-  CORBA::ORB_var orb_;
-
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-
-#endif /* MT_SSLIOP_SERVER_WORKER_H */
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf
deleted file mode 100644
index bf9048990f4..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-#$Id$
-dynamic SSLIOP_Factory Service_Object *
-        TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
-        "-SSLNoProtection -SSLAuthenticate  NONE"
-static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf.xml b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf.xml
deleted file mode 100644
index a39f09f3680..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.conf.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./orbsvcs/tests/Security/MT_SSLIOP/client.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <dynamic id="SSLIOP_Factory" type="Service_Object">
-   <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLCertificate PEM:selfsigncert.pem"/>
- </dynamic>
- <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
-</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
deleted file mode 100644
index 5da628db89d..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "Client_Worker.h"
-
-
-const char *ior = "file://test.ior";
-int niterations = 5;
-int do_shutdown = 0;
-int nthreads = 5;
-
-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':
-        do_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;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Initialize the ORB
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      // Get Object Reference using IOR file
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Cast to Appropriate Type
-      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_Worker client (server.in (), niterations);
-
-      if (client.activate (THR_NEW_LWP | THR_JOINABLE, nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                         " (%P|%t) Cannot Activate Client Threads\n"),
-                          1);
-
-      client.thr_mgr ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) threads finished \n"));
-
-      // Shut down the server if -x option given in command line
-      if (do_shutdown)
-        {
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      // Destroying the ORB..
-      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/orbsvcs/tests/Security/MT_IIOP_SSL/pvtkey.pem b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/pvtkey.pem
deleted file mode 100644
index 6facae6f3dd..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/pvtkey.pem
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBAPXZ7YNyFU8T8PVitNwZmdwuc4tG64V/lDYHnmzolmFPQ6gvI2uo
-KBQeHeJFPI6LJ5TGb8hCnypy+zbc+pve8vECAwEAAQJAE/fmZbW/a1PYT2X8AKCH
-sa2ILvjMqmQpWpYV1QyzIiYQPEmQ/5GMUj/t3PZd/17BOH8aPakBT/c1Gp+os6vR
-zQIhAP2RDmm6UyMrJhAtAcNC5s8nbfhKPG80Q0DZ2kiodjQfAiEA+DXqwEZlCh0j
-VPzEXY7vrdQa641zQ5XIX1S/+WbCdu8CIDT9m4V86uLuoYW/4h5sXM/t7Y119itH
-QMbMwFFu40UBAiEA9z+mN6An2BpMbsVXyiavREYMBuahkgprTeM7VHHzdssCIQCY
-QEgmpzGzfdZoREy9B7ooNeRO919lR9qvbte9vvJvWQ==
------END RSA PRIVATE KEY-----
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl
deleted file mode 100755
index 79f5fefc606..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/run_test.pl
+++ /dev/null
@@ -1,86 +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;
-$threads = '4';
-$iorfile = PerlACE::LocalFile ("test.ior");
-$sv_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext");
-$cl_conf = PerlACE::LocalFile ("client$PerlACE::svcconf_ext");
-
-unlink $iorfile;
-
-$SV = new PerlACE::Process ("server", "-ORBsvcconf $sv_conf -o $iorfile -n $threads");
-
-$CL1 = new PerlACE::Process 
-         ("client", "-k file://$iorfile -n $threads -i 100 -ORBSvcConf $cl_conf");
-$CL2 = new PerlACE::Process 
-         ("client", "-k file://$iorfile -n $threads -i 100 -ORBSvcConf $cl_conf");
-$CL3 = new PerlACE::Process 
-         ("client", "-k file://$iorfile -n $threads -i 100 -ORBSvcConf $cl_conf");
-
-$CLS = new PerlACE::Process 
-         ("client", "-k file://$iorfile -n $threads -i 100 -ORBSvcConf $cl_conf -x");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$CL1->Spawn ();
-$CL2->Spawn ();
-$CL3->Spawn ();
-
-$client = $CL1->WaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client 1 returned $client\n";
-    $status = 1;
-}
-
-$client = $CL2->WaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client 2 returned $client\n";
-    $status = 1;
-}
-
-$client = $CL3->WaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client 3 returned $client\n";
-    $status = 1;
-}
-
-$client = $CLS->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client S returned $client\n";
-    $status = 1
-}
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1
-}
-
-unlink $iorfile;
-
-exit $status
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/selfsigncert.pem b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/selfsigncert.pem
deleted file mode 100644
index e616730ca63..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/selfsigncert.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICeDCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADBjMQswCQYDVQQGEwJVUzEL
-MAkGA1UECBMCTU8xDDAKBgNVBAcTA1NUTDELMAkGA1UEChMCV1UxDDAKBgNVBAsT
-A0RPQzELMAkGA1UEAxMCS0ExETAPBgkqhkiG9w0BCQEWAktBMB4XDTAxMDgyNzE2
-NTUxMVoXDTAxMDkyNjE2NTUxMVowYzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1P
-MQwwCgYDVQQHEwNTVEwxCzAJBgNVBAoTAldVMQwwCgYDVQQLEwNET0MxCzAJBgNV
-BAMTAktBMREwDwYJKoZIhvcNAQkBFgJLQTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgC
-QQD12e2DchVPE/D1YrTcGZncLnOLRuuFf5Q2B55s6JZhT0OoLyNrqCgUHh3iRTyO
-iyeUxm/IQp8qcvs23Pqb3vLxAgMBAAGjgcAwgb0wHQYDVR0OBBYEFL8LnC8csuIX
-+TUw6FCoReB27PHoMIGNBgNVHSMEgYUwgYKAFL8LnC8csuIX+TUw6FCoReB27PHo
-oWekZTBjMQswCQYDVQQGEwJVUzELMAkGA1UECBMCTU8xDDAKBgNVBAcTA1NUTDEL
-MAkGA1UEChMCV1UxDDAKBgNVBAsTA0RPQzELMAkGA1UEAxMCS0ExETAPBgkqhkiG
-9w0BCQEWAktBggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADQQAZP9CT
-TVRxAz3Acxxxn32rsnwSeNJr1uTA4hew7f4QZ187oZia+rcFLOILrwgCmtqEmWVj
-dj6COUrqKo60BI5V
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf
deleted file mode 100644
index d486769062b..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#$Id$
-dynamic SSLIOP_Factory Service_Object *
-        TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
-        "-SSLNoProtection -SSLPrivateKey  PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"
-static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
-
-
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf.xml b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf.xml
deleted file mode 100644
index abff554e12c..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.conf.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./orbsvcs/tests/Security/MT_SSLIOP/server.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <dynamic id="SSLIOP_Factory" type="Service_Object">
-   <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey  PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"/>
- </dynamic>
- <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
-</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
deleted file mode 100644
index 29c53ecb7b8..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "test_i.h"
-#include "Server_Worker.h"
-
-const char *ior_output_file = 0;
-int nthreads = 4;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:n:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      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 "
-                           "-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
-    {
-      // Initialize the ORB
-      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);
-
-      // Get a Root POA reference
-      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;
-
-      Server_Worker worker (orb.in ());
-      if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
-                           nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot activate client threads\n"),
-                           1);
-
-      worker.thr_mgr ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test.idl b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test.idl
deleted file mode 100644
index 107fea38768..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// $Id$
-//
-
-interface Simple_Server
-{
-  exception WrongProtocolType {};
-
-  /// A ping call to set up connections
-  void ping ();
-
-  /** Validate the connection to see whether we have used the right
-   *  protocol type. A succesful validation would return nothing and
-   *  an unsuccessful validation would return an exception.
-   */
-  void validate_protocol ()
-    raises (WrongProtocolType);
-
-  /// A simple call
-  long test_method (in long x);
-
-  oneway void shutdown ();
-};
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
deleted file mode 100644
index 731adae0864..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/Transport_Cache_Manager.h"
-#include "orbsvcs/SSLIOP/SSLIOP_Transport.h"
-#include "ace/OS_NS_unistd.h"
-
-#if !defined(__ACE_INLINE__)
-#include "test_i.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (MT_IIOP_SSL,
-           test_i,
-           "$Id$")
-
-void
-Simple_Server_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return;
-}
-
-void
-Simple_Server_i::validate_protocol (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((Simple_Server::WrongProtocolType,
-                   CORBA::SystemException))
-{
-  if (this->validated_ == NOT_VALIDATED)
-    {
-      ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX,
-                         ace_mon,
-                         this->mutex_));
-
-      if (this->validated_ != NOT_VALIDATED)
-        return;
-
-      TAO::Transport_Cache_Manager::HASH_MAP &map =
-        this->orb_->orb_core ()->lane_resources ().transport_cache ().map ();
-
-      TAO::Transport_Cache_Manager::HASH_MAP_ITER st_iter =
-        map.begin ();
-
-      TAO::Transport_Cache_Manager::HASH_MAP_ITER end_iter =
-        map.end ();
-
-      for (TAO::Transport_Cache_Manager::HASH_MAP_ITER iter = st_iter;
-           iter != end_iter;
-           ++iter)
-        {
-          TAO_Transport *t =
-            (*iter).int_id_.transport ();
-
-          // @@ Worst possible way to check. If SSLIOP had a tag
-          // things would have been a  lot simpler.
-          TAO::SSLIOP::Transport *ssl_t =
-            dynamic_cast<TAO::SSLIOP::Transport *> (t);
-
-          // There should be no SSL Transport
-          if (ssl_t != 0)
-            {
-              this->validated_ = VALIDATED_NOSUCCESS;
-              break;
-            }
-        }
-
-    }
-
-  if (this->validated_ == VALIDATED_NOSUCCESS)
-    ACE_THROW (Simple_Server::WrongProtocolType ());
-}
-
-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, 15000);
-  ACE_OS::sleep (tv);
-  return x;
-}
-
-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/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
deleted file mode 100644
index 55a89d5ebf9..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h
+++ /dev/null
@@ -1,68 +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.
-  void ping (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void validate_protocol (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((Simple_Server::WrongProtocolType,
-                     CORBA::SystemException));
-
-  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:
-  /// The ORB
-  CORBA::ORB_var orb_;
-
-  /// Synchronizer
-  TAO_SYNCH_MUTEX mutex_;
-
-  enum
-    {
-      NOT_VALIDATED = 0,
-      VALIDATED_SUCCESS,
-      VALIDATED_NOSUCCESS
-    };
-  /// Flag to indicate status of validation
-  CORBA::Octet validated_;
-};
-
-#if defined(__ACE_INLINE__)
-#include "test_i.inl"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_MT_SERVER_TEST_I_H */
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.inl b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.inl
deleted file mode 100644
index 51fb274230d..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.inl
+++ /dev/null
@@ -1,9 +0,0 @@
-// $Id$
-
-ACE_INLINE
-Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb)),
-     mutex_ (),
-     validated_ (Simple_Server_i::NOT_VALIDATED)
-{
-}
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
deleted file mode 100644
index 82fe2335212..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// $Id$
-
-#include "Client_Worker.h"
-#include "tao/debug.h"
-
-Client_Worker::Client_Worker (Simple_Server_ptr server,
-                              Another_One_ptr another,
-                              int niterations)
-  : server_ (Simple_Server::_duplicate(server)),
-    another_ (Another_One::_duplicate (another)),
-    niterations_ (niterations)
-{
-}
-
-void
-Client_Worker::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);
-          this->another_->test_method (j ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          if(TAO_debug_level > 0)
-            ACE_DEBUG (( LM_DEBUG,
-                         "******** VALIDATED ******* \n"));
-        }
-      ACE_CATCHANY
-        {
-        }
-      ACE_ENDTRY;
-   }
-}
-
-int
-Client_Worker::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // Validate connections befire doing any actual work..
-      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);
-           this->another_->test_method (i ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-           if (TAO_debug_level > 0)
-             ACE_DEBUG ((LM_DEBUG,
-                         " (%P|%t) iteration = %d\n",
-                         i));
-         }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Client_Worker : Exception Raised");
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
deleted file mode 100644
index daae1a99760..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// $Id$
-
-// ===========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Security/MT_SSLIOP
-//
-// = FILENAME
-//   Client_Worker.h
-//
-// = AUTHOR
-//   Anand Krishnan
-//
-// ===========================================================================
-
-#ifndef MT_SSLIOP_CLIENT_WORKER_H
-#define MT_SSLIOP_CLIENT_WORKER_H
-#include /**/ "ace/pre.h"
-#include "ace/Task.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-#include "testC.h"
-
-
-class Client_Worker : public ACE_Task_Base
-{
-  // = TITLE
-  //   Run the Client_Worker Thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run the client threads
-  //
-
-public:
-  Client_Worker (Simple_Server_ptr server,
-                 Another_One_ptr another,
-                 int niterations);
-  // ctor
-
-  virtual int svc (void);
-  // thread entry point
-
-private:
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
-  // Validate the connection
-
-private:
-  Simple_Server_var server_;
-  // The server.
-
-  Another_One_var another_;
-  // Another object served by the same server as server_.
-
-  int niterations_;
-  // The number of iterations on each client thread.
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* MT_SSLIOP_CLIENT_WORKER_H */
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc b/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc
deleted file mode 100644
index 918a01648b2..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/MT_SSLIOP.mpc
+++ /dev/null
@@ -1,33 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*security server): orbsvcsexe, portableserver, ssl, iortable {
-  after += *idl
-  Source_Files {
-    Server_Worker.cpp
-    server.cpp
-    test_i.cpp
-    testS.cpp
-    testC.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*security client): orbsvcsexe, ssl {
-  after += *idl
-  Source_Files {
-    Client_Worker.cpp
-    client.cpp
-    testC.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
deleted file mode 100644
index 22357d5505c..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
+++ /dev/null
@@ -1,131 +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.MT_SSLIOP_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.MT_SSLIOP_Security_Client.am
-
-if BUILD_SSL
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-client_SOURCES = \
-  Client_Worker.cpp \
-  client.cpp \
-  testC.cpp \
-  Client_Worker.h \
-  test_i.i
-
-client_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-client_LDADD = \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_SSL
-
-## Makefile.MT_SSLIOP_Security_Server.am
-
-if BUILD_SSL
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  Server_Worker.cpp \
-  server.cpp \
-  testC.cpp \
-  testS.cpp \
-  test_i.cpp \
-  Server_Worker.h \
-  test_i.h \
-  test_i.i
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  @ACE_TLS_LIBS@
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_SSL
-
-## 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/Security/MT_SSLIOP/README b/TAO/orbsvcs/tests/Security/MT_SSLIOP/README
deleted file mode 100644
index 7d695b35da7..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/README
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id$
-
-Description:
-
-	This is a simple test for a thread-pool server that can 
-service multithreaded clients with the same object reference. 
-It creates a server process with a variable number of threads,
-multiple (multithreaded) clients can send requests to it, the 
-requests are handled in different threads.
-
-Expected output:
-
-The server prints the thread that handles each request. The Client
-prints the Validation info as well as the  thread pid and iteration
-number. 
-
-How to run:
-Use the run_test.pl.
-
-FOR SSL:-
-   Pvt Key File ( RSA ) = pvtkey.pem
-   Self Signed Certificate = selfsigncert.pem
-   
-   ORB Svc Conf File for Server = server.conf
-   ORB Svc Conf File for Client = client.conf
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
deleted file mode 100644
index cad95255acd..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-#include "Server_Worker.h"
-
-Server_Worker::Server_Worker (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-int
-Server_Worker::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h
deleted file mode 100644
index d2cb2b78e18..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Server_Worker.h
- *
- *  $Id$
- *
- *  @author Anand Krishnan
- */
-//=============================================================================
-
-#ifndef MT_SSLIOP_SERVER_WORKER_H
-#define MT_SSLIOP_SERVER_WORKER_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Task.h"
-#include "tao/ORB.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/**
- * @class Server_Worker
- *
- * @brief Run a server thread
- *
- * Use the ACE_Task_Base class to run server threads.
- */
-class Server_Worker : public ACE_Task_Base
-{
-public:
-
-  /// Constructor
-  Server_Worker (CORBA::ORB_ptr orb);
-
-  /// The thread entry point.
-  virtual int svc (void);
-
-
-private:
-  /// The ORB
-  CORBA::ORB_var orb_;
-
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-
-#endif /* MT_SSLIOP_SERVER_WORKER_H */
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf
deleted file mode 100644
index fc1422ac496..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-dynamic SSLIOP_Factory Service_Object *
-        TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
-        "-SSLCertificate PEM:selfsigncert.pem"
-static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml
deleted file mode 100644
index a39f09f3680..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./orbsvcs/tests/Security/MT_SSLIOP/client.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <dynamic id="SSLIOP_Factory" type="Service_Object">
-   <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLCertificate PEM:selfsigncert.pem"/>
- </dynamic>
- <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
-</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
deleted file mode 100644
index 8ef6242213a..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "Client_Worker.h"
-
-
-const char *ior = "file://test.ior";
-char *another_ior = 0;
-
-int niterations = 5;
-int do_shutdown = 0;
-int nthreads = 5;
-
-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':
-        do_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;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Initialize the ORB
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      int len = ACE_OS::strlen(ior) + 1;
-      another_ior = new char[len + 1];
-      ACE_OS::strcpy(another_ior, ior);
-      another_ior[len-1] = '1';
-      another_ior[len] = '\0';
-
-      // Get Object Reference using IOR file
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Cast to Appropriate Type
-      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);
-        }
-
-
-      object =
-        orb->string_to_object (another_ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Cast to Appropriate Type
-      Another_One_var another =
-        Another_One::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-
-      Client_Worker client (server.in (),
-                            another.in (),
-                            niterations);
-
-      if (client.activate (THR_NEW_LWP | THR_JOINABLE, nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                         " (%P|%t) Cannot Activate Client Threads\n"),
-                          1);
-
-      client.thr_mgr ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) threads finished \n"));
-
-      // Shut down the server if -x option given in command line
-      if (do_shutdown)
-        {
-          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      // Destroying the ORB..
-      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/orbsvcs/tests/Security/MT_SSLIOP/pvtkey.pem b/TAO/orbsvcs/tests/Security/MT_SSLIOP/pvtkey.pem
deleted file mode 100644
index 6facae6f3dd..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/pvtkey.pem
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBAPXZ7YNyFU8T8PVitNwZmdwuc4tG64V/lDYHnmzolmFPQ6gvI2uo
-KBQeHeJFPI6LJ5TGb8hCnypy+zbc+pve8vECAwEAAQJAE/fmZbW/a1PYT2X8AKCH
-sa2ILvjMqmQpWpYV1QyzIiYQPEmQ/5GMUj/t3PZd/17BOH8aPakBT/c1Gp+os6vR
-zQIhAP2RDmm6UyMrJhAtAcNC5s8nbfhKPG80Q0DZ2kiodjQfAiEA+DXqwEZlCh0j
-VPzEXY7vrdQa641zQ5XIX1S/+WbCdu8CIDT9m4V86uLuoYW/4h5sXM/t7Y119itH
-QMbMwFFu40UBAiEA9z+mN6An2BpMbsVXyiavREYMBuahkgprTeM7VHHzdssCIQCY
-QEgmpzGzfdZoREy9B7ooNeRO919lR9qvbte9vvJvWQ==
------END RSA PRIVATE KEY-----
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl
deleted file mode 100755
index 24846ed2477..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test.pl
+++ /dev/null
@@ -1,65 +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;
-$threads = '2';
-$iorfile = PerlACE::LocalFile ("test.ior");
-$sv_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext");
-$cl_conf = PerlACE::LocalFile ("client$PerlACE::svcconf_ext");
-
-unlink $iorfile;
-
-$SV = new PerlACE::Process ("server", "-ORBsvcconf $sv_conf -o $iorfile -n $threads");
-
-$CL1 = new PerlACE::Process 
-         ("client", "-k file://$iorfile -n 2 -i 100 -ORBSvcConf $cl_conf");
-
-$CLS = new PerlACE::Process 
-         ("client", "-k file://$iorfile -n 2 -i 100 -ORBSvcConf $cl_conf -x");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$CL1->Spawn ();
-$client = $CL1->WaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$client = $CLS->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1
-}
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1
-}
-
-unlink $iorfile;
-
-exit $status
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl
deleted file mode 100755
index 0bdb4fe461c..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl
+++ /dev/null
@@ -1,64 +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;
-$threads = '4';
-$iorfile = PerlACE::LocalFile ("test.ior");
-$sv_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext");
-$cl_conf = PerlACE::LocalFile ("client$PerlACE::svcconf_ext");
-
-unlink $iorfile;
-
-$SV = new PerlACE::Process ("server", "-ORBsvcconf $sv_conf -o $iorfile -n $threads");
-
-$CL1 = new PerlACE::Process 
-         ("client", "-k file://$iorfile -n 10 -i 1000 -ORBSvcConf $cl_conf");
-
-$CLS = new PerlACE::Process 
-         ("client", "-k file://$iorfile -n 10 -i 1000 -ORBSvcConf $cl_conf -x");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$CL1->Spawn ();
-$client = $CL1->WaitKill (480);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$client = $CLS->SpawnWaitKill (480);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1
-}
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1
-}
-
-unlink $iorfile;
-
-exit $status
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_heavy.pl b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_heavy.pl
deleted file mode 100644
index ad20195c287..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_heavy.pl
+++ /dev/null
@@ -1,65 +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;
-$threads = '100';
-$iorfile = PerlACE::LocalFile ("test.ior");
-$sv_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext");
-$cl_conf = PerlACE::LocalFile ("client$PerlACE::svcconf_ext");
-
-unlink $iorfile;
-
-$SV = new PerlACE::Process ("server", "-ORBsvcconf $sv_conf -o $iorfile -n $threads");
-
-$CL1 = new PerlACE::Process 
-         ("client", "-k file://$iorfile -n 20 -i 10000 -ORBSvcConf $cl_conf");
-
-$CLS = new PerlACE::Process 
-         ("client", "-k file://$iorfile -n 20 -i 10000 -ORBSvcConf $cl_conf -x");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$CL1->Spawn ();
-$client = $CL1->WaitKill (600);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$client = $CLS->SpawnWaitKill (600);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1
-}
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1
-}
-
-unlink $iorfile;
-
-exit $status
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/selfsigncert.pem b/TAO/orbsvcs/tests/Security/MT_SSLIOP/selfsigncert.pem
deleted file mode 100644
index e616730ca63..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/selfsigncert.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICeDCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADBjMQswCQYDVQQGEwJVUzEL
-MAkGA1UECBMCTU8xDDAKBgNVBAcTA1NUTDELMAkGA1UEChMCV1UxDDAKBgNVBAsT
-A0RPQzELMAkGA1UEAxMCS0ExETAPBgkqhkiG9w0BCQEWAktBMB4XDTAxMDgyNzE2
-NTUxMVoXDTAxMDkyNjE2NTUxMVowYzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1P
-MQwwCgYDVQQHEwNTVEwxCzAJBgNVBAoTAldVMQwwCgYDVQQLEwNET0MxCzAJBgNV
-BAMTAktBMREwDwYJKoZIhvcNAQkBFgJLQTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgC
-QQD12e2DchVPE/D1YrTcGZncLnOLRuuFf5Q2B55s6JZhT0OoLyNrqCgUHh3iRTyO
-iyeUxm/IQp8qcvs23Pqb3vLxAgMBAAGjgcAwgb0wHQYDVR0OBBYEFL8LnC8csuIX
-+TUw6FCoReB27PHoMIGNBgNVHSMEgYUwgYKAFL8LnC8csuIX+TUw6FCoReB27PHo
-oWekZTBjMQswCQYDVQQGEwJVUzELMAkGA1UECBMCTU8xDDAKBgNVBAcTA1NUTDEL
-MAkGA1UEChMCV1UxDDAKBgNVBAsTA0RPQzELMAkGA1UEAxMCS0ExETAPBgkqhkiG
-9w0BCQEWAktBggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADQQAZP9CT
-TVRxAz3Acxxxn32rsnwSeNJr1uTA4hew7f4QZ187oZia+rcFLOILrwgCmtqEmWVj
-dj6COUrqKo60BI5V
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf
deleted file mode 100644
index 31d7b2979b8..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-
-dynamic SSLIOP_Factory Service_Object *
-        TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
-        "-SSLPrivateKey  PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"
-static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
-
-
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf.xml b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf.xml
deleted file mode 100644
index abff554e12c..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.conf.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./orbsvcs/tests/Security/MT_SSLIOP/server.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <dynamic id="SSLIOP_Factory" type="Service_Object">
-   <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey  PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"/>
- </dynamic>
- <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
-</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
deleted file mode 100644
index b05e356507c..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "tao/IORTable/IORTable.h"
-#include "test_i.h"
-#include "Server_Worker.h"
-
-const char *ior_output_file = 0;
-char *another_output_file = 0;
-const char *ior_table_name = 0;
-char *another_table_name = 0;
-int nthreads = 4;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "i:o:n:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'i':
-        {
-          ior_table_name = get_opts.opt_arg ();
-          int len = ACE_OS::strlen(ior_table_name) + 1;
-          another_table_name = new char[len + 1];
-          ACE_OS::strcpy(another_table_name, ior_table_name);
-          another_table_name[len-1] = '1';
-          another_table_name[len] = '\0';
-          break;
-        }
-      case 'o':
-        {
-          ior_output_file = get_opts.opt_arg ();
-          int len = ACE_OS::strlen(ior_output_file) + 1;
-          another_output_file = new char[len + 1];
-          ACE_OS::strcpy(another_output_file, ior_output_file);
-          another_output_file[len-1] = '1';
-          another_output_file[len] = '\0';
-          break;
-        }
-      case 'n':
-        nthreads = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "[-i <iortable name>]"
-                           "-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
-    {
-      // Initialize the ORB
-      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);
-
-      // Get a Root POA reference
-      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 ());
-      Another_One_i another_one_impl (orb.in());
-
-      Simple_Server_var server =
-        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Another_One_var another_one =
-        another_one_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;
-
-      CORBA::String_var another_ior =
-        orb->object_to_string (another_one.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
-
-      ACE_DEBUG ((LM_DEBUG, "Activated another one as <%s>\n", another_ior.in ()));
-
-      if (ior_table_name != 0)
-        {
-          CORBA::Object_var table_object =
-             orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          IORTable::Table_var adapter =
-             IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-
-          if (CORBA::is_nil (adapter.in ()))
-            {
-              ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
-              return -1;
-            }
-
-          adapter->bind ( ior_table_name, ior.in () ACE_ENV_ARG_PARAMETER);
-          adapter->bind ( another_table_name, another_ior.in() ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-        }
-
-
-      // 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_DEBUG ((LM_DEBUG,"Wrote ior to %s\n",
-                      ior_output_file));
-          ACE_OS::fprintf (output_file, "%s", ior.in ());
-          ACE_OS::fclose (output_file);
-          output_file = ACE_OS::fopen (another_output_file, "w");
-          if (output_file == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Cannot open output file for writing IOR: %s",
-                               another_output_file),
-                              1);
-          ACE_DEBUG ((LM_DEBUG,"Wrote another ior to %s\n",
-                      another_output_file));
-          ACE_OS::fprintf (output_file, "%s", another_ior.in ());
-          ACE_OS::fclose (output_file);
-        }
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Server_Worker worker (orb.in ());
-      if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
-                           nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot activate client threads\n"),
-                           1);
-
-      worker.thr_mgr ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test.idl b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test.idl
deleted file mode 100644
index 3191d2be3e5..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test.idl
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// $Id$
-//
-
-interface Simple_Server
-{
-  long test_method (in long x);
-
-  oneway void shutdown ();
-};
-
-interface Another_One
-{
-  long test_method (in long x);
-};
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
deleted file mode 100644
index ee3ebd33fa4..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-#include "tao/debug.h"
-#include "ace/OS_NS_unistd.h"
-#if !defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (MT_Server,
-           test_i,
-           "$Id$")
-
-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, "Simple_Server: Request in thread %t\n"));
-  ACE_Time_Value tv (0, 15000);
-  ACE_OS::sleep (tv);
-  return x;
-}
-
-void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
-
-//---------------------------------------------------------------------------
-
-CORBA::Long
-Another_One_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, "Another_One: Request in thread %t\n"));
-  ACE_Time_Value tv (0, 15000);
-  ACE_OS::sleep (tv);
-  return x;
-}
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
deleted file mode 100644
index e98f9db8850..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
+++ /dev/null
@@ -1,71 +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
-};
-
-
-class Another_One_i : public POA_Another_One
-{
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
-public:
-  Another_One_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));
-
-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/orbsvcs/tests/Security/MT_SSLIOP/test_i.i b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.i
deleted file mode 100644
index 9a32e7ec527..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.i
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-ACE_INLINE
-Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-ACE_INLINE
-Another_One_i::Another_One_i (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
diff --git a/TAO/orbsvcs/tests/Security/Makefile.am b/TAO/orbsvcs/tests/Security/Makefile.am
deleted file mode 100644
index 97c2e92a0ab..00000000000
--- a/TAO/orbsvcs/tests/Security/Makefile.am
+++ /dev/null
@@ -1,20 +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 = \
-        BiDirectional \
-        Big_Request \
-        Callback \
-        Crash_Test \
-        MT_IIOP_SSL \
-        MT_SSLIOP \
-        Secure_Invocation \
-        ssliop_corbaloc
-
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo.idl b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo.idl
deleted file mode 100644
index d52d94a51c2..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- IDL -*-
-
-//=============================================================================
-/**
- * @file Foo.idl
- *
- * $Id$
- *
- * IDL for the Secure_Invocation test.
- *
- * @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-module Foo
-{
-  interface Bar
-  {
-    /// Exception that indicates that no security attributes were
-    /// available during the upcall.  If this exception is thrown,
-    /// then is most likely a problem with the underlying security
-    /// mechanism(s).
-    exception NoSecurityAttributes {};
-
-    /// Test method.
-    void baz () raises (NoSecurityAttributes);
-
-    /// Shutdown the server.
-    oneway void shutdown ();
-  };
-
-};
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
deleted file mode 100644
index e7fb1763591..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- C++ -*-
-
-#include "Foo_i.h"
-
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (Secure_Invocation,
-           Foo_i,
-           "$Id$")
-
-
-Foo_i::Foo_i (CORBA::ORB_ptr orb,
-              SecurityLevel3::SecurityCurrent_ptr current)
-  : orb_ (CORBA::ORB::_duplicate (orb)),
-    current_ (SecurityLevel3::SecurityCurrent::_duplicate (current))
-{
-}
-
-void
-Foo_i::baz (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Foo::Bar::NoSecurityAttributes))
-{
-  SecurityLevel3::ClientCredentials_var credentials =
-    this->current_->client_credentials (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::String_var id =
-    credentials->creds_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n"
-              "ClientCredentials ID\n"
-              "====================\n"
-              "%s\n",
-              id.in ()));
-}
-
-void
-Foo_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
deleted file mode 100644
index c6acd255e3e..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file Foo_i.h
- *
- * $Id$
- *
- * Implementation header for the Secure_Invocation test.
- *
- * @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-#ifndef SECURE_INVOCATION_FOO_I_H
-#define SECURE_INVOCATION_FOO_I_H
-
-#include "FooS.h"
-#include "orbsvcs/SecurityLevel3C.h"
-
-class Foo_i : public virtual POA_Foo::Bar
-{
-public:
-
-  /// Constructor.
-  Foo_i (CORBA::ORB_ptr,
-         SecurityLevel3::SecurityCurrent_ptr current);
-
-  /// Test method.
-  virtual void baz (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Foo::Bar::NoSecurityAttributes));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
-  /// Reference to the ORB.
-  CORBA::ORB_var orb_;
-
-  /// Reference to the "SecurityCurrent" object.
-  SecurityLevel3::SecurityCurrent_var current_;
-
-};
-
-#endif  /* SECURE_INVOCATION_FOO_I_H */
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am
deleted file mode 100644
index 3dadc41e4e1..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am
+++ /dev/null
@@ -1,137 +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.Secure_Invocation_Idl.am
-
-BUILT_SOURCES = \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-CLEANFILES = \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Foo.idl
-	@touch $@
-
-
-noinst_HEADERS = \
-  Foo.idl
-
-## Makefile.Secure_Invocation_Security_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_INTERCEPTORS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  FooC.cpp \
-  client.cpp \
-  Foo_i.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.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_INTERCEPTORS
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Secure_Invocation_Security_Server.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_INTERCEPTORS
-if BUILD_SSL
-if !BUILD_ACE_FOR_TAO
-
-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 \
-  -DACE_HAS_SSL=1 \
-  @ACE_TLS_CPPFLAGS@
-
-server_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  server.cpp \
-  Foo_i.h
-
-server_LDFLAGS = \
- @ACE_TLS_LDFLAGS@
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_SSLIOP.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Security.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 \
-  @ACE_TLS_LIBS@
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_SSL
-endif BUILD_INTERCEPTORS
-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/TAO/orbsvcs/tests/Security/Secure_Invocation/README b/TAO/orbsvcs/tests/Security/Secure_Invocation/README
deleted file mode 100644
index a4078c896d3..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/README
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# $Id$
-#
-
-This test verifies that the ORB's secure invocation mechanism is
-functioning properly.  It does so by the doing the following:
-
-	- Invoking a request over standard (insecure) IIOP on a target
-	  object that requires secure invocation (e.g. over SSLIOP).
-	  The client should receive a CORBA::NO_PERMISSION exception.
-
-	- Invoking a request via a security mechanism, such as
-	  SSLIOP.  The AccessId associated with the given request is
-	  obtained from the SecurityCurrent object, and displayed.
-
-The expected test output is the following (actual "certificate issuer"
-contents may differ):
-
-Activated as <IOR:...>
-(1768|1628) Received CORBA::NO_PERMISSION from server, as expected.
-
-ClientCredentials ID
-====================
-X509: 06
-
-Event loop finished.
-
-Secure_Invocation test passed.
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
deleted file mode 100644
index 2cab2208413..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*idl) : taoidldefaults {
-  IDL_Files {
-    Foo.idl
-  }
-  custom_only = 1
-}
-
-project(*security server): taoexe, portableserver, orbsvcslib, security, ssliop, pi_server, codecfactory, interceptors {
-  after += *idl
-  Source_Files {
-    Foo_i.cpp
-    FooS.cpp
-    FooC.cpp
-    server.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*security client): taoexe, orbsvcslib, security, pi, codecfactory, interceptors {
-  after += *idl
-  Source_Files {
-    FooC.cpp
-    client.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/cacert.pem b/TAO/orbsvcs/tests/Security/Secure_Invocation/cacert.pem
deleted file mode 100644
index a9e905f4e6c..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/cacert.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDfTCCAuagAwIBAgIBADANBgkqhkiG9w0BAQQFADCBjDELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkNBMQ8wDQYDVQQHEwZJcnZpbmUxEjAQBgNVBAoTCURPQyBHcm91
-cDEQMA4GA1UECxYHVUNJX0RPQzERMA8GA1UEAxMIUHJpeWFua2ExJjAkBgkqhkiG
-9w0BCQEWF3Bnb250bGFAZG9jLmVjZS51Y2kuZWR1MB4XDTAxMDYxMTE3MjI0MVoX
-DTExMDYwOTE3MjI0MVowgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyFiCRDUH
-nGJqQG9jT/2PhZUAgfwXvIwfDM8m/WujCt/buDcrOz767shBsk4HZhW91Vm4mE03
-K1zfCzojRigf28uyB/rlp60p2Fq0wvZBNNU5Muia6esleR4unb4QslOpcFhct/9n
-UPnlnnsZOTaGWaELNKEjYfHqPh8PQ0lYurECAwEAAaOB7DCB6TAdBgNVHQ4EFgQU
-0Y6IZjkLbLbtZ5aoKLcfd7Yc/kYwgbkGA1UdIwSBsTCBroAU0Y6IZjkLbLbtZ5ao
-KLcfd7Yc/kahgZKkgY8wgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GB
-AHYi8ulIzUI3p3+Ma16rumZxvKcmkJJbU6fpAv4ZvK6AWyy+6Ja0GD5N3SGEx+xU
-nMffTR+LePa9PAZiR7dNkF6ikPxXZu4jn8KY2zFT3SB/VjCoEetR9i9QI//O0Fea
-3yZ0NygNWe5cyVDLCb4meucJpsClfyL28DWzMwD2liX3
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf
deleted file mode 100644
index 5847fa22a03..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-
-dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"
-static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf.xml b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf.xml
deleted file mode 100644
index f68baa15979..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/client.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <dynamic id="SSLIOP_Factory" type="Service_Object">
-   <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"/>
- </dynamic>
- <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
-</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
deleted file mode 100644
index 40877b8871f..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-// -*- C++ -*-
-
-#include "ace/Get_Opt.h"
-
-#include "FooC.h"
-#include "orbsvcs/SecurityC.h"
-#include "ace/SString.h"
-
-ACE_RCSID (Secure_Invocation,
-           client,
-           "$Id$")
-
-const char *ior = "file://test.ior";
-const char *cert_file = "cacert.pem";
-
-void
-insecure_invocation_test (CORBA::ORB_ptr orb,
-                          CORBA::Object_ptr obj
-                          ACE_ENV_ARG_DECL)
-{
-  // Disable protection for this insecure invocation test.
-
-  Security::QOP qop = Security::SecQOPNoProtection;
-
-  CORBA::Any no_protection;
-  no_protection <<= qop;
-
-  // Create the Security::QOPPolicy.
-  CORBA::Policy_var policy =
-    orb->create_policy (Security::SecQOPPolicy,
-                        no_protection
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::PolicyList policy_list (1);
-  policy_list.length (1);
-  policy_list[0] = CORBA::Policy::_duplicate (policy.in ());
-
-  // Create an object reference that uses plain IIOP (i.e. no
-  // protection).
-  CORBA::Object_var object =
-    obj->_set_policy_overrides (policy_list,
-                                CORBA::SET_OVERRIDE
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  Foo::Bar_var server =
-    Foo::Bar::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil (server.in ()))
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) ERROR: Object reference <%s> is "
-                  "nil.\n",
-                  ior));
-
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  ACE_TRY
-    {
-      // This invocation should result in a CORBA::NO_PERMISSION
-      // exception.
-      server->baz (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::NO_PERMISSION, exc)
-    {
-      ACE_DEBUG ((LM_INFO,
-                  "(%P|%t) Received CORBA::NO_PERMISSION from "
-                  "server, as expected.\n"));
-
-      return;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-
-  ACE_ERROR ((LM_ERROR,
-              "(%P|%t) ERROR: CORBA::NO_PERMISSION was not thrown.\n"
-              "(%P|%t) ERROR: It should have been thrown.\n"));
-
-  ACE_THROW (CORBA::INTERNAL ());
-}
-
-void
-secure_invocation_test (CORBA::Object_ptr object
-                        ACE_ENV_ARG_DECL)
-{
-  Foo::Bar_var server =
-    Foo::Bar::_narrow (object ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil (server.in ()))
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) ERROR: Object reference <%s> is "
-                  "nil.\n",
-                  ior));
-
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  // This invocation should return successfully.
-  server->baz (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Usage:  %s "
-                           "-k <ior> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      ACE_TString env ("SSL_CERT_FILE=");
-      env += cert_file;
-      ACE_OS::putenv (env.c_str ());
-
-      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;
-
-      // This test sets creates a Security::QOPPolicy with the
-      // Quality-of-Protection set to "no protection."  It then
-      // invokes a method on the server (insecurely), which should
-      // then result in a CORBA::NO_PERMISSION exception.
-      //
-      // The server is not shutdown by this test.
-      insecure_invocation_test (orb.in (), object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // This test uses the default secure SSLIOP settings to securely
-      // invoke a method on the server.  No exception should occur.
-      //
-      // The server *is* shutdown by this test.
-      secure_invocation_test (object.in () 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,
-                           "Caught exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n"
-              "Secure_Invocation test passed.\n"));
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_cert.pem b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_cert.pem
deleted file mode 100644
index 0bebb696cfc..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_cert.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICgzCCAewCAQYwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExODEwMzRaFw0xMTA2
-MDkxODEwMzRaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEQMA4GA1UEChMHVEFPK09DSTEMMAoGA1UECxMDT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL6f8pBX7Mi3FPY/OYBOq+kb
-wQ3WX0Z8+nDxd7AiWDAx2AL5EaX8xnUiRi96OJ+CYPCYOUlavGVzZkRVMFdOuHAn
-RvY2sCpvU2rkKpEx9Pd50l7FLnXJuflnRc6zIEKOvuQcPJvsP4AaxaFxTnZExXQJ
-kDEiQP3mGID/eXtUzywbAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAuvSoOnMB6sxj
-ft9YbdLeyATTPzHbxAb6zQo72DUmM3roNowUrefHymU8jZoC6HeaROeKCU0MkVes
-l/jYlz/OwSYkbyGNIUkq4DHEWKzXEg8M603fsWK6IK3T5iPBHY+l/mYSEHJPfypZ
-fl/y4YSNJZlrz6kCIHTcwfHXDRC1mjM=
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_key.pem b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_key.pem
deleted file mode 100644
index 1428b501712..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_key.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC+n/KQV+zItxT2PzmATqvpG8EN1l9GfPpw8XewIlgwMdgC+RGl
-/MZ1IkYvejifgmDwmDlJWrxlc2ZEVTBXTrhwJ0b2NrAqb1Nq5CqRMfT3edJexS51
-ybn5Z0XOsyBCjr7kHDyb7D+AGsWhcU52RMV0CZAxIkD95hiA/3l7VM8sGwIDAQAB
-AoGABGaa6fwtqkCXykuRX0XxsBME9PXTA0SVX5AjjDxuvsYXz5HCd4uLZV7iMexn
-bD9NT6CkCe5/VPRCEyfIUuutVFc7lkPwuRw5FvNcf4gMH9ltufQfH/KeR7d2Jvge
-zrTOH7nicshy67mfOEOaoDphWoT9uy+7ayym+EsJLJU37VkCQQD6xLRu5r9tKX2/
-NfIQsGxF3TZyXgxcuxMh9JOq5E9nBwhr1JaXDbXktXfIK/F3XWHLFS8CIg6PhgGY
-i/+UtGzvAkEAwpoHp89U2jLdVRoIcwy5o7Ocwk3HCXem3UgFWXzzunGM1x+ozDFA
-uo5nyXiAO6Buka9C2czje275kE18BbqLlQJBAMJNf/EeYdzXdVOfHPzJdlt72CAt
-ty5y1ZRNyc10MgIGdQP4KObJ/NJFuZYkVmjCtm+A7neco+OZVcs5TsOOOYkCQBHQ
-6EKEyM/xODJCX+OolpZWK1PeqwpC2hQIM/Uta2L2Yl6Pl3SaTcLGptnbHmJXHchY
-s1YdW/ZBArgjX+dmXMECQApTKWbVLmNsEoOlHU/I/KhGsfuojrzBMMe3FKLiHpmu
-u86L3vu3OGZFcPgjazxWZcip8JekeJ7c+6suLNNRQ5I=
------END RSA PRIVATE KEY-----
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_key_nopasswd.pem b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_key_nopasswd.pem
deleted file mode 100644
index 35e449a2493..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_key_nopasswd.pem
+++ /dev/null
@@ -1,16 +0,0 @@
-RSA key ok
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDBuQXJQhW75XZJfatysGHE3/RXFeMSB8TOk/geXhlUAQTaHj/0
-+eQLNnz2ed8XFoyZFJYioUrcAHyC3LGv7CemhPAW0ZEBgXG8QX1eG8T+NlPh5pC8
-pMg8R67aVr/Rs3jvXsh7lI5rqCQ6Mr1fCg6qVdnJyH04gKKv4b0Iu29FDQIDAQAB
-AoGADRU7yM3HvfrPNENicspqr+sYC1GVFkCkD/d6SEK+nye6diiY1SiTOBaj9dlh
-MaP6NtRnF0uhTJ5TylqxPVpLixs6Dot/lX0Mu/bD80Zez1bWdQFivszOcDnxylHX
-j4z3Sv5nSPWoOgssDVxWNpI9QHcC2E7zII094drJEG/UZIECQQDy0axJBAahSgMX
-9CfpWJjXEMKD58RwddbiS2tGboLzdYXUVaE1qr4GN70jypGC4HmWZ6XV5HX4+fy3
-QltXF3GdAkEAzD0VpmOCan7jLty6+qklEwpyzMDJ9VH9QwfMyS5oSO4Dh08lC6WT
-Ss+nQlXFwFYszKxd6kznEECGPlKybiC+MQJBANFdsKuUaRMQ+fHhd7hfyAlITi/l
-2x8MvCeK2Ah2qTq6jpYy7zmS6x35WYBO3YB3hN8Gp5rxzjbLdfedo5xIfpECQGkk
-ASM5EwhT7gxP4YnszYMx28uAa/d4j9KUD156H4F71iEwIzgNsvfOUqKZmUXclw9+
-pJJbqI/7R6CJ3gVHoeECQGpfgurJz2V5Z2/qsZIDJXgxFoW6vY9rZbZU80ZYx3Cb
-RINCjB0G0ThsqH7FqCC3PAkEt0xThXqT2SM8ezVlENM=
------END RSA PRIVATE KEY-----
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf
deleted file mode 100644
index c485fa19f3a..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-
-dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:client_key_nopasswd.pem -SSLCertificate PEM:client_cert.pem"
-static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf.xml b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf.xml
deleted file mode 100644
index 8060c28b75a..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <dynamic id="SSLIOP_Factory" type="Service_Object">
-   <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate NONE -SSLPrivateKey PEM:client_key_nopasswd.pem -SSLCertificate PEM:client_cert.pem"/>
- </dynamic>
- <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
-</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl b/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl
deleted file mode 100755
index 313d10bcfee..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/run_test.pl
+++ /dev/null
@@ -1,55 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-# $Id$
-
-
-use lib  '../../../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-$file = PerlACE::LocalFile ("test.ior");
-
-unlink $file;
-
-$status = 0;
-
-# Set the SSL environment
-# This doesn't work on Windows.  For some reason,
-# environment variables aren't propagated to child processes.
-#$ENV{'SSL_CERT_FILE'} = 'cacert.pem';
-
-$SV = new PerlACE::Process ("server",
-			    "-o $file -ORBSvcConf server$PerlACE::svcconf_ext");
-$CL = new PerlACE::Process ("client",
-			    "-ORBSvcConf client$PerlACE::svcconf_ext -k file://$file");
-
-print STDERR "\n\n==== Running Secure_Invocation test\n";
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$file>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $file;
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf
deleted file mode 100644
index ee0ef1aa57c..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-
-dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"
-static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf.xml b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf.xml
deleted file mode 100644
index e4acefdf26a..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/server.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <dynamic id="SSLIOP_Factory" type="Service_Object">
-   <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/>
- </dynamic>
- <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
-</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
deleted file mode 100644
index 8b7ff656577..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-// -*- C++ -*-
-
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "Foo_i.h"
-#include "ace/SString.h"
-
-ACE_RCSID (Secure_Invocation,
-           server,
-           "$Id$")
-
-const char *ior_output_file = 0;
-const char *cert_file = "cacert.pem";
-
-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
-    {
-      ACE_TString env ("SSL_CERT_FILE=");
-      env += cert_file;
-      ACE_OS::putenv (env.c_str ());
-
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) ERROR: Unable to initialize the "
-                           "POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.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;
-
-      obj =
-        orb->resolve_initial_references ("SecurityLevel3:SecurityCurrent"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      SecurityLevel3::SecurityCurrent_var security_current =
-        SecurityLevel3::SecurityCurrent::_narrow (obj.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (security_current.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) ERROR: SecurityCurrent reference "
-                           "is nil.\n"),
-                          1);
-
-      Foo_i *server_impl = 0;
-
-      ACE_NEW_RETURN (server_impl,
-                      Foo_i (orb.in (),
-                             security_current.in ()),
-                      -1);
-
-      PortableServer::ServantBase_var owner_transfer (server_impl);
-
-      Foo::Bar_var server =
-        server_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Sanity check on SSLIOP profile equivalence.
-      // Since the POA is reference counting the servants, this
-      // implementation must still exist when the POA is destroyed.
-      Foo_i server_impl2 (orb.in (), security_current.in ());
-      Foo::Bar_var server2 =
-        server_impl2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      const CORBA::Boolean equivalent =
-        server->_is_equivalent (server2.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (equivalent)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) ERROR: SSLIOP profile equivalence "
-                      "check failed.\n"));
-        }
-
-      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,
-                  "\n"
-                  "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,
-                           "Caught exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_cert.pem b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_cert.pem
deleted file mode 100644
index 0fc394c24d7..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_cert.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICgzCCAewCAQMwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExNzQ4NTVaFw0xMTA2
-MDkxNzQ4NTVaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEMMAoGA1UEChMDT0NJMRAwDgYDVQQLEwdUQU8rT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANKXmudWiLVu/zdBlSr0/dlr
-pRe+Ie26cPyMo5lKiYNY77tABTiOXe5qLUEryjQ/fZ74gmBe4AYFwb7nu/f58X4A
-0tzSg2M4spWM7N4tzf+YbcUipRt9sEISxwfUxNNWTKnLxvCmkzOsISisukdzTkqJ
-fdzEcPfhO2BZKOdmlg1hAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAjUl3ami01tPY
-P1vMp2642dsIKLZis0TmeWp6HNpm52TbiGZOCqDrvtSQ9+2vGz0BkHvGqWKtD+wv
-zJH23fNnqFuzy1C1xtjoeqhXECTsWVTVdoEox8hSWxPiYRE2dioraZQQ5ENDosh+
-V9YcqJJpnKDUOSGVGuyaU7DpR8yK0pc=
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_key.pem b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_key.pem
deleted file mode 100644
index 567a41da6dc..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_key.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDSl5rnVoi1bv83QZUq9P3Za6UXviHtunD8jKOZSomDWO+7QAU4
-jl3uai1BK8o0P32e+IJgXuAGBcG+57v3+fF+ANLc0oNjOLKVjOzeLc3/mG3FIqUb
-fbBCEscH1MTTVkypy8bwppMzrCEorLpHc05KiX3cxHD34TtgWSjnZpYNYQIDAQAB
-AoGAC/TxpZrjLjH8KZ3+oy6/zv1upTd1Y7MHQT+W9lgmEKAXFHGhGkHzEVtT8HRV
-CbxlHIaNmH0qiQ0AoB82K/E0BdIMvE+y2qQwlpMfBMX6/TACORReJN3NXGsXwHP4
-/pNlS4LX7/NZbxlReAlDNP+FO8sdKZTyM3VXHFWJbmm4wsECQQD06zQ4uthp0zI9
-WTZiiAUgYwOcnLnXwfWOLAr8RCnYgwiS7MBCcmhZAgWX5SZJYVCwEJ12DAHy02NJ
-EhiSgo+JAkEA3B7PcS5FqZFi6wVjEG6yF8OuSb/rl+FZfV6utZdCVdMPxacEVxlD
-q7H/dk23O4WwASBriU0PR9/KG3T/LvKBGQJAaYRn1EUTdcxKqcmkt6CYbNKbvL59
-BqqGq4DoHrUTPjd92ybq0fXOZQKM/Fr6OsUVaTVPUYtsz3wpG1MTiRN82QJACX6+
-vggb8yuVU8QAuPW9cu769q1zsTKEVLcf3C9xKhiXppQEyOkLFT3xYh4KGGQ06meG
-m/6Z+SS7KCIM2+6UCQJBANHIzgxDWtrLuWJviNh9EbCsdMioxBH+LGaqFKLC70xD
-Pyoqn+QJQu/ekT+FUb0BeFJfGPzFjh1mFYn4tXxWqMs=
------END RSA PRIVATE KEY-----
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_key_nopasswd.pem b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_key_nopasswd.pem
deleted file mode 100644
index 2381bdcc6df..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_key_nopasswd.pem
+++ /dev/null
@@ -1,16 +0,0 @@
-RSA key ok
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDOtfLxhcWktrjY/U9Mdsy9WaUeqFZGWkz2gknKMNrfJnKAdmuU
-RaP2G9X565FhgyrEpb5bYJUC3aTLhdr5NsDFt3V1hhs9rev6WSeONmiAlOrUrKCB
-cpF3K0HyU4bVp06/FgtWFUp8ja88B8zLhwak6KAGYBUQZXVtMsaJliYLNQIDAQAB
-AoGAXIqghPg6j48uGhbtlXHqHysu/Ran6T8sDYAuwNI2aoiv4kshxnOW/+teVFDd
-+SXb08XP/uCyVWIdEPCQI9obWppALzQhF5kALhchnlEATkVxkdx6T5PyGnFq5rpc
-NCfb3Q68T5bcFvsgup9Lt8JpGBQGvjYJZYkJuMvWmH6Bc9ECQQD4TwB+p5MjRALX
-lcMI8pURt6CKxpWLyFUUkQi6HksXzxeh4PDErLxsyFexKec7TOap5xnWZMPkjl76
-BdW65abrAkEA1R0XSCfu3B4LnX4zlDi+nUXG8YvquuZ21TRrNg3YmVcyF+jvkM1f
-4MGRPRF3hnTuZhnlD+wEubpmpcoNnNTOXwJBAIfZOQ0SAzblC6UE42puxU2nJ+ck
-1EZgeOPCoYKp9i11eJlw5mjDlGbziL59jWttHDlSHVmlUWMm3SFutcsFv7cCQQCK
-i+UM5dklhOrsMpV5sQJK4IgblGi/pQBwTym79HhyB/vrC2ZjbwD77xtq5iYcZXxv
-KDqAhWH1FLeS5K7A3KBlAkEAqwIhKyV1kK0EtvpNMprfIGNccRjNX8TJEQsN49EE
-luhKkAam4CoA1R2wZc0VHfWqilK0qhrezXxlo4OeElxiRg==
------END RSA PRIVATE KEY-----
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf
deleted file mode 100644
index e445c19615f..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-
-dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"
-static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf.xml b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf.xml
deleted file mode 100644
index 2b61ce1d547..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/server_none.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <dynamic id="SSLIOP_Factory" type="Service_Object">
-   <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"/>
- </dynamic>
- <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
-</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf
deleted file mode 100644
index 19cd88ba742..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-
-dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key_nopasswd.pem -SSLCertificate PEM:server_cert.pem"
-static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf.xml b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf.xml
deleted file mode 100644
index 0b53b803d90..00000000000
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  $Id$ -->
- <dynamic id="SSLIOP_Factory" type="Service_Object">
-   <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key_nopasswd.pem -SSLCertificate PEM:server_cert.pem"/>
- </dynamic>
- <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
-</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am
deleted file mode 100644
index 220499d6f56..00000000000
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/Makefile.am
+++ /dev/null
@@ -1,88 +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)
-
-## Makefile.Corbaloc_Ssliop_Client.am
-
-BUILT_SOURCES = \
-  test_objectC.cpp \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.cpp \
-  test_objectS.h \
-  test_objectS.inl \
-  test_objectS_T.cpp \
-  test_objectS_T.h \
-  test_objectS_T.inl
-
-CLEANFILES = \
-  test_object-stamp \
-  test_objectC.cpp \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.cpp \
-  test_objectS.h \
-  test_objectS.inl \
-  test_objectS_T.cpp \
-  test_objectS_T.h \
-  test_objectS_T.inl
-
-test_objectC.cpp test_objectC.h test_objectC.inl test_objectS.cpp test_objectS.h test_objectS.inl test_objectS_T.cpp test_objectS_T.h test_objectS_T.inl: test_object-stamp
-
-test_object-stamp: $(srcdir)/test_object.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GT $(srcdir)/test_object.idl
-	@touch $@
-
-noinst_PROGRAMS = client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  client.cpp \
-  test_objectC.cpp \
-  test_objectS.cpp \
-  client.h \
-  test_objectC.h \
-  test_objectC.inl \
-  test_objectS.h \
-  test_objectS.inl \
-  test_objectS_T.h \
-  test_objectS_T.inl
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## 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/Security/ssliop_corbaloc/README b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/README
deleted file mode 100644
index 6e28b065fb8..00000000000
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/README
+++ /dev/null
@@ -1,87 +0,0 @@
-// $Id$
-
-These application tests address various features of TAO's 
-Naming Service. The functionality is the same as in the 
-Simple_Naming test, but the difference is that all the 
-communication is done over SSLIOP and clients are using 
-INS-style corbaloc URLs.
-
-To run all tests automatically -
-	execute Perl script run_test.pl
-
-To run tests manually -
-	start the Naming Service (see
-	TAO/orbsvcs/Naming_Service/README for valid options).
-        Make sure you use " -ORBSvcConf server.conf" and 
-        "-ORBEndpoint iiop://localhost:23456/ssl_port=12345"
-        
-	Then run ./client with one of the options below.
-        Make sure you add " -ORBSvcConf client.conf" and
-        "-ORBInitRef NameService=corbaloc:ssliop:localhost:12345/NameService" 
-
-NOTE: if running tests manually, Naming Service has to be restarted
-before each test (this is due to some tests not 'cleaning up' bindings
-after themselves).
-
-The following options exist:
----------------------------
--s	Run the Simple test of the Naming Service.
-
--t  	Run the Tree test of the Naming Service.
-
--e	Run the Exceptions test of the Naming Service
-
--i 	Run the Iterator test of the Naming Service.
-
--y      Run the Destroy test of the Naming Service.
-
-Persistent test consists of two parts (below).
-
--p <file_name>
-        Run the Persistent Naming Service test, part 1.  Requires an
-        argument specifying the name of the file in which to store an ior for
-        use by Persistent Naming Service test, part 2.  Note, in order
-        to test out persistent capabilities of the Naming Service, the
-        Naming Service must be started with -f and -ORBendpoint options.
-        The values for these options must be the same for both runs of
-        the Naming Service (i.e., for part 1 and part 2 of persistent test).
-
--c <ior>
-        Run the Persistent Naming Service test, part 2.  Requires an
-        argument specifying the ior, which was produced in part 1 of
-        the test.  Note, in order to test out persistent capabilities
-        of the Naming Service, the Naming Service must be started with
-        -f and -ORBendpoint options.  The values for these options
-        must remain the same for both runs of the Naming Service (i.e.,
-        for part 1 and part 2 of persistent test).
-
-        Example of testing persistence on a Unix system:
-        $ ../../Naming_Service -f log -ORBendpoint iiop://localhost:20000
-        $ ./client -p ior_file
-        kill the Naming_Service process
-        $ ../../Naming_Service -f log -ORBendpoint iiop://localhost:20000
-        $ ./client -c file://ior_file
-
-        where the steps correspond to 1)starting the Naming Service on
-        port 20000 in persistent mode, with persistent state being
-        stored in file called "log", 2) running the first part of the
-        client persistent naming test, and sending its data to file
-        called "ior_file", 3) killing the Naming Service process, 4)
-        restarting the Naming Service on the same port with the same
-        persistent state storage file, and 5) running the second part
-        of the client persistence test by specifying the ior from part
-        1 in the file format.
-
-        We kill the Naming Service process between 2 client runs to
-        make sure it can recreate its state from persistent storage.
-        It is necessary to restart the Naming Service on the same
-        host/port in order for the persistent IORs from the first
-        run to be valid for the second run.
-
-If no option is specified, Simple test is run.  If more than one
-option is specified, only one test runs.
-
-
-DESCRIPTION AND EXPECTED OUTPUT FOR EACH TEST
-*******************************************
-Please see $TAO_ROOT/orbsvcs/tests/Simple_Naming/README
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf
deleted file mode 100644
index 880c1b7d372..00000000000
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-dynamic SSLIOP_Factory Service_Object *
-        TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
-        "-SSLPrivateKey PEM:pvtkey-client.pem -SSLCertificate PEM:selfsigncert-client.pem"
-static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
-
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml
deleted file mode 100644
index 50bb24f73ee..00000000000
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from client.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
-   <dynamic id="SSLIOP_Factory" type="Service_Object">
-      <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey PEM:pvtkey-client.pem -SSLCertificate PEM:selfsigncert-client.pem"/>
-   </dynamic>
-   <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
-</ACE_Svc_Conf>
-
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
deleted file mode 100644
index 904a68a489b..00000000000
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
+++ /dev/null
@@ -1,1279 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/Naming_Service/
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//      This class implements a simple CORBA client for the CosNaming
-//      example using stubs generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan <sergio@cs.wustl.edu>,
-//      Marina Spivak <marina@cs.wustl.edu>, and
-//      Douglas C. Schmidt <schmidt@cs.wustl.edu>
-// ============================================================================
-
-#include "client.h"
-#include "tao/debug.h"
-#include "ace/Get_Opt.h"
-
-ACE_RCSID(Simple_Naming, client, "$Id$")
-
-#if defined (_MSC_VER)
-# pragma warning (disable : 4250)
-#endif /* _MSC_VER */
-
-class My_Test_Object :
-  public virtual POA_Test_Object
-{
-public:
-  // = Initialization and termination methods.
-  My_Test_Object (CORBA::Short id = 0);
-  // Constructor.
-
-  ~My_Test_Object (void);
-  // Destructor.
-
-  // = Interface implementation accessor methods.
-
-  void id (CORBA::Short id ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Sets id.
-
-  CORBA::Short id (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Gets id.
-
-private:
-  short id_;
-};
-
-My_Test_Object::My_Test_Object (CORBA::Short id)
-  : id_ (id)
-{
-}
-
-My_Test_Object::~My_Test_Object (void)
-{
-}
-
-CORBA::Short
-My_Test_Object::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return id_;
-}
-
-void
-My_Test_Object::id (CORBA::Short id ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  id_ = id;
-}
-
-// Constructor.
-
-CosNaming_Client::CosNaming_Client (void)
-  : argc_ (0),
-    argv_ (0),
-    test_ (0)
-{
-}
-
-// Parses the command line arguments and returns an error status.
-
-int
-CosNaming_Client::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "p:dstieym:c:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        break;
-      case 's':
-        if (this->test_ == 0)
-          ACE_NEW_RETURN (this->test_,
-                          Simple_Test,
-                          -1);
-        break;
-      case 'm':
-        if (this->test_ == 0)
-          {
-            int size = ACE_OS::atoi (get_opts.opt_arg ());
-            if (size <= 0)
-              size = 10;
-
-            ACE_NEW_RETURN (this->test_,
-                            MT_Test (this->orbmgr_.orb (), size),
-                            -1);
-          }
-
-        break;
-      case 't':
-        if (this->test_ == 0)
-          ACE_NEW_RETURN (this->test_,
-                          Tree_Test,
-                          -1);
-        break;
-      case 'i':
-        if (this->test_ == 0)
-          ACE_NEW_RETURN (this->test_,
-                          Iterator_Test,
-                          -1);
-        break;
-      case 'e':
-        if (this->test_ == 0)
-          ACE_NEW_RETURN (this->test_,
-                          Exceptions_Test,
-                          -1);
-        break;
-      case 'y':
-        if (this->test_ == 0)
-          ACE_NEW_RETURN (this->test_,
-                          Destroy_Test,
-                          -1);
-        break;
-      case 'p':
-        if (this->test_ == 0)
-          {
-            FILE * ior_output_file =
-              ACE_OS::fopen (get_opts.opt_arg (), "w");
-
-            if (ior_output_file == 0)
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Unable to open %s for writing: %p\n",
-                                 get_opts.opt_arg ()), -1);
-
-            ACE_NEW_RETURN (this->test_,
-                            Persistent_Test_Begin (this->orbmgr_.orb (),
-                                                   ior_output_file),
-                            -1);
-          }
-        break;
-      case 'c':
-        if (this->test_ == 0)
-          ACE_NEW_RETURN (this->test_,
-                          Persistent_Test_End (this->orbmgr_.orb (),
-                                               get_opts.opt_arg ()),
-                          -1);
-        break;
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Argument %c \n usage:  %s"
-                           " [-d]"
-                           " [-s or -e or -t or -i or -y or -p or -c<ior> or -m<size>]"
-                           "\n",
-                           c,
-                           this->argv_ [0]),
-                          -1);
-      }
-
-  if (this->test_ == 0)
-    ACE_NEW_RETURN (this->test_,
-                    Simple_Test,
-                    -1);
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-// Execute client example code.
-
-int
-CosNaming_Client::run (void)
-{
-  return test_->execute (naming_client_);
-}
-
-CosNaming_Client::~CosNaming_Client (void)
-{
-  delete test_;
-}
-
-int
-CosNaming_Client::init (int argc, char **argv)
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Initialize ORB.
-      this->orbmgr_.init (this->argc_,
-                          this->argv_
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->orbmgr_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Parse command line and verify parameters.
-      if (this->parse_args () == -1)
-        return -1;
-
-      CORBA::ORB_var orb = this->orbmgr_.orb ();
-      return this->naming_client_.init (orb.in ());
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "init");
-      // and return -1 below . . .
-    }
-  ACE_ENDTRY;
-
-  return -1;
-}
-
-MT_Test::MT_Test (CORBA::ORB_ptr orb,
-                  int size)
-   :size_ (size),
-    orb_ (orb),
-    name_service_ior_ (0)
-{
-}
-
-int
-MT_Test::svc (void)
-{
-  // Obtain object reference to the Naming Service (create new stub.)
-
-  CosNaming::NamingContext_var name_service;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY_EX (SETUP)
-    {
-      CORBA::Object_var name_service_obj =
-        orb_->string_to_object (name_service_ior_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SETUP);
-
-      name_service =
-        CosNaming::NamingContext::_narrow (name_service_obj.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SETUP);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test setup");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  if (name_service.in () == 0)
-    return -1;
-
-  // Bind the object.
-  ACE_TRY_EX (BIND)
-    {
-      name_service->bind (test_name_,
-                          test_ref_.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (BIND);
-      ACE_DEBUG ((LM_DEBUG,
-                  "Bound name OK in thread %t\n"));
-    }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Unable to bind in thread %t\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test bind");
-      // This debug statement works around a IRIX/MIPSPro 7.3 bug (it
-      // fails with optimize=1 debug=0; but works with any other
-      // settings for those flags).
-      ACE_DEBUG ((LM_DEBUG, "MT_Test(%t) - bind[3] %d\n",
-                  test_name_.length ()));
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  // Resolve the object from the Naming Context.
-  ACE_TRY_EX (RESOLVE)
-    {
-      CORBA::Object_var result_obj_ref =
-        name_service->resolve (test_name_
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (RESOLVE);
-
-      Test_Object_var result_object =
-        Test_Object::_narrow (result_obj_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (RESOLVE);
-
-      if (!CORBA::is_nil (result_object.in ()))
-        {
-          CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK_EX (RESOLVE);
-
-          if (id == CosNaming_Client::OBJ1_ID)
-            ACE_DEBUG ((LM_DEBUG,
-                        "Resolved name OK in thread %t\n"));
-        }
-    }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Unable to resolve in thread %t\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test resolve");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  // Unbind the object from the Naming Context.
-  ACE_TRY_EX (UNBIND)
-    {
-      name_service->unbind (test_name_
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (UNBIND);
-      ACE_DEBUG ((LM_DEBUG,
-                  "Unbound name OK in thread %t\n"));
-    }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Unable to unbind in thread %t\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test unbind");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-int
-MT_Test::execute (TAO_Naming_Client &root_context)
-{
-  if (CORBA::is_nil (this->orb_.in ()))
-    return -1;
-
-  // Create data which will be used by all threads.
-
-  // Dummy object instantiation.
-  My_Test_Object *test_obj_impl =
-    new My_Test_Object (CosNaming_Client::OBJ1_ID);
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      test_ref_ =
-        test_obj_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      test_obj_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Get the IOR for the Naming Service.  Each thread can use it
-      // in <string_to_object> to create its own stub for the Naming
-      // Service.  This 'trick' is necessary, because multiple threads
-      // cannot be using the same stub - bad things happen...  This is
-      // just a way to give each thread its own stub.
-
-      CosNaming::NamingContext_var context =
-        root_context.get_context ();
-
-      name_service_ior_ =
-        orb_->object_to_string (context.in ()
-                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception while instantiating dummy");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  // Create a name for dummy.
-  test_name_.length (1);
-  test_name_[0].id = CORBA::string_dup ("Foo");
-
-  // Spawn threads, each of which will be executing svc ().
-  int status = this->activate (THR_NEW_LWP | THR_JOINABLE,
-                               size_);
-
-  if (status == -1)
-    return -1;
-
-  status = this->wait ();
-  return status;
-}
-
-int
-Simple_Test::execute (TAO_Naming_Client &root_context)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Dummy object instantiation.
-      My_Test_Object *test_obj_impl = new My_Test_Object (CosNaming_Client::OBJ1_ID);
-      Test_Object_var test_obj_ref =
-        test_obj_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Give ownership of this object to POA.
-      test_obj_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Bind an object to the Naming Context.
-      CosNaming::Name test_name;
-      test_name.length (1);
-      test_name[0].id = CORBA::string_dup ("Foo");
-      root_context->bind (test_name,
-                          test_obj_ref.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG,
-                  "Bound name OK\n"));
-
-      // Resolve the object from the Naming Context.
-      CORBA::Object_var result_obj_ref =
-        root_context->resolve (test_name
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      Test_Object_var result_object =
-        Test_Object::_narrow (result_obj_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      if (!CORBA::is_nil (result_object.in ()))
-        {
-          CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-          if (id == CosNaming_Client::OBJ1_ID)
-            ACE_DEBUG ((LM_DEBUG, "Resolved name OK\n"));
-        }
-
-      // Unbind the object from the Naming Context.
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG,
-                  "Unbound name OK\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Simple test");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-int
-Tree_Test::execute (TAO_Naming_Client &root_context)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Create a tree of contexts: root->level1->level2.  Bind object
-      // foo under context level2.
-
-      // Bind level1 context under root.
-      CosNaming::Name level1;
-      level1.length (1);
-      level1[0].id = CORBA::string_dup ("level1_context");
-      CosNaming::NamingContext_var level1_context;
-      level1_context = root_context->bind_new_context (level1
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Create a new context.
-      CosNaming::NamingContext_var level2_context;
-      level2_context = root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Instantiate a dummy object and bind it under the new context.
-      My_Test_Object *impl1 =
-        new My_Test_Object (CosNaming_Client::OBJ1_ID);
-      Test_Object_var obj1 = impl1->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      impl1->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CosNaming::Name obj_name;
-      obj_name.length (1);
-      obj_name[0].id = CORBA::string_dup ("foo");
-      level2_context->bind (obj_name, obj1.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Bind the context we just created under level1.
-      CosNaming::Name level2 (level1);
-      level2.length (2);
-      level2[1].id = CORBA::string_dup ("level2_context");
-      root_context->bind_context (level2,
-                                  level2_context.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Resolve and unbind level1/level2/foo, and bind it back.
-      CosNaming::Name test_name (level2);
-      test_name.length (3);
-      test_name[2].id = obj_name[0].id;
-      CORBA::Object_var result_obj_ref =
-        root_context->resolve (test_name
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      Test_Object_var result_object =
-        Test_Object::_narrow (result_obj_ref.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (result_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Problems with resolving foo in Tree Test - nil object ref.\n"),
-                          -1);
-
-      CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (id != CosNaming_Client::OBJ1_ID)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Problems with resolving foo in Tree Test - wrong id.\n"),
-                          -1);
-
-      // Unbind the object from the Naming Context and bind it back
-      // in.
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      root_context->bind (test_name,
-                          obj1.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Create new context and rebind under the name level1/level2.
-      CosNaming::NamingContext_var new_level2_context;
-      new_level2_context =
-        root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      root_context->rebind_context (level2,
-                                  new_level2_context.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Bind, resolve, rebind, and resolve foo under level1/level2.
-      root_context->bind (test_name,
-                          obj1.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      result_obj_ref = root_context->resolve (test_name
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      result_object = Test_Object::_narrow (result_obj_ref.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Short obj_id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (result_object.in ())
-          || !(obj_id == CosNaming_Client::OBJ1_ID))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Problems in the Tree Test\n"),
-                          -1);
-
-      My_Test_Object *impl2 =
-        new My_Test_Object (CosNaming_Client::OBJ2_ID);
-      Test_Object_var obj2 = impl2->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      impl2->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      root_context->rebind (test_name,
-                            obj2.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      result_obj_ref = root_context->resolve (test_name
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      result_object = Test_Object::_narrow (result_obj_ref.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      obj_id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (result_object.in ())
-          || !( obj_id == CosNaming_Client::OBJ2_ID))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Problems with rebind in Tree Test\n"),
-                          -1);
-    }
-
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Tree test");
-      return -1;
-    }
-
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "All functions work properly \n"));
-  return 0;
-}
-
-int
-Exceptions_Test::execute (TAO_Naming_Client &root_context)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Set things up.
-
-      // Create a tree of contexts root->level1->level2.
-      CosNaming::Name context_name;
-      context_name.length (1);
-      context_name[0].id = CORBA::string_dup ("level1_context");
-      CosNaming::NamingContext_var level1_context;
-      level1_context = root_context->bind_new_context (context_name
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      context_name[0].id = CORBA::string_dup ("level2_context");
-      CosNaming::NamingContext_var level2_context;
-      level2_context = level1_context->bind_new_context (context_name
-                                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Bind a dummy object foo under each context.
-      My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CosNaming::Name object_name;
-      object_name.length (1);
-      object_name[0].id = CORBA::string_dup ("foo");
-      root_context->bind (object_name,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      level1_context->bind (object_name,
-                            obj.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      level2_context->bind (object_name,
-                            obj.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Run exceptions tests.
-      invalid_name_test (root_context
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      already_bound_test (root_context
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      already_bound_test2 (root_context
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      not_found_test (root_context
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      not_found_test2 (root_context
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      not_found_test3 (root_context
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Exceptions test");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-void
-Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context
-                                    ACE_ENV_ARG_DECL)
-{
-  ACE_TRY
-    {
-      CosNaming::Name test_name;
-      test_name.length (0);
-
-      root_context->resolve (test_name
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n"));
-    }
-  ACE_CATCH (CosNaming::NamingContext::InvalidName, ex)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "InvalidName exception works properly\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n"));
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-void
-Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context
-                                     ACE_ENV_ARG_DECL)
-{
-  ACE_TRY
-    {
-      CosNaming::Name test_name;
-      test_name.length (1);
-      test_name[0].id = CORBA::string_dup ("foo");
-      My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      root_context->bind (test_name,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n"));
-    }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "AlreadyBound exception (case 1) works properly\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n"));
-      ACE_RE_THROW;
-    }
-
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-void
-Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context
-                                      ACE_ENV_ARG_DECL)
-{
-  ACE_TRY
-    {
-      CosNaming::Name test_name;
-      test_name.length (2);
-      test_name[0].id = CORBA::string_dup ("level1_context");
-      test_name[1].id = CORBA::string_dup ("foo");
-      My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      root_context->bind (test_name,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n"));
-    }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "AlreadyBound  exception (case 2) works properly\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n"));
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-void
-Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
-                                 ACE_ENV_ARG_DECL)
-{
-  ACE_TRY
-    {
-      CosNaming::Name test_name;
-      test_name.length (3);
-      test_name[0].id = CORBA::string_dup ("level1_context");
-      test_name[1].id = CORBA::string_dup ("level2_context");
-      test_name[2].id = CORBA::string_dup ("bar");
-
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "Not found test failed\n"));
-    }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
-    {
-      if (ex.why == CosNaming::NamingContext::missing_node &&
-          ex.rest_of_name.length () == 1
-          && ACE_OS::strcmp (ex.rest_of_name[0].id.in (),
-                             "bar") == 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "NotFound  exception (case 1) works properly\n"));
-      else
-        ACE_DEBUG ((LM_DEBUG,
-                    "NotFound  exception (case 1)"
-                    " - parameters aren't set correctly\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_DEBUG ((LM_DEBUG, "Not found test failed\n"));
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-void
-Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
-                                  ACE_ENV_ARG_DECL)
-{
-  ACE_TRY
-    {
-      CosNaming::Name test_name;
-      test_name.length (3);
-      test_name[0].id = CORBA::string_dup ("level1_context");
-      test_name[1].id = CORBA::string_dup ("level3_context");
-      test_name[2].id = CORBA::string_dup ("foo");
-
-      root_context->unbind (test_name
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n"));
-    }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
-    {
-      if (ex.why == CosNaming::NamingContext::missing_node
-          && ex.rest_of_name.length () == 2
-          && ACE_OS::strcmp (ex.rest_of_name[0].id.in (),
-                             "level3_context") == 0
-          && ACE_OS::strcmp (ex.rest_of_name[1].id.in (),
-                             "foo") == 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "NotFound  exception (case 2) works properly\n"));
-      else
-        ACE_DEBUG ((LM_DEBUG,
-                    "NotFound  exception (case 2)"
-                    " - parameters aren't set correctly\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n"));
-      ACE_RE_THROW;
-    }
-
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-void
-Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
-                                  ACE_ENV_ARG_DECL)
-{
-  ACE_TRY
-    {
-      CosNaming::Name test_name;
-      test_name.length (3);
-      test_name[0].id = CORBA::string_dup ("level1_context");
-      test_name[1].id = CORBA::string_dup ("foo");
-      test_name[2].id = CORBA::string_dup ("foo");
-
-      root_context->unbind (test_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed - no exception was thrown\n"));
-    }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
-    {
-      if (ex.why == CosNaming::NamingContext::not_context
-          && ex.rest_of_name.length () == 2
-          && ACE_OS::strcmp (ex.rest_of_name[0].id.in (),
-                             "foo") == 0
-          && ACE_OS::strcmp (ex.rest_of_name[1].id.in (),
-                             "foo") == 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "NotFound  exception (case 3) works properly\n"));
-      else
-        ACE_DEBUG ((LM_DEBUG,
-                    "NotFound  exception (case 3)"
-                    " - parameters aren't set correctly\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed\n"));
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-int
-Iterator_Test::execute (TAO_Naming_Client &root_context)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Instantiate four dummy objects.
-      My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Bind objects to the naming context.
-      CosNaming::Name name1;
-      name1.length (1);
-      name1[0].id = CORBA::string_dup ("foo1");
-      CosNaming::Name name2;
-      name2.length (1);
-      name2[0].id = CORBA::string_dup ("foo2");
-      CosNaming::Name name3;
-      name3.length (1);
-      name3[0].id = CORBA::string_dup ("foo3");
-      CosNaming::Name name4;
-      name4.length (1);
-      name4[0].id = CORBA::string_dup ("foo4");
-      root_context->bind (name1,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      root_context->bind (name2,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      root_context->bind (name3,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      root_context->bind (name4,
-                          obj.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // List the content of the Naming Context.
-      CosNaming::BindingIterator_var iter;
-      CosNaming::BindingList_var bindings_list;
-      root_context->list (1,
-                          bindings_list.out (),
-                          iter.out ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      if (CORBA::is_nil (iter.in ())
-          || bindings_list->length () != 1
-          || bindings_list[0u].binding_type != CosNaming::nobject)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "CosNaming::list does not function properly\n"),
-                          -1);
-      ACE_DEBUG ((LM_DEBUG,
-                  "First binding: %s\n",
-                  bindings_list[0u].binding_name[0u].id.in ()));
-
-      // Invoke operations on the iterator.
-      CosNaming::Binding_var binding;
-      iter->next_one (binding.out ()
-                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      if (binding->binding_type != CosNaming::nobject)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "CosNaming::next_one does not function properly\n"),
-                          -1);
-      ACE_DEBUG ((LM_DEBUG,
-                  "Second binding: %s\n",
-                  binding->binding_name[0].id.in ()));
-
-      iter->next_n (2, bindings_list.out () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      if (bindings_list->length () != 2
-          || bindings_list[0u].binding_type != CosNaming::nobject
-          || bindings_list[1u].binding_type != CosNaming::nobject)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "CosNaming::BindingIterator does not function properly\n"),
-                          -1);
-      ACE_DEBUG ((LM_DEBUG,
-                  "Third binding: %s\n"
-                  "Fourth binding: %s\n",
-                  bindings_list[0u].binding_name[0].id.in (),
-                  bindings_list[1u].binding_name[0].id.in ()));
-
-      // We already iterated over all the bindings, so the following
-      // should return false.
-      CORBA::Boolean result = iter->next_one (binding.out ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      if (result)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "CosNaming::BindingIterator does not function properly\n"),
-                          -1);
-      iter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Iterator test");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-int
-Destroy_Test::execute (TAO_Naming_Client &root_context)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Create a context and bind an object under it.
-
-      CosNaming::NamingContext_var my_context;
-      my_context = root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Bind a dummy object foo under my_context.
-      My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CosNaming::Name object_name;
-      object_name.length (1);
-      object_name[0].id = CORBA::string_dup ("foo");
-      my_context->bind (object_name,
-                            obj.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Do the testing.
-      not_empty_test (my_context
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      my_context->unbind (object_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      my_context->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      not_exist_test (my_context
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Destroy test");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-void
-Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref
-                                    ACE_ENV_ARG_DECL)
-{
-  ACE_TRY
-    {
-      ref->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-
-  ACE_CATCH (CosNaming::NamingContext::NotEmpty, ex)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "NotEmpty exception works properly\n"));
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-void
-Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref
-                                    ACE_ENV_ARG_DECL)
-{
-  ACE_TRY
-    {
-      ref->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Destroy works properly\n"));
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-Persistent_Test_Begin::Persistent_Test_Begin (CORBA::ORB_ptr orb,
-                                              FILE * ior_output_file)
-  : orb_ (orb),
-    file_ (ior_output_file)
-{
-}
-
-Persistent_Test_Begin::~Persistent_Test_Begin (void)
-{
-}
-
-int
-Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Create a name structure we will reuse.
-      CosNaming::Name test_name;
-      test_name.length (1);
-      test_name[0].id = CORBA::string_dup ("level1");
-
-      // Create and bind a naming context under the <root> context.
-      CosNaming::NamingContext_var level1_context =
-        root_context->bind_new_context (test_name
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Create and bind a naming context under <level1> context.
-      test_name[0].id = CORBA::string_dup ("level2");
-      CosNaming::NamingContext_var level2_context =
-        level1_context->bind_new_context (test_name
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Log the ior of <level1_context> for use by <Persistent_Test_End>.
-      CORBA::String_var ior =
-        orb_->object_to_string (level1_context.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_OS::fprintf (this->file_,
-                       "%s",
-                       ior.in ());
-      ACE_OS::fclose (this->file_);
-
-      ACE_DEBUG ((LM_DEBUG, "Persistent Naming test (part 1) OK.\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in Persistent Test (part 1)");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-Persistent_Test_End::Persistent_Test_End (CORBA::ORB_ptr orb,
-                                          const char *ior)
-  : orb_ (orb),
-    ior_ (ior)
-{
-}
-
-Persistent_Test_End::~Persistent_Test_End (void)
-{
-}
-
-int
-Persistent_Test_End::execute (TAO_Naming_Client &root_context)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Create a name structure we will reuse.
-      CosNaming::Name test_name;
-      test_name.length (1);
-      test_name[0].id = CORBA::string_dup ("level2");
-
-      // Convert stringified ior we got from <Persistent_Test_Begin>
-      // for <level1> Naming Context to Naming Context reference.
-      CORBA::Object_var obj =
-        orb_->string_to_object (ior_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CosNaming::NamingContext_var level1_context =
-        CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (level1_context.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot narrow object to Naming Context\n"),
-                          -1);
-
-      //  Resolve for <level2> context through the persistent ior we
-      // got from part 1 of this test.
-      obj = level1_context->resolve (test_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Now, resolve for <level2> context using the <root> context
-      // reference which we obtained through <resolve_initial_references>.
-      test_name.length (2);
-      test_name[0].id = CORBA::string_dup ("level1");
-      test_name[1].id = CORBA::string_dup ("level2");
-      CORBA::Object_var obj2 =
-        root_context->resolve (test_name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Make sure we got the same answer through both methods.
-      if (obj2->_is_equivalent (obj.in ()))
-        ACE_DEBUG ((LM_DEBUG, "Persistent Naming test (part 2) OK.\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected exception in Persistent Test (part 2)");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-// This function runs the test.
-
-int
-main (int argc, char **argv)
-{
-  CosNaming_Client cosnaming_client;
-
-  if (cosnaming_client.init (argc, argv) == -1)
-    return 1;
-
-  return cosnaming_client.run ();
-}
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
deleted file mode 100644
index e8fe27385c1..00000000000
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
+++ /dev/null
@@ -1,335 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests
-//
-// = FILENAME
-//    client.h
-//
-// = DESCRIPTION
-//      This class tests the facilities to connect to the naming service.
-//
-// = AUTHORS
-//      Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "test_objectS.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "tao/Utils/ORB_Manager.h"
-#include "ace/Task.h"
-
-class Naming_Test
-{
-  // = TITLE
-  //    This is an abstract class which is subclassed
-  //    to create different Naming Service tests.
-  //
-  // = DESCRIPTION
-  //    This is a basic example of the "Strategy" pattern.  This class
-  //    provides a common interface for different tests (or
-  //    "strategies"), so that a specific test to be used can be
-  //    chosen at runtime.
-
-public:
-  virtual ~Naming_Test (void) {}
-  virtual int execute (TAO_Naming_Client &root_context) = 0;
-  // Execute the test code.  <root_context> is the context to assume
-  // as the root for all tests operations.
-};
-
-class Simple_Test : public Naming_Test
-{
-  // = TITLE
-  //    This class implements a simple Naming Service test.
-  //
-  // = DESCRIPTION
-  //    The test binds(), resolves(), and unbinds() an object
-  //    reference from the given Naming Context.
-public:
-  virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the simple test code.
-};
-
-class MT_Test : public Naming_Test, public ACE_Task_Base
-{
-  // = TITLE
-  //    This class implements a simple Multithreaded (multiclient) Naming Service test.
-  //
-  // = DESCRIPTION
-  //    The test spawns multiple threads: each attempts to
-  //    bind(), resolve(), and unbind() an object
-  //    reference using the same name, and the same Naming Context.
-public:
-  // = Initialization and termination methods.
-
-  MT_Test (CORBA::ORB_ptr orb,
-           int size = 10);
-  // Constructor.  Takes in an orb pointer and number of threads to spawn.
-
-  virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the MT test code.
-
-  virtual int svc (void);
-  // This code is executed by each thread.
-
-private:
-  int size_;
-  // Number of threads to spawn.  By default is set to 10.
-
-  CORBA::ORB_var orb_;
-  // A pointer to our ORB.
-
-  char* name_service_ior_;
-  // IOR in the string format for Naming Service we are to deal with.
-  // Each thread will use string_to_object() and this IOR to create
-  // its own NamingContext stub for invoking operations on the
-  // Naming Service.  If all threads try to use the same stub, bad things
-  // happen...
-
-  // This can be replaced with CORBA::String_var when <string_to_object>
-  // is fixed - this will clean up the memory properly.
-
-  CosNaming::Name test_name_;
-  // Holds name used for registering the object with Naming Service.
-
-  Test_Object_var test_ref_;
-  // Holds object to be registered with the Naming Service by each thread.
-
-};
-
-class Tree_Test : public Naming_Test
-{
-  // = TITLE
-  //    This class implements a test of all Naming Service functions
-  //    on a tree of Naming Contexts.
-  //
-  // = DESCRIPTION
-  //    Bind_context() under the root context with the name level1.
-  //    Create_new_context(), bind() foo object into it, and
-  //    bind the context into root/level1 under the name level2.
-  //    Resolve (root/level1/level2/foo).
-  //    Unbind (root/level1/level2/foo).
-  //    Bind (root/level1/level2/foo, obj)
-  //    Create_new_context()
-  //    and invoke rebind_context() to substitute it for the current
-  //    level2 context.
-  //    Bind (root/level1/level2/foo, obj)
-  //    Resolve (root/level1/level2/foo).
-  //    Rebind() to have a different object under the name bar.
-  //    Resolve (root/level1/level2/foo) to make sure correct reference is returned.
-public:
-  virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the tree test code.
-};
-
-class Iterator_Test : public Naming_Test
-{
-  // = TITLE
-  //    This class implements a test of Naming Service functions
-  //    which involve BindingIterator.
-  //
-  // = DESCRIPTION
-  //    The test binds foo1, foo2, foo3, and foo4 objects to the
-  //    Naming Context.  It lists() one binding and receives
-  //    BindingIterator to iterate over the rest of the bindings.  It
-  //    then invokes next_one(), next_n(2), next_one(), and destroy()
-  //    on the iterator.
-public:
-  virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the iterator test code.
-};
-
-class Exceptions_Test : public Naming_Test
-{
-  // = TITLE
-  //    This class implements a test of exceptions in the Naming Service.
-  //
-  // = DESCRIPTION
-  //    Makes sure that Naming Service throws exceptions as expected, and
-  //    data inside exceptions is set correctly.  The test creates a tree of
-  //    of Naming Contexts: root context -> level1 -> level2.  It then binds() an
-  //    object with the name foo to each of Naming Contexts in the tree.
-  //    Invoke resolve() with a Name of length 0 - make sure we get InvalidName exception.
-  //    Invoke bind( foo, obj) on root context - make sure we get AlreadyBound exception.
-  //    Invoke bind( level1/foo, obj) on root context - make sure we get AlreadyBound exc.
-  //    Invoke unbind( level1/level2/bar) on root context - make sure we get NotFound exc.
-  //    with why = not_object, rest_of_name = bar.
-  //    Invoke unbind( level1/level3/foo) on root context - make sure we get NotFound exc.
-  //    with why = missing_node, rest_of_name = level3/foo.
-  //    Invoke unbind( level1/foo/foo) on root context - make sure we get NotFound exc.
-  //    with why = not_context, rest_of_name = foo/foo.
-public:
-  virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the exceptions test code.
-
-private:
-  // the following functions isolate specific tests due to the
-  // limitation of only 1 TAO_TRY being allowed per function.
-
-  void invalid_name_test (TAO_Naming_Client &root_context
-                          ACE_ENV_ARG_DECL);
-  void already_bound_test (TAO_Naming_Client &root_context
-                           ACE_ENV_ARG_DECL);
-  void already_bound_test2 (TAO_Naming_Client &root_context
-                            ACE_ENV_ARG_DECL);
-  void not_found_test (TAO_Naming_Client &root_context
-                       ACE_ENV_ARG_DECL);
-  void not_found_test2 (TAO_Naming_Client &root_context
-                        ACE_ENV_ARG_DECL);
-  void not_found_test3 (TAO_Naming_Client &root_context
-                        ACE_ENV_ARG_DECL);
-};
-
-class Destroy_Test : public Naming_Test
-{
-  // = TITLE
-  //    This class implements a test of destroy() function
-  //    in the Naming Service.
-  //
-  // = DESCRIPTION
-  //    Create a context and bind an object under it.
-  //    Attempt to destroy the context - NotEmpty exception should be raised.
-  //
-  //    Unbind the object and call destroy on the context.
-  //    Attempt to call destroy on the object again - OBJECT_NOT_EXIST
-  //    exception should be raised.
-  //
-public:
-  virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the destroy test code.
-
-private:
-  // = The following functions isolate specific tests.
-  void not_empty_test (CosNaming::NamingContext_var &ref
-                       ACE_ENV_ARG_DECL);
-  void not_exist_test (CosNaming::NamingContext_var &ref
-                       ACE_ENV_ARG_DECL);
-};
-
-class Persistent_Test_Begin : public Naming_Test
-{
-  // = TITLE
-  //    This class implements the first part of the Persistent Naming
-  //    Service test.
-  //
-  // = DESCRIPTION
-  //    This test creates the Naming Context hierarchy:
-  //    root -> level1_context -> level2_context,
-  //    and prints out the ior of the <level1_context>.
-public:
-  // = Initialization and termination methods.
-
-  Persistent_Test_Begin (CORBA::ORB_ptr orb,
-                         FILE * ior_output_file);
-  // Constructor.  Takes in an orb pointer.
-
-  virtual ~Persistent_Test_Begin (void);
-  // Destructor.
-
-  virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the persistent test (part 1) code.
-
-private:
-
-  CORBA::ORB_var orb_;
-  // A pointer to our ORB (needed for object/string conversion).
-
-  FILE *file_;
-  // File where we output the ior for use by part 2 of persistent test.
-};
-
-class Persistent_Test_End : public Naming_Test
-{
-  // = TITLE
-  //    This class implements the second part of the Persistent Naming
-  //    Service test.
-  //
-  // = DESCRIPTION
-  //   This test attempts to resolve <level2_context> both through the
-  //   <root> Naming Context, which it gets from <resolve_initial_references>, and
-  //   through <level1_context> stringified ior, which it gets from part 1 of
-  //   the persistent test.  The results of both methods are then
-  //   compared for equality.
-public:
-  // = Initialization and termination methods.
-
-  Persistent_Test_End (CORBA::ORB_ptr orb,
-                       const char * ior);
-  // Constructor.  Takes in an orb pointer and the ior received from
-  // <Persistent_Test_Begin>.
-
-  virtual ~Persistent_Test_End (void);
-  // Destructor.
-
-  virtual int execute (TAO_Naming_Client &root_context);
-  // Execute the persistent test (part 2).
-
-private:
-
-  CORBA::ORB_var orb_;
-  // A pointer to our ORB (used for string/object conversion).
-
-  const char* ior_;
-  // IOR of <level1_context> recorded during the run of part 1 of
-  // persistent test.
-};
-
-class CosNaming_Client
-{
-  // = TITLE,
-  //    Defines a class that encapsulates behaviour of the CosNaming
-  //    client example.  Provides a better understanding of the logic
-  //    in an object-oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    CosNaming CORBA server.  All the complexity for initializing
-  //    the server is hidden in the class.  Just the <run> interface
-  //    is needed.
-public:
-  // = Initialization and termination methods.
-
-  CosNaming_Client (void);
-  // Constructor.
-
-  ~CosNaming_Client (void);
-  // Destructor.
-
-  int run (void);
-  // Execute client example code.
-
-  int init (int argc, char **argv);
-  // Initialize the client communication endpoint with server.
-
-  // = Symbolic ids.
-  enum OBJ_ID
-  {
-    OBJ1_ID = 5,
-    OBJ2_ID = 6
-  };
-
-private:
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  Naming_Test *test_;
-  // A pointer to the specific Naming Service test a client will
-  // execute.
-
-  TAO_ORB_Manager orbmgr_;
-  // Our ORB manager helper class.
-
-  TAO_Naming_Client naming_client_;
-  // Our naming client helper class.
-};
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc
deleted file mode 100644
index 22d615b4010..00000000000
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Client) : namingexe, portableserver, utils {
-  Source_Files {
-    client.cpp
-  }
-}
-
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/pvtkey-client.pem b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/pvtkey-client.pem
deleted file mode 100644
index cf53308cae2..00000000000
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/pvtkey-client.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXwIBAAKBgQD3LcZOo8tF7BHEYMsm5pn3zYV+u6NhhvPC5G5bErY8qi8Xt4CZ
-PSQPm4JmVFvLsY2H6Eme8Oe7j4bCquRuB1D/U5auKdINQ1aG2CgKqPtBy1SliHE3
-FD1Ht43O+z2mRzGHtqLowhEvFEpEVHcJLUQ7HVHPJaRNQkn80DA/nN9+5wIDAQAB
-AoGBANpBJPWTU43uINIR1dAHlrRkWRfKfz1CeEMCiR8JqrhuXR7H/VlRz2Goor/Q
-hS2bHal/xmH9veCznv6M/x7Yfv74hhUJxyqngNxbwGI4G+LfR3/x1fqVcweDGmv6
-LYLL4JWyDLEL5I3PEZP/dUnT6+bmmuXWU5z83itqYw8VRbsBAkEA/MnqXFlWl1KF
-jTee5pijKOXGAvllrpN8MkTKM2MdjltzOkuhC1OEwhXYy86e90gRQvXAs3t7A4dT
-Q5/eUYHgYQJBAPpRnYcqqDP0Rj/JqMDapwIVjMoMDQP+thB4Ey6fSRC7dYiX4+Qo
-cyX8j0YnF0RYl426+Qv2O6egmOmzrQwQxEcCQQDAfUBocd7t+3iWv/PPxAr56X2O
-Zjp3ZPb9kEQoPSEUda6YhV5sMXy2Dcy35O5Hfikmw9uo0C4r0bAlnma7yhoBAkEA
-tI0/6ansDyVnskTbktdj1Q4EMgxFKxeC7RgfBebghdAg87hTKVO/0qt8EGbL0oFw
-N0ugrW8bEkq1YQQ3kldZqwJBAJPIe/NE+NhSOoSo3kEQ70SkjU5EB2sbVxhjq6ci
-UdXa+EOAna5JS5ZFMDq4AI+qU8OoSgI26hdH5S8lf10fIDo=
------END RSA PRIVATE KEY-----
-
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/pvtkey.pem b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/pvtkey.pem
deleted file mode 100644
index 81ba8e3f968..00000000000
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/pvtkey.pem
+++ /dev/null
@@ -1,10 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBAPXZ7YNyFU8T8PVitNwZmdwuc4tG64V/lDYHnmzolmFPQ6gvI2uo
-KBQeHeJFPI6LJ5TGb8hCnypy+zbc+pve8vECAwEAAQJAE/fmZbW/a1PYT2X8AKCH
-sa2ILvjMqmQpWpYV1QyzIiYQPEmQ/5GMUj/t3PZd/17BOH8aPakBT/c1Gp+os6vR
-zQIhAP2RDmm6UyMrJhAtAcNC5s8nbfhKPG80Q0DZ2kiodjQfAiEA+DXqwEZlCh0j
-VPzEXY7vrdQa641zQ5XIX1S/+WbCdu8CIDT9m4V86uLuoYW/4h5sXM/t7Y119itH
-QMbMwFFu40UBAiEA9z+mN6An2BpMbsVXyiavREYMBuahkgprTeM7VHHzdssCIQCY
-QEgmpzGzfdZoREy9B7ooNeRO919lR9qvbte9vvJvWQ==
------END RSA PRIVATE KEY-----
-
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl
deleted file mode 100755
index a63768a2dc3..00000000000
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl
+++ /dev/null
@@ -1,161 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-# This is a Perl script that runs some Naming Service tests.
-# It runs all the tests that will run with min CORBA.
-# It starts all the servers and clients as necessary.
-
-use lib '../../../../../bin';
-use PerlACE::Run_Test;
-
-# Amount of delay (in seconds) between starting a server and a client
-# to allow proper server initialization.
-$sleeptime = 10;
-
-# The default host name.
-$TARGETHOSTNAME = "localhost";
-
-$quiet = 0;
-$use_ssl = 1;
-$debug_level = 0;
-
-while (my $argument = shift) {
-   if ($argument eq '-q') {
-       $quiet = 1;
-       next;
-   }
-   if ($argument eq '-d') {
-       $debug_level = shift;
-       next;
-   }
-   print STDERR "Unknown: $argument\nUsage $0 [-q] [-d n]\n";
-   exit(-1);
-}
-
-# Variables for command-line arguments to client and server
-# executables.
-$ns_multicast_port = 10001 + PerlACE::uniqueid (); # Can not be 10000 on Chorus 4.0
-$ns_orb_port = 12000 + PerlACE::uniqueid ();
-$ns_ssl_port = 14000 + PerlACE::uniqueid ();
-$iorfile = PerlACE::LocalFile ("ns.ior");
-$persistent_ior_file = PerlACE::LocalFile ("pns.ior");
-$persistent_log_file = PerlACE::LocalFile ("test_log");
-$data_file = PerlACE::LocalFile ("test_run.data");
-
-$status = 0;
-
-sub name_server
-{
-    my $args = "-ORBNameServicePort $ns_multicast_port -o $iorfile -m 1 @_";
-    my $prog = "../../../Naming_Service/Naming_Service";
-    $NS = new PerlACE::Process ($prog, $args);
-
-    unlink $iorfile;
-
-    print STDERR "CommandLine: server " . $NS->Arguments() . "\n\n" unless $quiet;
-    $NS->Spawn ();
-
-    if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
-        print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
-        $NS->Kill (); 
-        exit 1;
-    }
-}
-
-sub client
-{
-    my $args = "@_"." ";
-    my $prog = "client";
-
-    $CL = new PerlACE::Process ($prog, $args);
-
-    print STDERR "CommandLine: client " . $CL->Arguments() . "\n\n" unless $quiet;
-    $client = $CL->SpawnWaitKill (60);
-
-    if ($client != 0) {
-        print STDERR "ERROR: client returned $client\n";
-        $status = 1;
-    }
-}
-
-## The options below have been reordered due to a
-## initialization problem (within the Naming_Service)
-## that has only been seen on Windows XP.
-
-$orb_debug_level =  ($quiet || $debug_level == 0) ? "" : "-ORBDebugLevel $debug_level";
-
-# Options for all simple tests recognized by the 'client' program.
-@opts = (
-         "-s -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService" 
-                . " -ORBSvcConf client.conf $orb_debug_level",
-         "-t -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService"
-                . " -ORBSvcConf client.conf $orb_debug_level",
-         "-i -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService"
-                . " -ORBSvcConf client.conf $orb_debug_level",
-         "-e -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService"
-                . " -ORBSvcConf client.conf $orb_debug_level",
-         "-y -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService"
-                . " -ORBSvcConf client.conf $orb_debug_level",
-         
-         );
-
-@server_opts = (
-                "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port"
-                        . " -ORBSvcConf server.conf $orb_debug_level",
-                "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port"
-                        . " -ORBSvcConf server.conf $orb_debug_level",
-                "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port" 
-                        . " -ORBSvcConf server.conf $orb_debug_level",
-                "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port" 
-                        . " -ORBSvcConf server.conf $orb_debug_level",
-                "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port" 
-                        . " -ORBSvcConf server.conf $orb_debug_level",
-                
-                );
-
-@comments = (
-             "(SSL) Simple Test:",
-             "(SSL) Tree Test:",
-             "(SSL) Iterator Test:",
-             "(SSL) Exceptions Test:",
-             "(SSL) Destroy Test:",
-             );
-
-$test_number = 0;
-
-unlink ($persistent_ior_file, $persistent_log_file);
-
-# Run server and client for each of the tests.  Client uses ior in a
-# file to bootstrap to the server.
-foreach $o (@opts) {
-
-    print STDERR "\n          " . $comments[$test_number];
-    if ($use_ssl == 0 && $comments[$test_number] =~ /SSL/) {
-        print STDERR " - Skipping, use -s to run the SSL tests";
-        next;
-    }
-    
-    print STDERR "\n";
-    name_server ($server_opts[$test_number]);
-    client ($o);
-
-    $NS->Kill ();
-
-    ## For some reason, only on Windows XP, we need to
-    ## wait before starting another Naming_Service when
-    ## the mmap persistence option is used
-    if ($^O eq "MSWin32") {
-      sleep(1);
-    }
-
-    $test_number++;
-}
-
-unlink ($persistent_ior_file, $persistent_log_file);
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/selfsigncert-client.pem b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/selfsigncert-client.pem
deleted file mode 100644
index dc0a69d76e6..00000000000
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/selfsigncert-client.pem
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID3zCCA0igAwIBAgIBADANBgkqhkiG9w0BAQUFADCBrDELMAkGA1UEBhMCVVMx
-ETAPBgNVBAgTCE1pc3NvdXJpMRMwEQYDVQQHEwpDcmV2ZSBDb3JlMR4wHAYDVQQK
-ExVPYmplY3QgQ29tcHV0aW5nIEluYy4xETAPBgNVBAsTCFRBTyBUZWFtMRswGQYD
-VQQDExJvY2kxMTc5Lm9jaXdlYi5jb20xJTAjBgkqhkiG9w0BCQEWFmplbGlhemtv
-dl9pQG9jaXdlYi5jb20wHhcNMDQwOTEwMTY0MjMwWhcNMDUwOTEwMTY0MjMxWjCB
-rDELMAkGA1UEBhMCVVMxETAPBgNVBAgTCE1pc3NvdXJpMRMwEQYDVQQHEwpDcmV2
-ZSBDb3JlMR4wHAYDVQQKExVPYmplY3QgQ29tcHV0aW5nIEluYy4xETAPBgNVBAsT
-CFRBTyBUZWFtMRswGQYDVQQDExJvY2kxMTc5Lm9jaXdlYi5jb20xJTAjBgkqhkiG
-9w0BCQEWFmplbGlhemtvdl9pQG9jaXdlYi5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBAPctxk6jy0XsEcRgyybmmffNhX67o2GG88LkblsStjyqLxe3gJk9
-JA+bgmZUW8uxjYfoSZ7w57uPhsKq5G4HUP9Tlq4p0g1DVobYKAqo+0HLVKWIcTcU
-PUe3jc77PaZHMYe2oujCES8USkRUdwktRDsdUc8lpE1CSfzQMD+c337nAgMBAAGj
-ggENMIIBCTAdBgNVHQ4EFgQUgtnhUdIQh1ESq81PL+urdJj1LRkwgdkGA1UdIwSB
-0TCBzoAUgtnhUdIQh1ESq81PL+urdJj1LRmhgbKkga8wgawxCzAJBgNVBAYTAlVT
-MREwDwYDVQQIEwhNaXNzb3VyaTETMBEGA1UEBxMKQ3JldmUgQ29yZTEeMBwGA1UE
-ChMVT2JqZWN0IENvbXB1dGluZyBJbmMuMREwDwYDVQQLEwhUQU8gVGVhbTEbMBkG
-A1UEAxMSb2NpMTE3OS5vY2l3ZWIuY29tMSUwIwYJKoZIhvcNAQkBFhZqZWxpYXpr
-b3ZfaUBvY2l3ZWIuY29tggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-gYEAVZSDOJ40+iAJPb1GZWmmh5y5Y1DVXsQF5vRENYq15Pi5Y9GBhHaYFn3qjN2U
-+zyO2Cp2IJJG4HNazhBoDEj7EhDsxEyOYZiG2pd6BLe1dPl/viy6ysvdijjpcXw7
-bFPbXpCIa5rg8VKQsGYscWerLxvi79uoo+p6DrOU1FxDcYo=
------END CERTIFICATE-----
-
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/selfsigncert.pem b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/selfsigncert.pem
deleted file mode 100644
index e616730ca63..00000000000
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/selfsigncert.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICeDCCAiKgAwIBAgIBADANBgkqhkiG9w0BAQQFADBjMQswCQYDVQQGEwJVUzEL
-MAkGA1UECBMCTU8xDDAKBgNVBAcTA1NUTDELMAkGA1UEChMCV1UxDDAKBgNVBAsT
-A0RPQzELMAkGA1UEAxMCS0ExETAPBgkqhkiG9w0BCQEWAktBMB4XDTAxMDgyNzE2
-NTUxMVoXDTAxMDkyNjE2NTUxMVowYzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1P
-MQwwCgYDVQQHEwNTVEwxCzAJBgNVBAoTAldVMQwwCgYDVQQLEwNET0MxCzAJBgNV
-BAMTAktBMREwDwYJKoZIhvcNAQkBFgJLQTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgC
-QQD12e2DchVPE/D1YrTcGZncLnOLRuuFf5Q2B55s6JZhT0OoLyNrqCgUHh3iRTyO
-iyeUxm/IQp8qcvs23Pqb3vLxAgMBAAGjgcAwgb0wHQYDVR0OBBYEFL8LnC8csuIX
-+TUw6FCoReB27PHoMIGNBgNVHSMEgYUwgYKAFL8LnC8csuIX+TUw6FCoReB27PHo
-oWekZTBjMQswCQYDVQQGEwJVUzELMAkGA1UECBMCTU8xDDAKBgNVBAcTA1NUTDEL
-MAkGA1UEChMCV1UxDDAKBgNVBAsTA0RPQzELMAkGA1UEAxMCS0ExETAPBgkqhkiG
-9w0BCQEWAktBggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADQQAZP9CT
-TVRxAz3Acxxxn32rsnwSeNJr1uTA4hew7f4QZ187oZia+rcFLOILrwgCmtqEmWVj
-dj6COUrqKo60BI5V
------END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf
deleted file mode 100644
index 672a471014d..00000000000
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-dynamic SSLIOP_Factory Service_Object *
-        TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory()
-        "-SSLPrivateKey  PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"
-static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
-
-
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml
deleted file mode 100644
index 5aa645eb3bf..00000000000
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from server.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <dynamic id="SSLIOP_Factory" type="Service_Object">
-   <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLPrivateKey  PEM:pvtkey.pem -SSLCertificate PEM:selfsigncert.pem"/>
- </dynamic>
- <static id="Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory"/>
-</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl
deleted file mode 100644
index 4737f6dc6c8..00000000000
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-interface Test_Object
-{
-  // = TITLE
-  //   This is a simple interface that tests the Naming Service.
-
-  attribute short id;
-  // This provides an easy way to differentiate objects if each
-  // objects is served by a separate servant.
-};