Tue Jul 24 06:56:23 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 9 insertions, 160 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b0619c0a6dd..0191dde4e6c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jul 24 06:56:23 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf:
+        * performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf.xml:
+        * performance-tests/Cubit/TAO/IDL_Cubit/run_test_lite.pl:
+        * performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf:
+        * performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf.xml:
+          Removed, lite protocols are not supported anymore
+
 Mon Jul 23 19:38:23 UTC 2007  Wallace Zhang  <zhang_w@ociweb.com>
 
         * tao/Object_KeyC.cpp:
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf
deleted file mode 100644
index d1ffcb21d3f..00000000000
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-dynamic IIOP_Lite_Factory Service_Object * TAO:_make_TAO_IIOP_Lite_Protocol_Factory() ""
-static Advanced_Resource_Factory "-ORBProtocolFactory IIOP_Lite_Factory"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf.xml
deleted file mode 100644
index 8a4826608d3..00000000000
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <dynamic id="IIOP_Lite_Factory" type="Service_Object">
-   <initializer path="TAO" init="_make_TAO_IIOP_Lite_Protocol_Factory"/>
- </dynamic>
- <static id="Advanced_Resource_Factory" params="-ORBProtocolFactory IIOP_Lite_Factory"/>
-</ACE_Svc_Conf>
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test_lite.pl b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test_lite.pl
deleted file mode 100755
index 22c9d3dd391..00000000000
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test_lite.pl
+++ /dev/null
@@ -1,140 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-# The first three lines above let this script run without specifying the
-# full path to perl, as long as it is in the user's PATH.
-# Taken from perlrun man page.
-
-# Do not use environment variables here since not all platforms use ACE_ROOT
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::Run_Test;
-use English;
-
-$status = 0;
-
-$iorfile = PerlACE::LocalFile ("cubit.ior");
-$iiop_lite_conf = PerlACE::LocalFile ("iiop_lite$PerlACE::svcconf_ext");
-$uiop_lite_conf = PerlACE::LocalFile ("uiop_lite$PerlACE::svcconf_ext");
-#$server_shmiop_conf = PerlACE::LocalFile ("server_shmiop_lite$PerlACE::svcconf_ext");
-#$client_shmiop_conf = PerlACE::LocalFile ("client_shmiop_lite$PerlACE::svcconf_ext");
-$svnsflags = " -f $iorfile";
-$clnsflags = " -f $iorfile";
-$clflags = "";
-$svflags = "";
-$quietflag = " -q ";
-
-
-###############################################################################
-# Parse the arguments
-
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-        print "run_test [-h] [-n num] [-debug] [-verbose]\n";
-        print "\n";
-        print "-h                  -- prints this information\n";
-        print "-n num              -- client uses <num> iterations\n";
-        print "-debug              -- sets the debug flag for both client and "
-                                      . "server\n";
-        exit;
-    }
-    elsif ($ARGV[$i] eq "-debug") {
-        $clflags .= " -d ";
-        $svflags .= " -d ";
-    }
-    elsif ($ARGV[$i] eq "-n") {
-        $clflags .= " -n $ARGV[$i + 1] ";
-        $i++;
-    }
-    elsif ($ARGV[$i] eq "-verbose") {
-        $quietflag = "";
-    }
-    else {
-        print STDERR "ERROR: Unknown Option: ".$ARGV[$i]."\n";
-    }
-}
-
-$SV = new PerlACE::Process ("server");
-$CL = new PerlACE::Process ("client");
-
-###############################################################################
-# run_test_helper
-
-sub run_test_helper ()
-{
-    $SV->Spawn ();
-
-    if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
-        print STDERR "ERROR: cannot find file <$iorfile>\n";
-        $SV->Kill ();
-        exit 1;
-    }
-
-    my $client = $CL->SpawnWaitKill (120);
-    my $server = $SV->WaitKill (30);
-
-    unlink $iorfile;
-
-    if ($server != 0) {
-        print STDERR "ERROR: server error status $server\n";
-        $status = 1;
-    }
-
-    if ($client != 0) {
-        print STDERR "ERROR: client error status $client\n";
-        $status = 1;
-    }
-}
-
-###############################################################################
-
-if (! (-x $SV->Executable () && -x $CL->Executable)) {
-    print STDERR "ERROR: server and/or client missing or not executable!\n";
-    exit 1;
-}
-
-unlink $iorfile;
-
-print STDERR "============================================================\n";
-print STDERR "Running IDL_Cubit with the IIOP Lite ORB protocol.\n\n";
-
-$SV->Arguments ($svflags . $svnsflags);
-$CL->Arguments ($clflags . $clnsflags . $quietflag . " -x ");
-
-$SV->Arguments ($SV->Arguments () . " -ORBSvcConf $iiop_lite_conf ");
-$CL->Arguments ($CL->Arguments () . " -ORBSvcConf $iiop_lite_conf ");
-
-run_test_helper ();
-
-if ($OSNAME ne "MSWin32") {
-    print STDERR "============================================================\n";
-    print STDERR "Running IDL_Cubit with the UIOP Lite protocol.\n\n";
-
-    $SV->Arguments ($svflags . $svnsflags . " -ORBEndpoint uiop:// ");
-    $CL->Arguments ($clflags . $clnsflags . $quietflag . " -x ");
-
-    $SV->Arguments ($SV->Arguments () . " -ORBSvcConf $uiop_lite_conf ");
-    $CL->Arguments ($CL->Arguments () . " -ORBSvcConf $uiop_lite_conf ");
-
-    run_test_helper ();
-}
-
-# This portions needs to be enabled once we have an SHMIOP_Lite in
-# place..
-
-#print STDERR "============================================================\n";
-#print STDERR "Running IDL_Cubit with the SHMIOP Lite protocol.\n\n";
-
-#$SV->Arguments ($svflags . $svnsflags
-#                . " -ORBEndpoint shmiop:// -ORBSvcconf $server_shmiop_conf ");
-#$CL->Arguments ($clflags . $clnsflags . $quietflag . "-ORBSvcConf $client_shmiop_conf -x ");
-
-#run_test_helper ();
-
-# Clean up SHMIOP files
-#PerlACE::check_n_cleanup_files ("server_shmiop_*");
-
-exit $status;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf
deleted file mode 100644
index 0fd993d9cbf..00000000000
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-dynamic UIOP_Lite_Factory Service_Object * TAO_Strategies:_make_TAO_UIOP_Lite_Protocol_Factory() ""
-static Advanced_Resource_Factory "-ORBProtocolFactory UIOP_Lite_Factory"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf.xml b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf.xml
deleted file mode 100644
index a75e694d8f8..00000000000
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from ./performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <dynamic id="UIOP_Lite_Factory" type="Service_Object">
-   <initializer path="TAO_Strategies" init="_make_TAO_UIOP_Lite_Protocol_Factory"/>
- </dynamic>
- <static id="Advanced_Resource_Factory" params="-ORBProtocolFactory UIOP_Lite_Factory"/>
-</ACE_Svc_Conf>