3 files changed, 26 insertions, 29 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
index 50e7a20e39b..772016bf4f8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
@@ -22,11 +22,11 @@
 #define TAO_AV_FTP_H
 
 #include "ace/Get_Opt.h"
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
 
 
 class FTP_Client_Callback : public TAO_AV_Callback
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
index 87223c84b1a..6822ea67bf3 100755
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
@@ -7,7 +7,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib '../../../../../bin';
 use PerlACE::Run_Test;
-use File::stat;
 
 # amount of delay between running the servers
 
@@ -15,17 +14,15 @@ $sleeptime = 2;
 $status = 0;
 
 $nsior = PerlACE::LocalFile ("ns.ior");
+$makefile = PerlACE::LocalFile ("Makefile");
 
 $debug = 0;
 
-# generate test stream data
-$input = PerlACE::generate_test_file("test_input", 102400);
-
 unlink $nsior;
 
-for ($i = 0; $i <= $#ARGV; $i++)
+for ($i = 0; $i <= $#ARGV; $i++) 
 {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
+    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") 
     {
         print STDERR "\nusage:  run_test\n";
 
@@ -44,12 +41,12 @@ for ($i = 0; $i <= $#ARGV; $i++)
 
 	exit;
     }
-    elsif ($ARGV[$i] eq "-p")
+    elsif ($ARGV[$i] eq "-p") 
     {
 	@protocols = split (',', $ARGV[$i + 1]);
 	$i++;
     }
-    elsif ($ARGV[$i] eq "-d")
+    elsif ($ARGV[$i] eq "-d") 
     {
 	$debug = $ARGV[$i + 1];
 	$i++;
@@ -62,10 +59,10 @@ print STDERR "Starting Naming Service\n";
 
 $NS->Spawn ();
 
-if (PerlACE::waitforfile_timed ($nsior, 100) == -1)
+if (PerlACE::waitforfile_timed ($nsior, 100) == -1) 
 {
     print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill ();
+    $NS->Kill (); 
     exit 1;
 }
 
@@ -83,26 +80,26 @@ for $protocol (@protocols)
     }
 
     $SV = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -f ".$output_file);
-    $CL = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -p ".$protocol." -f $input");
-
+    $CL = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -ORBDebugLevel ".$debug." -p ".$protocol." -f $makefile");
+    
     print STDERR "Using ".$protocol."\n";
     print STDERR "Starting Receiver\n";
-
+    
     $SV->Spawn ();
-
+    
     sleep $sleeptime;
-
+    
     print STDERR "Starting Sender\n";
-
+    
     $sender = $CL->SpawnWaitKill (200);
-
+    
     if ($sender != 0) {
 	print STDERR "ERROR: sender returned $sender\n";
 	$status = 1;
     }
-
+    
     $receiver = $SV->TerminateWaitKill (200);
-
+    
     if ($receiver != 0) {
 	print STDERR "ERROR: receiver returned $receiver\n";
 	$status = 1;
@@ -117,6 +114,6 @@ if ($nserver != 0) {
 }
 
 unlink $nsior;
-unlink $output, $input;
+unlink $output;
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
index c1c6776efe2..146d1e9486c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
@@ -16,10 +16,10 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
 
 
 class FTP_Server_Callback : public TAO_AV_Callback