10 files changed, 0 insertions, 248 deletions
diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc b/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc
deleted file mode 100644
index 31c098be24e..00000000000
--- a/TAO/tests/ORB_Local_Config/Bug_1459/Bug_1459.mpc
+++ /dev/null
@@ -1,12 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-
-project(*) : taoserver {
-  exename = Test
-  includes += ../lib
-  Source_Files {
-    Test.cpp
-  }
-}
-
diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/README b/TAO/tests/ORB_Local_Config/Bug_1459/README
deleted file mode 100644
index 590c65fc374..00000000000
--- a/TAO/tests/ORB_Local_Config/Bug_1459/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This test was borrowed from bugzilla 1459 and intends to test the
-ability to use differently configured ORBs within the same process.
diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp
deleted file mode 100644
index 346ca6ae926..00000000000
--- a/TAO/tests/ORB_Local_Config/Bug_1459/Test.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-
-// @author Jeff Mirwaisi <jeff_mirwaisi@yahoo.com>
-// @author Iliyan Jeliazkov <iliyan2ociweb.com>
-
-// the following is a simplification of the above problems (see
-// bugzilla 1459) and the different scenarios minus the creation of
-// the servant the service manager or threads even without the servant
-// to demonstrate that the server is capable of responding (which in
-// some cases it isnt) problems can allready be seen in the multiple
-// orb scenarios AB b isnt prompted for a new certificate password, MA
-// ssliop isnt loaded at all etc
-
-
-#include "tao/corba.h"
-#include "ace/ARGV.h"
-#include "ace/Dynamic_Service.h"
-
-/// The combination of orb instances and their configurations to test
-#define MORB_MA
-
-ACE_RCSID (tests, server, "$Id$")
-
-
-#include "Service_Configuration_Per_ORB.h"
-
-const char argA[] = "AAA -ORBId ORB-A -ORBSvcConf a.conf";
-
-// 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"
-
-const char argB[] = "BBB -ORBSvcConf b.conf";
-
-// 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"
-
-const char argM[] = "MMM -ORBId ORB-M -ORBSvcConf m.conf";
-
-// dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
-// static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
-// #static PortableGroup_Loader ""
-// dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
-
-int
-testBug1459 (int , ACE_TCHAR *[])
-{
-  ACE_TRACE ("testBug1459");
-
-  try
-  {
-
-#ifdef MORB_AB
-    ACE_ARGV arg0(argA);
-    int n = arg0.argc();
-    CORBA::ORB_var ORBA = CORBA::ORB_init(n,arg0.argv());
-
-    ACE_ARGV arg1(argB);
-    n = arg1.argc();
-    CORBA::ORB_var ORBB = CORBA::ORB_init(n,arg1.argv());
-#else
-    ACE_UNUSED_ARG (argA);
-    ACE_UNUSED_ARG (argB);
-#endif /* MORB_AB */
-
-
-
-#ifdef MORB_AM
-    ACE_ARGV arg0(argA);
-    int n = arg0.argc();
-    CORBA::ORB_var ORBA = CORBA::ORB_init(n,arg0.argv());
-
-    ACE_ARGV arg1(argM);
-    n = arg1.argc();
-    CORBA::ORB_var ORBB = CORBA::ORB_init(n,arg1.argv());
-#else
-    ACE_UNUSED_ARG (argA);
-    ACE_UNUSED_ARG (argM);
-#endif /* MORB_AM */
-
-
-
-#ifdef MORB_MA
-    int n = 0;
-    ACE_ARGV arg0(argM);
-    n = arg0.argc();
-    CORBA::ORB_var ORBA = CORBA::ORB_init(n, arg0.argv());
-    if (ORBA.in () == 0)
-      ACE_ERROR_RETURN ((LM_DEBUG, ACE_TEXT("Expected to get an ORB\n")), -1);
-
-    ACE_ARGV arg1(argA);
-    n = arg1.argc();
-    CORBA::ORB_var ORBB = CORBA::ORB_init(n, arg1.argv());
-    if (ORBB.in () == 0)
-      ACE_ERROR_RETURN ((LM_DEBUG, ACE_TEXT("Expected to get a second ORB\n")), -1);
-
-    if (ORBA.in () == ORBB.in ())
-      ACE_ERROR_RETURN ((LM_DEBUG, ACE_TEXT("Unexpected to find the two ORBs the same\n")), -1);
-
-    // Look ma!! No ... services?!
-
-    ACE_Service_Object *so = 0;
-    int error = 0;
-    so = ACE_Dynamic_Service<ACE_Service_Object>::instance ("SSLIOP_Factory");
-    if (so != 0)
-      {
-        error++;
-        ACE_ERROR ((LM_DEBUG,
-                    ACE_TEXT("Unexpected to find SSLIOP_Factory globally\n")));
-      }
-
-    so = ACE_Dynamic_Service<ACE_Service_Object>::instance ("UIPMC_Factory");
-    if (so != 0)
-      {
-        error++;
-        ACE_ERROR ((LM_DEBUG,
-                    ACE_TEXT("Unexpected to find ")
-                    ACE_TEXT("UIPMC_Factory globally\n")));
-      }
-
-    // Since each svc conf file causes the ORB to load the services in
-    // its own service space no services are reachable through the
-    // global service repo
-
-    ORBA->destroy();
-
-    ORBB->destroy();
-
-    if (error > 0)
-      return -1;
-#endif /* MORB_MA */
-
-  }
-  catch(const CORBA::Exception& ex)
-    {
-      ACE_PRINT_EXCEPTION (ex, "Unhandled exception caught");
-      return -1;
-    }
-  catch(...)
-    {
-      ACE_ERROR_RETURN ((LM_DEBUG, ACE_TEXT("Unexpected exception\n")), -1);
-    }
-
-  return 0;
-}
-
-// @brief the main driver
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  return testBug1459(argc, argv);
-}
diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/a.conf b/TAO/tests/ORB_Local_Config/Bug_1459/a.conf
deleted file mode 100644
index 042a572964b..00000000000
--- a/TAO/tests/ORB_Local_Config/Bug_1459/a.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-dynamic UIOP_Factory Service_Object * TAO_Strategies:_make_TAO_UIOP_Protocol_Factory() ""
-dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBProtocolFactory UIOP_Factory"
diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/b.conf b/TAO/tests/ORB_Local_Config/Bug_1459/b.conf
deleted file mode 100644
index 9452bc3f56a..00000000000
--- a/TAO/tests/ORB_Local_Config/Bug_1459/b.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-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/tests/ORB_Local_Config/Bug_1459/m.conf b/TAO/tests/ORB_Local_Config/Bug_1459/m.conf
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/TAO/tests/ORB_Local_Config/Bug_1459/m.conf
+++ /dev/null
diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/m1.conf b/TAO/tests/ORB_Local_Config/Bug_1459/m1.conf
deleted file mode 100644
index d9fad55aeb9..00000000000
--- a/TAO/tests/ORB_Local_Config/Bug_1459/m1.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
-dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
-static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
-
diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/run_test.pl b/TAO/tests/ORB_Local_Config/Bug_1459/run_test.pl
deleted file mode 100755
index 2b7f1395785..00000000000
--- a/TAO/tests/ORB_Local_Config/Bug_1459/run_test.pl
+++ /dev/null
@@ -1,49 +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;
-
-sub add_path {
-  my($name)  = shift;
-  my($value) = shift;
-  if (defined $ENV{$name}) {
-    $ENV{$name} .= ':' . $value
-  }
-  else {
-    $ENV{$name} = $value;
-  }
-}
-
-# Set the library path for the client to be able to load
-# the Time_Date library.
-add_path('LD_LIBRARY_PATH', '../lib');
-add_path('LIBPATH', '../lib');
-add_path('SHLIB_PATH', '../lib');
-
-sub test($)
-{
-    (my $executable, my $arguments) = @_;
-    my $t1 = new PerlACE::Process ($executable, ($arguments ? $arguments : ""));
-    my $status = $t1->SpawnWaitKill (10);
-    if ($status != 0) {
-        print STDERR "ERROR: test failed, status=$status\n";
-    }
-    return $status;
-} 
-
-my $status = 0;
-$status |= test("Test");
-
-if ($status == 0) {
-    print STDERR "SUCCESS: All tests passed\n";
-}
-else {
-    print STDERR "ERROR: Some test failed, status=$status\n";
-}
-exit $status;
-
diff --git a/TAO/tests/ORB_Local_Config/Bug_1459/server_cert.pem b/TAO/tests/ORB_Local_Config/Bug_1459/server_cert.pem
deleted file mode 100644
index e616730ca63..00000000000
--- a/TAO/tests/ORB_Local_Config/Bug_1459/server_cert.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/tests/ORB_Local_Config/Bug_1459/server_key.pem b/TAO/tests/ORB_Local_Config/Bug_1459/server_key.pem
deleted file mode 100644
index 6facae6f3dd..00000000000
--- a/TAO/tests/ORB_Local_Config/Bug_1459/server_key.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-----