*** empty log message ***

15 files changed, 0 insertions, 1456 deletions

diff --git a/apps/JAWS/clients/benchd.cpp b/apps/JAWS/clients/benchd.cpp
deleted file mode 100644
index 306d8f06317..00000000000
--- a/apps/JAWS/clients/benchd.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-// benchd: Adapted from the "ntalker" example.
-// Sumedh Mungee
-
-#include "ace/Process.h"
-#include "ace/INET_Addr.h"
-#include "ace/SOCK_Dgram_Mcast.h"
-#include "ace/Reactor.h"
-#include "ace/Get_Opt.h"
-#include "ace/ARGV.h"
-
-#if defined (ACE_HAS_IP_MULTICAST)
-// network interface to subscribe to
-//   this is hardware specific.
-//   use netstat(1M) to find whether your interface
-//   is le0 or ie0
-
-// Maximum number of arguments supported for a request
-static const int MAX_ARGS = 16;
-// Name of the client benchmarking tool
-static const char *TESTER = "http_tester";
-static int QUIET = 0;
-static const char *INTERFACE = "le0";
-static const char *MCAST_ADDR = ACE_DEFAULT_MULTICAST_ADDR;
-static const u_short UDP_PORT = ACE_DEFAULT_MULTICAST_PORT;
-static const char *OUTPUT_FILE_NAME = "benchd.log";
-static ACE_HANDLE OUTPUT_FILE;
-
-// Handle both multicast and stdin events.
-
-class Handle_Events : public ACE_Event_Handler
-{
-public:
-  Handle_Events (u_short udp_port, 
-		 const char *ip_addr,
-		 const char *interface,
-		 ACE_Reactor &reactor);
-  ~Handle_Events (void);
-
-  virtual int handle_input (ACE_HANDLE);
-  virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
-
-private:
-  int serve(char *buf);
-  ACE_SOCK_Dgram_Mcast mcast_;
-  ACE_Handle_Set handle_set_;
-};
-
-int
-Handle_Events::handle_input (ACE_HANDLE h)
-{
-  char buf[BUFSIZ];
-
-  if (h == 0)
-    {
-      int readresult = ACE_OS::read (h, buf, BUFSIZ);
-      if (readresult > 0)
-	{
-	  if (this->mcast_.send (buf, readresult) != readresult)
-	    {
-	      ACE_OS::perror ("send error");
-	      return -1;
-	    }
-	  return 0;
-	}
-      else if (readresult == -1)
-	::perror ("can't read from STDIN");
-
-      return -1;
-    }
-  else
-    {
-      ACE_INET_Addr remote_addr;
-
-      // receive message from multicast group
-      int retcode = this->mcast_.recv (buf, sizeof buf, remote_addr);
-      
-      if (retcode != -1)
-	{
-          /*
-            cout << "received datagram from host " << remote_addr.get_host_name () 
-            << " on port " << remote_addr.get_port_number () 
-            << " bytes = " << retcode << endl;
-            */
-          serve(buf);
-	  return 0;
-	}
-
-      ACE_OS::perror ("Something amiss.");
-      return -1;
-    }
-}
-
-int
-Handle_Events::handle_close (ACE_HANDLE h, ACE_Reactor_Mask)
-{
-  if (h == 0)
-    cout << "STDIN_Events handle removed from reactor." << endl << flush;
-  else
-    cout << "Mcast_Events handle removed from reactor." << endl << flush;
-  return 0;
-}
-
-Handle_Events::~Handle_Events (void)
-{
-  // ACE_OS::exit on error (bogus)...
-
-  if (this->mcast_.unsubscribe () == -1)
-    ACE_OS::perror ("unsubscribe fails"), ACE_OS::exit (1);
-}
-
-Handle_Events::Handle_Events (u_short udp_port, 
-			      const char *ip_addr,
-			      const char *interface,
-			      ACE_Reactor &reactor)
-{
-  // Create multicast address to listen on.
-
-  ACE_INET_Addr sockmc_addr (udp_port, ip_addr);
-  
-  // subscribe to multicast group.
-
-  if (this->mcast_.subscribe (sockmc_addr, 1, interface) == -1) 
-    ACE_OS::perror ("can't subscribe to multicast group"), ACE_OS::exit (1);
-
-  // Disable loopbacks.
-  //  if (this->mcast_.set_option (IP_MULTICAST_LOOP, 0) == -1 )
-  //    ACE_OS::perror (" can't disable loopbacks " ), ACE_OS::exit (1);
-
-  if(!QUIET) {
-    this->handle_set_.set_bit (0);
-  }
-  this->handle_set_.set_bit (this->mcast_.get_handle ());
-
-  // Register callbacks with the ACE_Reactor.
-  if (reactor.register_handler (this->handle_set_,
-				this,
-				ACE_Event_Handler::READ_MASK) == -1)
-    ACE_OS::perror ("can't register events"), ACE_OS::exit (1);
-}
-
-
-// This method handles multicast requests..
-// These requests are of the following form:
-// command (arguments)
-
-
-// currently only one is supported (and indeed needed :-))
-// http_tester arguments
-
-int
-Handle_Events::serve(char *buf) {
-  ACE_ARGV arguments(buf);
-  if(ACE_OS::strcmp(arguments[0],TESTER) == 0) {
-    ACE_Process p(arguments.argv(), ACE_INVALID_HANDLE, OUTPUT_FILE, OUTPUT_FILE);
-    return 0;
-  }
-}
-
-static void
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, "i:u:q");
-
-  int c;
-
-  while ((c = get_opt ()) != -1)
-    switch (c)
-      {
-      case 'q':
-        QUIET = 1;
-      case 'i':
-	INTERFACE = get_opt.optarg;
-	break;
-      case 'u':
-	// Usage fallthrough.
-      default:
-        ACE_DEBUG ((LM_DEBUG, "%s -i interface\n", argv[0]));
-	ACE_OS::exit (1);
-      }
-}
-
-static sig_atomic_t done = 0;
-
-// Signal handler.
-
-extern "C" void
-handler (int)
-{
-  done = 1;
-}
-
-int 
-main (int argc, char *argv[])
-{
-  ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
-  ACE_OS::signal(SIGCLD, SIG_IGN);
-  ACE_UNUSED_ARG (sa);
-
-  parse_args (argc, argv);
-  
-  OUTPUT_FILE = ACE_OS::open(OUTPUT_FILE_NAME, O_CREAT | O_WRONLY, 0644);
-  if(OUTPUT_FILE == 0) 
-    return 1;
-
-  ACE_Reactor reactor;
-  Handle_Events handle_events (UDP_PORT, MCAST_ADDR, INTERFACE, reactor);
-
-  // main loop
-	  
-  while (!done)
-    reactor.handle_events ();
-
-  ACE_OS::close(OUTPUT_FILE);
-  cout << "\nbenchd done.\n";
-  return 0;
-}
-#else
-int 
-main (int argc, char *argv[])
-{
-  ACE_ERROR ((LM_ERROR, "error: %s must be run on a platform that support IP multicast\n",
-	    argv[0]));
-  return 0;
-}
-#endif /* ACE_HAS_IP_MULTICAST */
diff --git a/apps/JAWS/clients/client.h b/apps/JAWS/clients/client.h
deleted file mode 100644
index 3e5967c548d..00000000000
--- a/apps/JAWS/clients/client.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "global.h"
-#include "util.h"
-#include "http.h"
-#include "cp.h"
-#include "stats.h"
-
diff --git a/apps/JAWS/clients/clients.mak b/apps/JAWS/clients/clients.mak
deleted file mode 100644
index 9586bc2a1c2..00000000000
--- a/apps/JAWS/clients/clients.mak
+++ /dev/null
@@ -1,668 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-!IF "$(CFG)" == ""
-CFG=clients - Win32 Debug
-!MESSAGE No configuration specified.  Defaulting to clients - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "clients - Win32 Release" && "$(CFG)" !=\
- "clients - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE on this makefile
-!MESSAGE by defining the macro CFG on the command line.  For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "clients.mak" CFG="clients - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "clients - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "clients - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-################################################################################
-# Begin Project
-# PROP Target_Last_Scanned "clients - Win32 Debug"
-RSC=rc.exe
-CPP=cl.exe
-
-!IF  "$(CFG)" == "clients - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-OUTDIR=.
-INTDIR=.\Release
-
-ALL : "$(OUTDIR)\clients.exe"
-
-CLEAN : 
-	-@erase "$(INTDIR)\connection.obj"
-	-@erase "$(INTDIR)\http_tester.obj"
-	-@erase "$(INTDIR)\stats.obj"
-	-@erase "$(INTDIR)\util.obj"
-	-@erase "$(OUTDIR)\clients.exe"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/clients.pch" /YX /Fo"$(INTDIR)/" /c 
-CPP_OBJS=.\Release/
-CPP_SBRS=.\.
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/clients.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\
- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\
- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)/clients.pdb" /machine:I386 /out:"$(OUTDIR)/clients.exe" 
-LINK32_OBJS= \
-	"$(INTDIR)\connection.obj" \
-	"$(INTDIR)\http_tester.obj" \
-	"$(INTDIR)\stats.obj" \
-	"$(INTDIR)\util.obj"
-
-"$(OUTDIR)\clients.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "clients - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-OUTDIR=.
-INTDIR=.\Debug
-
-ALL : "$(OUTDIR)\clients.exe"
-
-CLEAN : 
-	-@erase "$(INTDIR)\connection.obj"
-	-@erase "$(INTDIR)\http_tester.obj"
-	-@erase "$(INTDIR)\stats.obj"
-	-@erase "$(INTDIR)\util.obj"
-	-@erase "$(INTDIR)\vc40.idb"
-	-@erase "$(INTDIR)\vc40.pdb"
-	-@erase "$(OUTDIR)\clients.exe"
-	-@erase "$(OUTDIR)\clients.ilk"
-	-@erase "$(OUTDIR)\clients.pdb"
-
-"$(INTDIR)" :
-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
-
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\
- /Fp"$(INTDIR)/clients.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 
-CPP_OBJS=.\Debug/
-CPP_SBRS=.\.
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/clients.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
-LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\
- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\
- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\
- /pdb:"$(OUTDIR)/clients.pdb" /debug /machine:I386 /out:"$(OUTDIR)/clients.exe" 
-LINK32_OBJS= \
-	"$(INTDIR)\connection.obj" \
-	"$(INTDIR)\http_tester.obj" \
-	"$(INTDIR)\stats.obj" \
-	"$(INTDIR)\util.obj"
-
-"$(OUTDIR)\clients.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
-.c{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_OBJS)}.obj:
-   $(CPP) $(CPP_PROJ) $<  
-
-.c{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cpp{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-.cxx{$(CPP_SBRS)}.sbr:
-   $(CPP) $(CPP_PROJ) $<  
-
-################################################################################
-# Begin Target
-
-# Name "clients - Win32 Release"
-# Name "clients - Win32 Debug"
-
-!IF  "$(CFG)" == "clients - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "clients - Win32 Debug"
-
-!ENDIF 
-
-################################################################################
-# Begin Source File
-
-SOURCE=.\util.cpp
-DEP_CPP_UTIL_=\
-	".\connection.h"\
-	".\global.h"\
-	".\util.h"\
-	{$(INCLUDE)}"\ace\ACE.h"\
-	{$(INCLUDE)}"\ace\ACE.i"\
-	{$(INCLUDE)}"\ace\Addr.h"\
-	{$(INCLUDE)}"\ace\Addr.i"\
-	{$(INCLUDE)}"\ace\config.h"\
-	{$(INCLUDE)}"\ace\Event_Handler.h"\
-	{$(INCLUDE)}"\ace\Event_Handler.i"\
-	{$(INCLUDE)}"\ace\Handle_Set.h"\
-	{$(INCLUDE)}"\ace\Handle_Set.i"\
-	{$(INCLUDE)}"\ace\INET_Addr.h"\
-	{$(INCLUDE)}"\ace\INET_Addr.i"\
-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\
-	{$(INCLUDE)}"\ace\IPC_SAP.h"\
-	{$(INCLUDE)}"\ace\IPC_SAP.i"\
-	{$(INCLUDE)}"\ace\Local_Tokens.h"\
-	{$(INCLUDE)}"\ace\Local_Tokens.i"\
-	{$(INCLUDE)}"\ace\Log_Msg.h"\
-	{$(INCLUDE)}"\ace\Log_Priority.h"\
-	{$(INCLUDE)}"\ace\Log_Record.h"\
-	{$(INCLUDE)}"\ace\Log_Record.i"\
-	{$(INCLUDE)}"\ace\Malloc.h"\
-	{$(INCLUDE)}"\ace\Malloc.i"\
-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\
-	{$(INCLUDE)}"\ace\Malloc_T.h"\
-	{$(INCLUDE)}"\ace\Malloc_T.i"\
-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\
-	{$(INCLUDE)}"\ace\Map_Manager.h"\
-	{$(INCLUDE)}"\ace\Map_Manager.i"\
-	{$(INCLUDE)}"\ace\Mem_Map.h"\
-	{$(INCLUDE)}"\ace\Mem_Map.i"\
-	{$(INCLUDE)}"\ace\Memory_Pool.h"\
-	{$(INCLUDE)}"\ace\Memory_Pool.i"\
-	{$(INCLUDE)}"\ace\Message_Block.h"\
-	{$(INCLUDE)}"\ace\Message_Block.i"\
-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\
-	{$(INCLUDE)}"\ace\Message_Queue.h"\
-	{$(INCLUDE)}"\ace\Message_Queue.i"\
-	{$(INCLUDE)}"\ace\OS.h"\
-	{$(INCLUDE)}"\ace\OS.i"\
-	{$(INCLUDE)}"\ace\Pipe.h"\
-	{$(INCLUDE)}"\ace\Pipe.i"\
-	{$(INCLUDE)}"\ace\Proactor.h"\
-	{$(INCLUDE)}"\ace\Proactor.i"\
-	{$(INCLUDE)}"\ace\Profile_Timer.h"\
-	{$(INCLUDE)}"\ace\Profile_Timer.i"\
-	{$(INCLUDE)}"\ace\Reactor.h"\
-	{$(INCLUDE)}"\ace\Reactor.i"\
-	{$(INCLUDE)}"\ace\ReactorEx.h"\
-	{$(INCLUDE)}"\ace\ReactorEx.i"\
-	{$(INCLUDE)}"\ace\Service_Config.h"\
-	{$(INCLUDE)}"\ace\Service_Config.i"\
-	{$(INCLUDE)}"\ace\Service_Object.h"\
-	{$(INCLUDE)}"\ace\Service_Object.i"\
-	{$(INCLUDE)}"\ace\Set.cpp"\
-	{$(INCLUDE)}"\ace\Set.h"\
-	{$(INCLUDE)}"\ace\Set.i"\
-	{$(INCLUDE)}"\ace\Shared_Object.h"\
-	{$(INCLUDE)}"\ace\Shared_Object.i"\
-	{$(INCLUDE)}"\ace\Signal.h"\
-	{$(INCLUDE)}"\ace\Signal.i"\
-	{$(INCLUDE)}"\ace\SOCK.h"\
-	{$(INCLUDE)}"\ace\SOCK.i"\
-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\
-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\
-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\
-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\
-	{$(INCLUDE)}"\ace\SOCK_IO.h"\
-	{$(INCLUDE)}"\ace\SOCK_IO.i"\
-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\
-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\
-	{$(INCLUDE)}"\ace\SString.h"\
-	{$(INCLUDE)}"\ace\SString.i"\
-	{$(INCLUDE)}"\ace\Stack.cpp"\
-	{$(INCLUDE)}"\ace\Stack.h"\
-	{$(INCLUDE)}"\ace\Stack.i"\
-	{$(INCLUDE)}"\ace\stdcpp.h"\
-	{$(INCLUDE)}"\ace\Strategies.h"\
-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\
-	{$(INCLUDE)}"\ace\Strategies_T.h"\
-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\
-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\
-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\
-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\
-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\
-	{$(INCLUDE)}"\ace\Synch.h"\
-	{$(INCLUDE)}"\ace\Synch.i"\
-	{$(INCLUDE)}"\ace\Synch_Options.h"\
-	{$(INCLUDE)}"\ace\Synch_T.cpp"\
-	{$(INCLUDE)}"\ace\Synch_T.h"\
-	{$(INCLUDE)}"\ace\Synch_T.i"\
-	{$(INCLUDE)}"\ace\Thread.h"\
-	{$(INCLUDE)}"\ace\Thread.i"\
-	{$(INCLUDE)}"\ace\Thread_Manager.h"\
-	{$(INCLUDE)}"\ace\Thread_Manager.i"\
-	{$(INCLUDE)}"\ace\Time_Value.h"\
-	{$(INCLUDE)}"\ace\Timer_Queue.h"\
-	{$(INCLUDE)}"\ace\Timer_Queue.i"\
-	{$(INCLUDE)}"\ace\Token.h"\
-	{$(INCLUDE)}"\ace\Token.i"\
-	{$(INCLUDE)}"\ace\Trace.h"\
-	{$(INCLUDE)}"\sys\types.h"\
-	
-NODEP_CPP_UTIL_=\
-	"d:\sumedh\ACE_Wrappers\ace\ace\ws2tcpip.h"\
-	
-
-"$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)"
-
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\http_tester.cpp
-DEP_CPP_HTTP_=\
-	".\client.h"\
-	".\connection.h"\
-	".\cp.h"\
-	".\global.h"\
-	".\http.h"\
-	".\stats.h"\
-	".\util.h"\
-	{$(INCLUDE)}"\ace\ACE.h"\
-	{$(INCLUDE)}"\ace\ACE.i"\
-	{$(INCLUDE)}"\ace\Addr.h"\
-	{$(INCLUDE)}"\ace\Addr.i"\
-	{$(INCLUDE)}"\ace\config.h"\
-	{$(INCLUDE)}"\ace\Event_Handler.h"\
-	{$(INCLUDE)}"\ace\Event_Handler.i"\
-	{$(INCLUDE)}"\ace\Handle_Set.h"\
-	{$(INCLUDE)}"\ace\Handle_Set.i"\
-	{$(INCLUDE)}"\ace\INET_Addr.h"\
-	{$(INCLUDE)}"\ace\INET_Addr.i"\
-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\
-	{$(INCLUDE)}"\ace\IPC_SAP.h"\
-	{$(INCLUDE)}"\ace\IPC_SAP.i"\
-	{$(INCLUDE)}"\ace\Local_Tokens.h"\
-	{$(INCLUDE)}"\ace\Local_Tokens.i"\
-	{$(INCLUDE)}"\ace\Log_Msg.h"\
-	{$(INCLUDE)}"\ace\Log_Priority.h"\
-	{$(INCLUDE)}"\ace\Log_Record.h"\
-	{$(INCLUDE)}"\ace\Log_Record.i"\
-	{$(INCLUDE)}"\ace\Malloc.h"\
-	{$(INCLUDE)}"\ace\Malloc.i"\
-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\
-	{$(INCLUDE)}"\ace\Malloc_T.h"\
-	{$(INCLUDE)}"\ace\Malloc_T.i"\
-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\
-	{$(INCLUDE)}"\ace\Map_Manager.h"\
-	{$(INCLUDE)}"\ace\Map_Manager.i"\
-	{$(INCLUDE)}"\ace\Mem_Map.h"\
-	{$(INCLUDE)}"\ace\Mem_Map.i"\
-	{$(INCLUDE)}"\ace\Memory_Pool.h"\
-	{$(INCLUDE)}"\ace\Memory_Pool.i"\
-	{$(INCLUDE)}"\ace\Message_Block.h"\
-	{$(INCLUDE)}"\ace\Message_Block.i"\
-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\
-	{$(INCLUDE)}"\ace\Message_Queue.h"\
-	{$(INCLUDE)}"\ace\Message_Queue.i"\
-	{$(INCLUDE)}"\ace\OS.h"\
-	{$(INCLUDE)}"\ace\OS.i"\
-	{$(INCLUDE)}"\ace\Pipe.h"\
-	{$(INCLUDE)}"\ace\Pipe.i"\
-	{$(INCLUDE)}"\ace\Proactor.h"\
-	{$(INCLUDE)}"\ace\Proactor.i"\
-	{$(INCLUDE)}"\ace\Profile_Timer.h"\
-	{$(INCLUDE)}"\ace\Profile_Timer.i"\
-	{$(INCLUDE)}"\ace\Reactor.h"\
-	{$(INCLUDE)}"\ace\Reactor.i"\
-	{$(INCLUDE)}"\ace\ReactorEx.h"\
-	{$(INCLUDE)}"\ace\ReactorEx.i"\
-	{$(INCLUDE)}"\ace\Service_Config.h"\
-	{$(INCLUDE)}"\ace\Service_Config.i"\
-	{$(INCLUDE)}"\ace\Service_Object.h"\
-	{$(INCLUDE)}"\ace\Service_Object.i"\
-	{$(INCLUDE)}"\ace\Set.cpp"\
-	{$(INCLUDE)}"\ace\Set.h"\
-	{$(INCLUDE)}"\ace\Set.i"\
-	{$(INCLUDE)}"\ace\Shared_Object.h"\
-	{$(INCLUDE)}"\ace\Shared_Object.i"\
-	{$(INCLUDE)}"\ace\Signal.h"\
-	{$(INCLUDE)}"\ace\Signal.i"\
-	{$(INCLUDE)}"\ace\SOCK.h"\
-	{$(INCLUDE)}"\ace\SOCK.i"\
-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\
-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\
-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\
-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\
-	{$(INCLUDE)}"\ace\SOCK_IO.h"\
-	{$(INCLUDE)}"\ace\SOCK_IO.i"\
-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\
-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\
-	{$(INCLUDE)}"\ace\SString.h"\
-	{$(INCLUDE)}"\ace\SString.i"\
-	{$(INCLUDE)}"\ace\Stack.cpp"\
-	{$(INCLUDE)}"\ace\Stack.h"\
-	{$(INCLUDE)}"\ace\Stack.i"\
-	{$(INCLUDE)}"\ace\stdcpp.h"\
-	{$(INCLUDE)}"\ace\Strategies.h"\
-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\
-	{$(INCLUDE)}"\ace\Strategies_T.h"\
-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\
-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\
-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\
-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\
-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\
-	{$(INCLUDE)}"\ace\Synch.h"\
-	{$(INCLUDE)}"\ace\Synch.i"\
-	{$(INCLUDE)}"\ace\Synch_Options.h"\
-	{$(INCLUDE)}"\ace\Synch_T.cpp"\
-	{$(INCLUDE)}"\ace\Synch_T.h"\
-	{$(INCLUDE)}"\ace\Synch_T.i"\
-	{$(INCLUDE)}"\ace\Thread.h"\
-	{$(INCLUDE)}"\ace\Thread.i"\
-	{$(INCLUDE)}"\ace\Thread_Manager.h"\
-	{$(INCLUDE)}"\ace\Thread_Manager.i"\
-	{$(INCLUDE)}"\ace\Time_Value.h"\
-	{$(INCLUDE)}"\ace\Timer_Queue.h"\
-	{$(INCLUDE)}"\ace\Timer_Queue.i"\
-	{$(INCLUDE)}"\ace\Token.h"\
-	{$(INCLUDE)}"\ace\Token.i"\
-	{$(INCLUDE)}"\ace\Trace.h"\
-	{$(INCLUDE)}"\sys\types.h"\
-	
-NODEP_CPP_HTTP_=\
-	"d:\sumedh\ACE_Wrappers\ace\ace\ws2tcpip.h"\
-	
-
-"$(INTDIR)\http_tester.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)"
-
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\stats.cpp
-DEP_CPP_STATS=\
-	".\global.h"\
-	".\stats.h"\
-	{$(INCLUDE)}"\ace\ACE.h"\
-	{$(INCLUDE)}"\ace\ACE.i"\
-	{$(INCLUDE)}"\ace\Addr.h"\
-	{$(INCLUDE)}"\ace\Addr.i"\
-	{$(INCLUDE)}"\ace\config.h"\
-	{$(INCLUDE)}"\ace\Event_Handler.h"\
-	{$(INCLUDE)}"\ace\Event_Handler.i"\
-	{$(INCLUDE)}"\ace\Handle_Set.h"\
-	{$(INCLUDE)}"\ace\Handle_Set.i"\
-	{$(INCLUDE)}"\ace\INET_Addr.h"\
-	{$(INCLUDE)}"\ace\INET_Addr.i"\
-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\
-	{$(INCLUDE)}"\ace\IPC_SAP.h"\
-	{$(INCLUDE)}"\ace\IPC_SAP.i"\
-	{$(INCLUDE)}"\ace\Local_Tokens.h"\
-	{$(INCLUDE)}"\ace\Local_Tokens.i"\
-	{$(INCLUDE)}"\ace\Log_Msg.h"\
-	{$(INCLUDE)}"\ace\Log_Priority.h"\
-	{$(INCLUDE)}"\ace\Log_Record.h"\
-	{$(INCLUDE)}"\ace\Log_Record.i"\
-	{$(INCLUDE)}"\ace\Malloc.h"\
-	{$(INCLUDE)}"\ace\Malloc.i"\
-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\
-	{$(INCLUDE)}"\ace\Malloc_T.h"\
-	{$(INCLUDE)}"\ace\Malloc_T.i"\
-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\
-	{$(INCLUDE)}"\ace\Map_Manager.h"\
-	{$(INCLUDE)}"\ace\Map_Manager.i"\
-	{$(INCLUDE)}"\ace\Mem_Map.h"\
-	{$(INCLUDE)}"\ace\Mem_Map.i"\
-	{$(INCLUDE)}"\ace\Memory_Pool.h"\
-	{$(INCLUDE)}"\ace\Memory_Pool.i"\
-	{$(INCLUDE)}"\ace\Message_Block.h"\
-	{$(INCLUDE)}"\ace\Message_Block.i"\
-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\
-	{$(INCLUDE)}"\ace\Message_Queue.h"\
-	{$(INCLUDE)}"\ace\Message_Queue.i"\
-	{$(INCLUDE)}"\ace\OS.h"\
-	{$(INCLUDE)}"\ace\OS.i"\
-	{$(INCLUDE)}"\ace\Pipe.h"\
-	{$(INCLUDE)}"\ace\Pipe.i"\
-	{$(INCLUDE)}"\ace\Proactor.h"\
-	{$(INCLUDE)}"\ace\Proactor.i"\
-	{$(INCLUDE)}"\ace\Profile_Timer.h"\
-	{$(INCLUDE)}"\ace\Profile_Timer.i"\
-	{$(INCLUDE)}"\ace\Reactor.h"\
-	{$(INCLUDE)}"\ace\Reactor.i"\
-	{$(INCLUDE)}"\ace\ReactorEx.h"\
-	{$(INCLUDE)}"\ace\ReactorEx.i"\
-	{$(INCLUDE)}"\ace\Service_Config.h"\
-	{$(INCLUDE)}"\ace\Service_Config.i"\
-	{$(INCLUDE)}"\ace\Service_Object.h"\
-	{$(INCLUDE)}"\ace\Service_Object.i"\
-	{$(INCLUDE)}"\ace\Set.cpp"\
-	{$(INCLUDE)}"\ace\Set.h"\
-	{$(INCLUDE)}"\ace\Set.i"\
-	{$(INCLUDE)}"\ace\Shared_Object.h"\
-	{$(INCLUDE)}"\ace\Shared_Object.i"\
-	{$(INCLUDE)}"\ace\Signal.h"\
-	{$(INCLUDE)}"\ace\Signal.i"\
-	{$(INCLUDE)}"\ace\SOCK.h"\
-	{$(INCLUDE)}"\ace\SOCK.i"\
-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\
-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\
-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\
-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\
-	{$(INCLUDE)}"\ace\SOCK_IO.h"\
-	{$(INCLUDE)}"\ace\SOCK_IO.i"\
-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\
-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\
-	{$(INCLUDE)}"\ace\SString.h"\
-	{$(INCLUDE)}"\ace\SString.i"\
-	{$(INCLUDE)}"\ace\Stack.cpp"\
-	{$(INCLUDE)}"\ace\Stack.h"\
-	{$(INCLUDE)}"\ace\Stack.i"\
-	{$(INCLUDE)}"\ace\stdcpp.h"\
-	{$(INCLUDE)}"\ace\Strategies.h"\
-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\
-	{$(INCLUDE)}"\ace\Strategies_T.h"\
-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\
-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\
-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\
-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\
-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\
-	{$(INCLUDE)}"\ace\Synch.h"\
-	{$(INCLUDE)}"\ace\Synch.i"\
-	{$(INCLUDE)}"\ace\Synch_Options.h"\
-	{$(INCLUDE)}"\ace\Synch_T.cpp"\
-	{$(INCLUDE)}"\ace\Synch_T.h"\
-	{$(INCLUDE)}"\ace\Synch_T.i"\
-	{$(INCLUDE)}"\ace\Thread.h"\
-	{$(INCLUDE)}"\ace\Thread.i"\
-	{$(INCLUDE)}"\ace\Thread_Manager.h"\
-	{$(INCLUDE)}"\ace\Thread_Manager.i"\
-	{$(INCLUDE)}"\ace\Time_Value.h"\
-	{$(INCLUDE)}"\ace\Timer_Queue.h"\
-	{$(INCLUDE)}"\ace\Timer_Queue.i"\
-	{$(INCLUDE)}"\ace\Token.h"\
-	{$(INCLUDE)}"\ace\Token.i"\
-	{$(INCLUDE)}"\ace\Trace.h"\
-	{$(INCLUDE)}"\sys\types.h"\
-	
-NODEP_CPP_STATS=\
-	"d:\sumedh\ACE_Wrappers\ace\ace\ws2tcpip.h"\
-	
-
-"$(INTDIR)\stats.obj" : $(SOURCE) $(DEP_CPP_STATS) "$(INTDIR)"
-
-
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\connection.cpp
-DEP_CPP_CONNE=\
-	".\connection.h"\
-	".\global.h"\
-	{$(INCLUDE)}"\ace\ACE.h"\
-	{$(INCLUDE)}"\ace\ACE.i"\
-	{$(INCLUDE)}"\ace\Addr.h"\
-	{$(INCLUDE)}"\ace\Addr.i"\
-	{$(INCLUDE)}"\ace\config.h"\
-	{$(INCLUDE)}"\ace\Event_Handler.h"\
-	{$(INCLUDE)}"\ace\Event_Handler.i"\
-	{$(INCLUDE)}"\ace\Handle_Set.h"\
-	{$(INCLUDE)}"\ace\Handle_Set.i"\
-	{$(INCLUDE)}"\ace\INET_Addr.h"\
-	{$(INCLUDE)}"\ace\INET_Addr.i"\
-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\
-	{$(INCLUDE)}"\ace\IPC_SAP.h"\
-	{$(INCLUDE)}"\ace\IPC_SAP.i"\
-	{$(INCLUDE)}"\ace\Local_Tokens.h"\
-	{$(INCLUDE)}"\ace\Local_Tokens.i"\
-	{$(INCLUDE)}"\ace\Log_Msg.h"\
-	{$(INCLUDE)}"\ace\Log_Priority.h"\
-	{$(INCLUDE)}"\ace\Log_Record.h"\
-	{$(INCLUDE)}"\ace\Log_Record.i"\
-	{$(INCLUDE)}"\ace\Malloc.h"\
-	{$(INCLUDE)}"\ace\Malloc.i"\
-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\
-	{$(INCLUDE)}"\ace\Malloc_T.h"\
-	{$(INCLUDE)}"\ace\Malloc_T.i"\
-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\
-	{$(INCLUDE)}"\ace\Map_Manager.h"\
-	{$(INCLUDE)}"\ace\Map_Manager.i"\
-	{$(INCLUDE)}"\ace\Mem_Map.h"\
-	{$(INCLUDE)}"\ace\Mem_Map.i"\
-	{$(INCLUDE)}"\ace\Memory_Pool.h"\
-	{$(INCLUDE)}"\ace\Memory_Pool.i"\
-	{$(INCLUDE)}"\ace\Message_Block.h"\
-	{$(INCLUDE)}"\ace\Message_Block.i"\
-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\
-	{$(INCLUDE)}"\ace\Message_Queue.h"\
-	{$(INCLUDE)}"\ace\Message_Queue.i"\
-	{$(INCLUDE)}"\ace\OS.h"\
-	{$(INCLUDE)}"\ace\OS.i"\
-	{$(INCLUDE)}"\ace\Pipe.h"\
-	{$(INCLUDE)}"\ace\Pipe.i"\
-	{$(INCLUDE)}"\ace\Proactor.h"\
-	{$(INCLUDE)}"\ace\Proactor.i"\
-	{$(INCLUDE)}"\ace\Profile_Timer.h"\
-	{$(INCLUDE)}"\ace\Profile_Timer.i"\
-	{$(INCLUDE)}"\ace\Reactor.h"\
-	{$(INCLUDE)}"\ace\Reactor.i"\
-	{$(INCLUDE)}"\ace\ReactorEx.h"\
-	{$(INCLUDE)}"\ace\ReactorEx.i"\
-	{$(INCLUDE)}"\ace\Service_Config.h"\
-	{$(INCLUDE)}"\ace\Service_Config.i"\
-	{$(INCLUDE)}"\ace\Service_Object.h"\
-	{$(INCLUDE)}"\ace\Service_Object.i"\
-	{$(INCLUDE)}"\ace\Set.cpp"\
-	{$(INCLUDE)}"\ace\Set.h"\
-	{$(INCLUDE)}"\ace\Set.i"\
-	{$(INCLUDE)}"\ace\Shared_Object.h"\
-	{$(INCLUDE)}"\ace\Shared_Object.i"\
-	{$(INCLUDE)}"\ace\Signal.h"\
-	{$(INCLUDE)}"\ace\Signal.i"\
-	{$(INCLUDE)}"\ace\SOCK.h"\
-	{$(INCLUDE)}"\ace\SOCK.i"\
-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\
-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\
-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\
-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\
-	{$(INCLUDE)}"\ace\SOCK_IO.h"\
-	{$(INCLUDE)}"\ace\SOCK_IO.i"\
-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\
-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\
-	{$(INCLUDE)}"\ace\SString.h"\
-	{$(INCLUDE)}"\ace\SString.i"\
-	{$(INCLUDE)}"\ace\Stack.cpp"\
-	{$(INCLUDE)}"\ace\Stack.h"\
-	{$(INCLUDE)}"\ace\Stack.i"\
-	{$(INCLUDE)}"\ace\stdcpp.h"\
-	{$(INCLUDE)}"\ace\Strategies.h"\
-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\
-	{$(INCLUDE)}"\ace\Strategies_T.h"\
-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\
-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\
-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\
-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\
-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\
-	{$(INCLUDE)}"\ace\Synch.h"\
-	{$(INCLUDE)}"\ace\Synch.i"\
-	{$(INCLUDE)}"\ace\Synch_Options.h"\
-	{$(INCLUDE)}"\ace\Synch_T.cpp"\
-	{$(INCLUDE)}"\ace\Synch_T.h"\
-	{$(INCLUDE)}"\ace\Synch_T.i"\
-	{$(INCLUDE)}"\ace\Thread.h"\
-	{$(INCLUDE)}"\ace\Thread.i"\
-	{$(INCLUDE)}"\ace\Thread_Manager.h"\
-	{$(INCLUDE)}"\ace\Thread_Manager.i"\
-	{$(INCLUDE)}"\ace\Time_Value.h"\
-	{$(INCLUDE)}"\ace\Timer_Queue.h"\
-	{$(INCLUDE)}"\ace\Timer_Queue.i"\
-	{$(INCLUDE)}"\ace\Token.h"\
-	{$(INCLUDE)}"\ace\Token.i"\
-	{$(INCLUDE)}"\ace\Trace.h"\
-	{$(INCLUDE)}"\sys\types.h"\
-	
-NODEP_CPP_CONNE=\
-	"d:\sumedh\ACE_Wrappers\ace\ace\ws2tcpip.h"\
-	
-
-"$(INTDIR)\connection.obj" : $(SOURCE) $(DEP_CPP_CONNE) "$(INTDIR)"
-
-
-# End Source File
-# End Target
-# End Project
-################################################################################
diff --git a/apps/JAWS/clients/clients.mdp b/apps/JAWS/clients/clients.mdp
deleted file mode 100644
index 490523f361f..00000000000
--- a/apps/JAWS/clients/clients.mdp
+++ /dev/null
diff --git a/apps/JAWS/clients/config b/apps/JAWS/clients/config
deleted file mode 100644
index 29c39c66610..00000000000
--- a/apps/JAWS/clients/config
+++ /dev/null
@@ -1,6 +0,0 @@
-1.0 50 10 http://mambo:2222/~sumedh/testdata/smallfile.txt 1 a 0 b 0 1 65536
-2.0 50 20 http://mambo:2222/~sumedh/testdata/smallfile.txt 1 a 0 b 0 1  65536
-3.0 50 30 http://mambo:2222/~sumedh/testdata/smallfile.txt 1 a 0 b 0 1  65536
-4.0 50 40 http://mambo:2222/~sumedh/testdata/smallfile.txt 1  a 0 b 0 1 65536
-5.0 50 50 http://mambo:2222/~sumedh/testdata/smallfile.txt 1 a 0 b 0 1  65536
-
diff --git a/apps/JAWS/clients/connection.cpp b/apps/JAWS/clients/connection.cpp
deleted file mode 100644
index 727d96167ea..00000000000
--- a/apps/JAWS/clients/connection.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// connection.cc Sumedh Mungee <sumedh@cs>
-#include "connection.h"
-
-
-// Make the connection to the WEB server
-
-int connection::connect(char *hostname_opt_port, int tcp_nodelay, int sockbufsiz) {
-  if(!hostname_opt_port) return 1;
-  
-  char *hostname_with_port;
-  // Check to see if portnumber is specified in the hostnameport
-  // If not, append :80
-  if(!ACE_OS::strchr(hostname_opt_port,':')) {
-	  hostname_with_port = new char[ACE_OS::strlen(hostname_opt_port) + 3];
-	  sprintf(hostname_with_port, "%s:%d", hostname_opt_port, 80);
-  }
-  else {
-    hostname_with_port = hostname_opt_port;
-  }
-	
-  // Beyond this point, hostname_with_port is of the form hostname:port
-
-  ACE_INET_Addr server_addr(hostname_with_port);
-  
-  // Connect to server
-
-  ACE_SOCK_Connector con;
-
-  if(con.connect(stream_, server_addr) == -1) {
-    perror("ACE_SOCK_Connector::connect");
-    return 1;
-  }
-
-  
-  // tcp_nodelay processing.
-
-  // turn off weird ack things
-  if(tcp_nodelay) {
-	  struct protoent *p = ACE_OS::getprotobyname ("tcp");
-    int one = 1;
-    
-    if (p && stream_.set_option (p->p_proto,
-				 TCP_NODELAY,
-				 (char *)& one, 
-				 sizeof (one))) {
-      perror("tcp_nodelay");
-      return 1;
-    }
-  }
-  
-  if(sockbufsiz) 
-    if (stream_.set_option (SOL_SOCKET,
-			    SO_RCVBUF,
-			    (char *) &sockbufsiz,
-			    sizeof sockbufsiz) == -1) {
-      perror("socket_queue_size");
-      return 1;
-    }
-  
-  return 0;
-}
-
-int connection::read(void *buffer, size_t maxlen, unsigned int timeout_seconds) {
-  return stream_.recv(buffer, maxlen);
-}
-
-int connection::write(const void *buffer, size_t maxlen, unsigned int timeout_seconds) {
-  return stream_.send(buffer, maxlen);
-}
-
-int connection::write_n(const void *buffer, size_t len, unsigned int timeout_seconds) {
-  if(stream_.send_n(buffer, len) == -1)
-    ACE_ERROR_RETURN((LM_ERROR, "Write failed for %s", buffer),1);
-  return 0;
-}
-
-int connection::read_n(void *buffer, size_t maxlen, unsigned int timeout_seconds) {
-  if(stream_.recv_n(buffer, maxlen) == -1)
-    ACE_ERROR_RETURN((LM_ERROR, "Read failed.."),1);
-  return 1;
-}
-
-int connection::close(void) {
-  stream_.close_reader();
-  stream_.close_writer();
-  stream_.close();
-  return 0;
-}
-  
-connection::~connection(void) {
-  this->close();
-}
diff --git a/apps/JAWS/clients/connection.h b/apps/JAWS/clients/connection.h
deleted file mode 100644
index 54d7a451ac9..00000000000
--- a/apps/JAWS/clients/connection.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "global.h"
-
-#ifndef _D_connection
-#define _D_connection
-class connection {
-
-public:
-  int connect(char *hostname_opt_port, int tcp_nodelay, int sockbufsiz);
-  read(void *buffer, size_t maxlen, unsigned int timeout_seconds = 60);
-  write(const void *buffer, size_t maxlen, unsigned int timeout_seconds = 60);
-  write_n(const void *buffer, size_t len, unsigned int timeout_seconds = 60);
-  read_n(void *buffer, size_t maxlen, unsigned int timeout_seconds = 60);
-  int close(void);
-  ~connection(void);
-
-private:
-  ACE_SOCK_Stream stream_;
-  char sockbuf[66000];
-};
-#endif
diff --git a/apps/JAWS/clients/cp.h b/apps/JAWS/clients/cp.h
deleted file mode 100644
index df1a4af1e34..00000000000
--- a/apps/JAWS/clients/cp.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "util.h"
-#include "stats.h"
-
-class Client_Parameters {
-public:
-  Client_Parameters(int);
-  URL *url;
-  static Stats *stats;
-  static int tcp_nodelay;
-  static int sockbufsiz;
-  int id;
-};
-
-Client_Parameters::Client_Parameters(int i) {
-
-  id = i;
-
-}
diff --git a/apps/JAWS/clients/global.h b/apps/JAWS/clients/global.h
deleted file mode 100644
index ad70dcca23b..00000000000
--- a/apps/JAWS/clients/global.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <string.h>
-#include <iostream.h>
-#include <fstream.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <signal.h>
-
-#include <ace/ACE.h>
-#include <ace/OS.h>
-#include <ace/SOCK_Acceptor.h>
-#include <ace/SOCK_Connector.h>
-#include <ace/Pipe.h>
-#include <ace/SOCK_Stream.h>
-#include <ace/INET_Addr.h>
-#include <ace/Profile_Timer.h>
-#include <ace/Thread.h>
-#include <ace/Thread_Manager.h>
-#include <ace/Service_Config.h>
-#include <ace/Log_Msg.h>
-
-#include <math.h>
-
-#define ERRLOG "http_tester.errors"
-
-#ifndef extern_c_symbols
-#define extern_c_symbols
-extern "C" {
-
-       int usleep(unsigned int useconds);
-}
-#endif
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/JAWS/clients/http.h b/apps/JAWS/clients/http.h
deleted file mode 100644
index 0ea53bf8c1d..00000000000
--- a/apps/JAWS/clients/http.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "global.h"
-
-#define CONTENT_ENCODING_HEADER "Content-encoding: "
-#define CONTENT_TYPE_HEADER "Content-type: "
-#define INCOMING_FILE_NAME "/tmp/sumedh.web.inc"
-#define TEMPORARY_FILE_NAME "/tmp/sumedh.web.tmp"
-
-#define ENCODING_TAB "./encoding.tab"
-#define CONTENT_TAB  "./content.tab"
-
-int demime(void);
-int decode(char *encoding);
-int view(char *content);
-
diff --git a/apps/JAWS/clients/http_tester.cpp b/apps/JAWS/clients/http_tester.cpp
deleted file mode 100644
index f3f86a9a42b..00000000000
--- a/apps/JAWS/clients/http_tester.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-// http_tester.cc sumedh@cs.wustl.edu
-#include "client.h"
-
-int Client_Parameters::tcp_nodelay;
-int Client_Parameters::sockbufsiz;
-Stats *Client_Parameters::stats;
-
-
-static void *client_thread(void *data) {
-  ACE_Thread_Control tc(ACE_Service_Config::thr_mgr());
-  Client_Parameters *cp = (Client_Parameters *) data;
-  float latency, throughput;
-  URL *u = cp->url;
-  
-  // Check for presence of protocol, hostname and filename.
-
-  if(!(u->get_protocol() && u->get_hostname() && u->get_filename())) {
-    ACE_DEBUG((LM_DEBUG, "Invalid URL"));
-    return NULL;
-  }
-
-  cp->stats->i_have_started(cp->id);
-
-  // Attempt connection
-  connection webserver;
-
-  if(webserver.connect(u->get_hostname(), cp->tcp_nodelay, cp->sockbufsiz)) return NULL;
-  // Send the request now.
-
-  
-  char request[BUFSIZ];
-
-  ACE_Profile_Timer throughput_timer, latency_timer;
-  throughput_timer.start();
-  latency_timer.start();
-  sprintf(request,"GET /%s HTTP/1.0\r\n\r\n",u->get_filename());
-  webserver.write_n(request, strlen(request)) ;
-  
-  char buffer[BUFSIZ];
-  ssize_t num_read = 0, total_read = 0;
-  unsigned int first_time = 1;
-  for(;;) {
-    num_read = webserver.read(buffer, sizeof buffer);
-    if(first_time) {
-      ACE_Profile_Timer::ACE_Elapsed_Time et;
-	  latency_timer.stop();
-	  latency_timer.elapsed_time(et);
-      latency =  et.real_time;
-      first_time = 0;
-    }
-    if(num_read <= 0)
-      break;
-    total_read += num_read;
-  }
-  cp->stats->i_am_done(cp->id);
-  ACE_Profile_Timer::ACE_Elapsed_Time et;
-  throughput_timer.stop();
-  throughput_timer.elapsed_time(et);
-  throughput = (8 * total_read/et.real_time) / pow(10,6) ;
-  cp->stats->log(cp->id, throughput, latency);
-  webserver.close();
-}
-
-int driver(char *id, int total_num, float requests_sec, char *url1, float p1, char *url2, float p2, char *url3, float p3, int tcp_nodelay, int sockbufsiz) {
-
-  // construct the client parameters packet
-
-  Client_Parameters::tcp_nodelay = tcp_nodelay;
-  Client_Parameters::sockbufsiz = sockbufsiz;
-
-  Client_Parameters::stats = new Stats(total_num);
-  
-  
-  // sleep_time is in microseconds, and requests_sec is per second, hence the pow(10,6)
-  float sleep_time = (1/requests_sec) * pow(10,6); 
-  float delta = 0;
-  srand(time(NULL));
-  for(int i = 0; i < total_num; i++) { // i is used as a id for threads
-    ACE_Profile_Timer timer;
-    if(sleep_time < delta) {
-      ACE_DEBUG((LM_ERROR,"Requested rate is too high, sorry! "));
-      return 2;
-    }
-	ACE_Time_Value tv(0, sleep_time - delta);
-	ACE_OS::sleep(tv);
-	timer.start();
-	    
-    Client_Parameters *cp = new Client_Parameters(i);
-	
-	double r = ((double)rand()/(double)RAND_MAX);
-    // cerr << " choosing between " << url1 << url2 << url3 << " with r == " << r;
-	if(r <= p1)   cp->url = new URL(url1);
-    if( (r > p1) && (r <= (p1 + p2)))   cp->url = new URL(url2);
-    if( (r > (p1 + p2)))  cp->url = new URL(url3);
-    // cerr << "The URL being requested is " << cp->url->get_filename() << endl;
-
-	
-    (ACE_Service_Config::thr_mgr())->spawn(client_thread, (void *) cp);
-	timer.stop();
-	ACE_Profile_Timer::ACE_Elapsed_Time et;
-	timer.elapsed_time(et);
-    delta = ( (0.8 * fabs(et.real_time * pow(10,6))) + (0.2 * delta) );
-  }
-  
-  // Join the other threads..
-  (ACE_Service_Config::thr_mgr())->wait();
-  // Now output the data for this test
-  cout << id;
-  Client_Parameters::stats->output();
-  cout << endl;
-  return 0;  
-}
-
-
-main(int argc, char **argv) 
-{
-  // This will set the global scale factor if the ACE_SCALE_FACTOR
-  // environment variable is set.
-  ACE_High_Res_Timer::get_env_global_scale_factor ();
-
-  if(argc < 3) {
-    //     cerr << "Usage: " << argv[0] << " infile outfile " << endl;
-    //     cerr << "The input file contains lines, with the following fields: " << endl;
-    //     cerr << "experiment_id total_number_of_requests request_rate url1 p1 url2 p2 url3 p3 TCP_NODELAY SOCKET_RECV_BUFSIZ " << endl;
-    return 1;
-  }
-
-
-  FILE *fp = fopen(argv[1],"r");
-  if(fp == NULL) {
-    perror("fopen");
-    return 2;
-  }
-  close(1);
-  int fd = open(argv[2], O_WRONLY | O_CREAT | O_TRUNC, 0644);
-  if(fd == -1) {
-    perror("open");
-    return 3;
-  }
-    
-
-  int total_num,  tcp, sock;
-  char *id = new char[BUFSIZ];
-  float rate, p1, p2, p3;
-  char *url1 = new char[BUFSIZ];
-  char *url2 = new char[BUFSIZ];
-  char *url3 = new char[BUFSIZ];
-
-  
-  while(!feof(fp)) {
-    fscanf(fp,"%s %d %f %s %f %s %f %s %f %d %d\n", id, &total_num, &rate, url1, &p1, url2, &p2, url3, &p3, &tcp, &sock);
-    //fprintf(stderr,"----\n");
-    //fprintf(stderr,"\tNow performing experiment:%s\n\tSending %d requests at %f requests/second\n", id, total_num, rate);
-    driver(id, total_num, rate, url1, p1, url2, p2, url3, p3, tcp, sock);
-  }
-  fclose(fp);
-  close(fd);
-  return 0;
-}
diff --git a/apps/JAWS/clients/stats.cpp b/apps/JAWS/clients/stats.cpp
deleted file mode 100644
index da15632998e..00000000000
--- a/apps/JAWS/clients/stats.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-#include "stats.h"
-
-
-Stats::Stats(int size) {
-  throughput_ = new float[size];
-  latency_ = new float[size];
-  thread_count_ = size;
-  init_fini_ = new Init_Fini_t[2*size];
-  for(int i = 0; i < size; i++) 
-    throughput_[i] = latency_[i] = 0;
-}
-  
-void Stats::log(int id, float throughput, float latency) {
-  throughput_[id] = throughput;
-  latency_[id] = latency;
-}
-  
-void Stats::print(char *message) {
-  char time_buf[64];
-  long ltime;
-  time(&ltime);
-  ACE_OS::ctime_r(&ltime, time_buf, sizeof time_buf);
-    
-  if(ACE_OS::gettimeofday() == -1) {
-    perror("gettimeofday");
-  }
-  time_buf[strlen(time_buf)-1] = 0;
-  //printf("%010ld%09ld \t %s %s\n", tp.tv_sec, tp.tv_usec, time_buf, message);
-}
-
-
-int comp(const void *a, const void *b) {
-
-  Init_Fini_t *A = (Init_Fini_t *)a;
-  Init_Fini_t *B = (Init_Fini_t *)b;
-
-  return (A->timestamp < B->timestamp) ? -1 : (A->timestamp > B->timestamp);
-}
-  
-
-void Stats::output() {
-  int i;
-  float tavg = 0, lavg = 0;
-
-  qsort(init_fini_, 2*thread_count_, sizeof(Init_Fini_t), comp);
-
-  int max = 0,thread_peak = 0;
-
-  for(i = 0; i < 2*thread_count_; i++) {
-    //    cerr << " " << ((init_fini_[i].type == THREAD_START) ? "START": "END") << " " << init_fini_[i].timestamp.sec() << "." << init_fini_[i].timestamp.usec() << endl;
-    if(init_fini_[i].type == THREAD_START) {
-      if(++thread_peak > max) 
-        max = thread_peak;
-    }
-    else thread_peak--;
-  }
-  for(i = 0; i < thread_count_; i++) {
-    tavg += throughput_[i];
-    lavg += latency_[i];
-  }
-  cout << " " << tavg/thread_count_ << " " << lavg/thread_count_ << " " << max;
-}
-
-
-void Stats::i_have_started(int id) {
-
-  init_fini_[2*id].type = THREAD_START;
-  init_fini_[2*id].timestamp = ACE_OS::gettimeofday();
-
-}
-
-void Stats::i_am_done(int id) {
-
-  init_fini_[(2*id)+1].type = THREAD_END;
-
-  init_fini_[(2*id)+1].timestamp = ACE_OS::gettimeofday();
-
-}
-
-  
diff --git a/apps/JAWS/clients/stats.h b/apps/JAWS/clients/stats.h
deleted file mode 100644
index 39f719c4cec..00000000000
--- a/apps/JAWS/clients/stats.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "global.h"
-
-#ifndef _D_Stats
-#define _D_Stats
-
-#define THREAD_START 42
-#define THREAD_END 43
-
-class Init_Fini_t {
-public:
-  int type; // 0 is start, 1 is end
-  ACE_Time_Value timestamp;
-};
-
-class Stats {
-public:
-  Stats(int);
-  void log(int, float, float);
-  void i_have_started(int);
-  void i_am_done(int);
-  void print (char *);
-  void output();
-private:
-  float *throughput_;
-  float *latency_;
-  Init_Fini_t *init_fini_; // Array (2n deep) to count peak no. of active threads
-  int thread_count_;
-};
-#endif
diff --git a/apps/JAWS/clients/util.cpp b/apps/JAWS/clients/util.cpp
deleted file mode 100644
index 69b88c8509a..00000000000
--- a/apps/JAWS/clients/util.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "util.h"
-
-
-
-URL::URL(char *input_buf) {
-
-  char *buffer = new char[BUFSIZ];
-
-  ACE_OS::strcpy(buffer,input_buf);
-  if(buffer == NULL)
-    return;
-
-  char *temp;
-  char *lasts;
-
-  if(temp = ACE_OS::strtok_r(buffer,": ",&lasts))  {
-	protocol_ = (char *) ACE_OS::malloc(strlen(temp));
-	ACE_OS::strcpy(protocol_, temp);
-  }
-
-  if(temp = ACE_OS::strtok_r(NULL,"/",&lasts))  {
-	hostname_ = (char *) ACE_OS::malloc(strlen(temp));  
-	ACE_OS::strcpy(hostname_, temp);
-  }
-  if(temp = ACE_OS::strtok_r(NULL,"\0",&lasts)) { 
-    filename_ = (char *) malloc(strlen(temp));
-	ACE_OS::strcpy(filename_, temp);
-  }
-  else {
-    filename_ = (char *) malloc(strlen(INDEX_NAME));
-	ACE_OS::strcpy(filename_,INDEX_NAME);
-  }
-}
-
-char *URL::get_protocol(void) {
-  return protocol_;
-}
-
-char *URL::get_hostname(void) {
-  return hostname_;
-}
-
-char *URL::get_filename(void) {
-  return filename_;
-}
-  
-
- 
-
-
-void cleanup(void) {
-  unlink(TEMPORARY_FILE_NAME);
-  unlink(INCOMING_FILE_NAME);
-}
-
-void sigint(int) {
-  cleanup();
-}
- 
-
-
-
diff --git a/apps/JAWS/clients/util.h b/apps/JAWS/clients/util.h
deleted file mode 100644
index ea5b29da104..00000000000
--- a/apps/JAWS/clients/util.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "connection.h"
-
-#ifndef _D_URL
-#define _D_URL
-class URL {
-
-public:
-
-  URL(char *buffer);
-
-  char *get_protocol();
-  char *get_hostname();
-  char *get_filename();
-
-private:
-  char *protocol_;
-  char *hostname_;
-  char *filename_;
-};
-
-void cleanup(void);
-void sigint(int);
-int copier(connection in);
-
-#define INDEX_NAME "/index.html"
-#define INCOMING_FILE_NAME "/tmp/sumedh.web.inc"
-#define TEMPORARY_FILE_NAME "/tmp/sumedh.web.tmp"
-#endif
-
-
-
-