These files have been removed from this directory.

4 files changed, 0 insertions, 1024 deletions

diff --git a/apps/JAWS/server/JAWS_File.cpp b/apps/JAWS/server/JAWS_File.cpp
deleted file mode 100644
index 22878c1f156..00000000000
--- a/apps/JAWS/server/JAWS_File.cpp
+++ /dev/null
@@ -1,666 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    JAWS_File.cpp
-//
-// = AUTHOR
-//    James Hu
-// 
-// ============================================================================
-
-#include "JAWS_File.h"
-
-static const int R_MASK = S_IRUSR|S_IRGRP|S_IROTH;
-static const int W_MASK = S_IRUSR|S_IRGRP|S_IROTH|S_IWUSR|S_IWGRP|S_IWOTH;
-
-#if defined (ACE_WIN32)
-static const int READ_FLAGS = (FILE_FLAG_SEQUENTIAL_SCAN |
-                               FILE_FLAG_OVERLAPPED |
-                               O_RDONLY);
-static const int RCOPY_FLAGS = (FILE_FLAG_SEQUENTIAL_SCAN |
-                                O_RDONLY);
-static const int WRITE_FLAGS = (FILE_FLAG_SEQUENTIAL_SCAN |
-                                FILE_FLAG_OVERLAPPED |
-                                O_RDWR | O_CREAT | O_TRUNC);
-static const int WCOPY_FLAGS = (FILE_FLAG_SEQUENTIAL_SCAN |
-                                O_RDWR | O_CREAT | O_TRUNC);
-#else
-static const int READ_FLAGS = O_RDONLY;
-static const int RCOPY_FLAGS = O_RDONLY;
-static const int WRITE_FLAGS = O_RDWR | O_CREAT | O_TRUNC;
-static const int WCOPY_FLAGS = O_RDWR | O_CREAT | O_TRUNC;
-#endif /* ACE_WIN32 */
-
-// static data members
-JAWS_Virtual_Filesystem * JAWS_Virtual_Filesystem::cvf_ = 0;
-ACE_SYNCH_RW_MUTEX JAWS_Virtual_Filesystem::lock_;
-
-// this is how you make data opaque in C++
-// I'd like to do this with JAWS_File too, but Doug would pro'ly kill me
-class JAWS_Virtual_Filesystem_Singleton
-{
-public:
-  JAWS_Virtual_Filesystem_Singleton (void)
-  { 
-    this->singleton_ = JAWS_Virtual_Filesystem::instance ();
-  }
-
-  ~JAWS_Virtual_Filesystem_Singleton (void)
-  { 
-    delete this->singleton_; 
-  }
-
-private:
-  JAWS_Virtual_Filesystem * singleton_;
-};
-
-// James, please remove reliance on Singletons if possible.
-static JAWS_Virtual_Filesystem_Singleton cvf_singleton;
-
-void
-JAWS_File_Handle::init (void)
-{
-  this->file_ = 0;
-  this->handle_ = ACE_INVALID_HANDLE;
-}
-
-JAWS_File_Handle::JAWS_File_Handle (void)
-{
-  this->init ();
-}
-
-JAWS_File_Handle::JAWS_File_Handle (const char * filename)
-{
-  // there is a problem in this code:
-  this->init ();
-
-  // fetch the file from the Virtual_Filesystem
-  // let the Virtual_Filesystem do the work of cache coherency
-
-  this->file_ = JAWS_Virtual_Filesystem::instance ()->fetch (filename);
-
-  this->file_->acquire ();
-}
-
-JAWS_File_Handle::JAWS_File_Handle (const char * filename, int size)
-{
-  this->init ();
-  // since this is being opened for a write,
-  // simply create a new JAWS_File now,
-  // and let the destructor add it into CVF later
-  this->file_ = new JAWS_File (filename, size);
-  this->file_->acquire ();
-}
-
-JAWS_File_Handle::~JAWS_File_Handle (void)
-{
-  if (this->handle_ != ACE_INVALID_HANDLE)
-    {
-      // this was dup ()'d
-      ACE_OS::close (this->handle_);
-    }
-
-  if (this->file_ != 0)
-    {
-      switch (this->file_->action ())
-        {
-        case JAWS_File::WRITING:
-          this->file_->release ();
-          // assert (this->file_->reference_count () == 0);
-          // put it into the CVF
-          JAWS_Virtual_Filesystem::instance ()->replace (this->file_);
-          break;
-
-        case JAWS_File::WAITING:
-          // last one using a stale file is resposible for deleting it
-          if (this->file_->release () == 0)
-            delete this->file_;
-          break;
-
-        default:
-          this->file_->release ();
-        }
-    }
-}
-
-void *
-JAWS_File_Handle::address (void) const
-{
-  return ((this->file_ == 0) ? 0 : this->file_->address ());
-}
-
-ACE_HANDLE
-JAWS_File_Handle::handle (void) const
-{
-  if (this->handle_ == ACE_INVALID_HANDLE && this->file_ != 0)
-    {
-      JAWS_File_Handle *mutable_this = (JAWS_File_Handle *)this;
-      mutable_this->handle_ = ACE_OS::dup (this->file_->handle ());
-    }
-  return this->handle_;
-}
-
-int
-JAWS_File_Handle::error (void) const
-{
-  if (this->file_ == 0) 
-    return -1;
-  else
-    return this->file_->error ();
-}
-
-size_t
-JAWS_File_Handle::size (void) const
-{
-  if (this->file_ == 0)
-    return (size_t) -1;
-  else
-    return this->file_->size ();
-}
-
-
-JAWS_Virtual_Filesystem *
-JAWS_Virtual_Filesystem::instance (void)
-{
-  // Double check locking pattern.
-  if (JAWS_Virtual_Filesystem::cvf_ == 0)
-    {
-      ACE_Guard<ACE_SYNCH_RW_MUTEX> m (JAWS_Virtual_Filesystem::lock_);
-
-      if (JAWS_Virtual_Filesystem::cvf_ == 0)
-	JAWS_Virtual_Filesystem::cvf_ = new JAWS_Virtual_Filesystem;
-    }
-
-  return JAWS_Virtual_Filesystem::cvf_;
-}
-
-JAWS_Virtual_Filesystem::JAWS_Virtual_Filesystem (void)
-{
-  this->size_ = DEFAULT_VIRTUAL_FILESYSTEM_TABLE_SIZE;
-
-  for (int i = 0; i < this->size_; i++)
-    this->table_[i] = 0;
-}
-
-JAWS_Virtual_Filesystem::~JAWS_Virtual_Filesystem (void)
-{
-  for (int i = 0; i < this->size_; i++)
-    if (this->table_[i] != 0)
-      delete this->table_[i];
-}
-
-JAWS_File *
-JAWS_Virtual_Filesystem::fetch (const char * filename)
-{
-  int i;
-  JAWS_File *handle = 0;
-
-  {
-    ACE_Read_Guard<ACE_SYNCH_RW_MUTEX> m (JAWS_Virtual_Filesystem::lock_);
-
-    i = this->fetch_i (filename);
-
-    if (i != -1 && ! this->table_[i]->update ())
-      handle = this->table_[i];
-  }
-
-  // Considerably slower on misses, but should be faster on hits.
-  // This is actually the double check locking pattern.
-
-  if (handle == 0)
-    {
-      ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> m (JAWS_Virtual_Filesystem::lock_);
-
-      i = this->fetch_i (filename);
-
-      if (i == -1)
-        handle = this->insert_i (new JAWS_File (filename));
-      else if (this->table_[i]->update ())
-        {
-          this->remove_i (i);
-          handle = this->table_[i] = new JAWS_File (filename);
-        }
-      else
-        handle = this->table_[i];
-    }
-
-  return handle;
-}
-
-int
-JAWS_Virtual_Filesystem::fetch_i (const char * filename)
-{
-  for (int i = 0;
-       i < DEFAULT_VIRTUAL_FILESYSTEM_TABLE_SIZE; 
-       i++)
-    {
-      if (this->table_[i] == 0) 
-	continue;
-
-      if (ACE_OS::strcmp (filename, this->table_[i]->filename ()) == 0)
-	return i;
-    }
-
-  return -1;
-}
-
-JAWS_File *
-JAWS_Virtual_Filesystem::remove (const char * filename)
-{
-  ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> m (JAWS_Virtual_Filesystem::lock_);
-
-  int i = this->fetch_i (filename);
-
-  return i == -1 ? 0 : this->remove_i (i);
-}
-
-JAWS_File *
-JAWS_Virtual_Filesystem::remove_i (int index)
-{
-  JAWS_File * handle = 0;
-
-  if (index != -1)
-    {
-      handle = this->table_[index];
-      this->table_[index] = 0;
-      handle->release ();
-
-      if (handle->action () == JAWS_File::IDLE)
-        {
-          delete handle;
-          handle = 0;
-        }
-      else
-        handle->action (JAWS_File::WAITING);
-    }
-
-  return handle;
-}
-
-JAWS_File *
-JAWS_Virtual_Filesystem::insert (JAWS_File * new_file)
-{
-  // Assume the filename associated with this file is unique.
-  ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> m (JAWS_Virtual_Filesystem::lock_);
-
-  return this->insert_i (new_file);
-}
-
-JAWS_File *
-JAWS_Virtual_Filesystem::insert_i (JAWS_File * new_file)
-{
-  int i;
-  int max = 0;
-  size_t maxsize = 0;
-
-  for (i = 0; i < DEFAULT_VIRTUAL_FILESYSTEM_TABLE_SIZE; i++)
-    {
-      if (this->table_[i] != 0)
-        {
-          if (this->table_[i]->size () > maxsize)
-            maxsize = this->table_[max = i]->size ();
-          continue;
-        }
-      this->table_[i] = new_file;
-      break;
-    }
-
-  if (i == DEFAULT_VIRTUAL_FILESYSTEM_TABLE_SIZE)
-    {
-      // Forced to exercise a replacement policy here.  Let's play
-      // nice, and remove the largest object from the cache.
-      this->remove_i (max);
-      this->table_[max] = new_file;
-    }
-
-  new_file->acquire ();
-  return new_file;
-}
-
-JAWS_File *
-JAWS_Virtual_Filesystem::replace (JAWS_File *new_file)
-{
-  ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> m (JAWS_Virtual_Filesystem::lock_);
-
-  int i = this->fetch_i (new_file->filename ());
-
-  if (i == -1)
-    this->insert_i (new_file);
-  else
-    {
-      this->remove_i (i);
-      this->table_[i] = new_file;
-    }
-
-  return new_file;
-}
-
-void
-JAWS_File::init (void)
-{
-  this->filename_[0] = '\0';
-  this->handle_ = ACE_INVALID_HANDLE;
-  this->error_ = OKIE_DOKIE;
-  this->tempname_ = 0;
-  this->size_ = 0;
-  this->reference_count_ = 0 ;
-
-  ACE_OS::memset (&(this->stat_), 0, sizeof (this->stat_));
-}
-
-JAWS_File::JAWS_File (void)
-{
-  this->init ();
-}
-
-JAWS_File::JAWS_File (const char *filename)
-{
-  this->init ();
-
-  // James, this code is important, yet it lacks documentation.
-  // Please rectify this.
-
-  ACE_OS::strcpy (this->filename_, filename);
-  this->action (JAWS_File::IDLE);
-
-  if (ACE_OS::access (this->filename_, R_OK) == -1)
-    {
-      this->error (JAWS_File::ACCESS_FAILED);
-      return;
-    }
-
-  if (ACE_OS::stat (this->filename_, &this->stat_) == -1)
-    {
-      this->error (JAWS_File::STAT_FAILED);
-      return;
-    }
-
-  this->size_ = this->stat_.st_size;
-
-  this->tempname_ = ACE_OS::tempnam (".", "zJAWS");
-
-  ACE_HANDLE original = ACE_OS::open (this->filename_, RCOPY_FLAGS, R_MASK);
-
-  if (original == ACE_INVALID_HANDLE)
-    {
-      this->error (JAWS_File::OPEN_FAILED);
-      return;
-    }
-
-  ACE_HANDLE copy = ACE_OS::open (this->tempname_, WCOPY_FLAGS, W_MASK);
-  if (copy == ACE_INVALID_HANDLE)
-    {
-      this->error (JAWS_File::COPY_FAILED);
-      ACE_OS::close (original);
-      return;
-    }
-
-  ACE_Mem_Map original_map (original);
-  ACE_Mem_Map copy_map (copy, this->size_, PROT_WRITE, MAP_SHARED);
-
-  void *src = original_map.addr ();
-  void *dst = copy_map.addr ();
-  
-  if (src == MAP_FAILED || dst == MAP_FAILED)
-    {
-      this->error (JAWS_File::MEMMAP_FAILED);
-      copy_map.remove ();
-    }
-  else
-    {
-      ACE_OS::memcpy (dst, src, this->size_);
-
-      if (original_map.unmap () == -1 
-	  || copy_map.unmap () == -1)
-	this->error (JAWS_File::MEMMAP_FAILED);
-    }
-
-  ACE_OS::close (original);
-  ACE_OS::close (copy);
-}
-
-JAWS_File::JAWS_File (const char * filename, int size)
-{
-  this->init ();
-
-  this->size_ = size;
-  ACE_OS::strcpy (this->filename_, filename);
-  this->action (JAWS_File::WRITING);
-  
-  if (ACE_OS::access (this->filename_, R_OK|W_OK) == -1)
-    {
-      if (ACE_OS::access (this->filename_, F_OK) != -1)
-        {
-          this->error (JAWS_File::ACCESS_FAILED);
-          return;
-        }
-    }
-
-  this->tempname_ = ACE_OS::tempnam (".", "zJAWS");
-}
-
-JAWS_File::~JAWS_File (void)
-{
-  if (this->tempname_)
-    {
-      if (this->error_ == OKIE_DOKIE)
-        ACE_OS::unlink (this->tempname_);
-      ACE_OS::free (this->tempname_);
-    }
-}
-
-int
-JAWS_File::acquire (void)
-{
-  ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> m (this->lock_);
-  ACE_DEBUG ((LM_DEBUG, "[%t] acquiring: %s\n", this->tempname_));
-
-  if (this->reference_count_++ == 0)
-    {
-      if (this->error_ == OKIE_DOKIE)
-        // load file into memory
-        switch (this->action_)
-          {
-          case JAWS_File::IDLE:
-            this->handle_ = ACE_OS::open (this->tempname_, READ_FLAGS, R_MASK);
-
-            if (this->handle_ == ACE_INVALID_HANDLE)
-              this->error_i (JAWS_File::OPEN_FAILED,
-                             "JAWS_File::acquire: open");
-            else if (this->mmap_.map (this->handle_, -1,
-                                      PROT_READ, MAP_PRIVATE) != 0)
-              {
-                this->error_i (JAWS_File::MEMMAP_FAILED,
-                               "JAWS_File::acquire: map");
-                ACE_OS::close (this->handle_);
-                this->handle_ = ACE_INVALID_HANDLE;
-              }
-            else
-              this->action_ = JAWS_File::READING;
-            break;
-
-          case JAWS_File::WRITING:
-            this->handle_ = ACE_OS::open (this->tempname_,
-					  WRITE_FLAGS,
-					  W_MASK);
-
-            if (this->handle_ == ACE_INVALID_HANDLE)
-              this->error_i (JAWS_File::OPEN_FAILED,
-                             "JAWS_File::acquire: open");
-            else if (ACE_OS::lseek (this->handle_,
-                                    this->size_ - 1,
-                                    SEEK_SET) == -1)
-              {
-                this->error_i (JAWS_File::OPEN_FAILED,
-                               "JAWS_File::acquire: lseek");
-                ACE_DEBUG ((LM_DEBUG, "hey--> %d, %u, %d\n",
-                            this->handle_, this->size_, SEEK_SET));
-                ACE_OS::close (this->handle_);
-              }
-            else if (ACE_OS::write (this->handle_, "", 1) != 1)
-              {
-                this->error_i (JAWS_File::WRITE_FAILED,
-                               "JAWS_File::acquire: write");
-                ACE_OS::close (this->handle_);
-              }
-            else if (this->mmap_.map (this->handle_, this->size_,
-                                      PROT_RDWR, MAP_SHARED) != 0)
-              {
-                this->error_i (JAWS_File::MEMMAP_FAILED,
-                               "JAWS_File::acquire: map");
-                ACE_OS::close (this->handle_);
-              }
-            break;
-
-          case JAWS_File::READING:
-          default:
-            // Nothing to do in these cases.
-            break;
-          }
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "[%t] acquired: %s\n", this->tempname_));
-  return this->reference_count_;
-}
-
-int
-JAWS_File::release (void)
-{
-  ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> m (this->lock_);
-  ACE_DEBUG ((LM_DEBUG, "[%t] releasing: %s\n", this->tempname_));
-
-  if (--this->reference_count_ == 0)
-    {
-      if (this->error_ == OKIE_DOKIE)
-        // Free file from memory if reference count is zero.
-        switch (this->action_)
-          {
-          case JAWS_File::READING:
-            this->mmap_.unmap ();
-            ACE_OS::close (this->handle_);
-            this->handle_ = ACE_INVALID_HANDLE;
-            this->action_ = JAWS_File::IDLE;
-            break;
-
-          case JAWS_File::WRITING:
-            do
-              {
-                ACE_HANDLE original = ACE_OS::open (this->filename_,
-                                                    WRITE_FLAGS, W_MASK);
-                if (original == ACE_INVALID_HANDLE)
-		  this->error_ = JAWS_File::OPEN_FAILED;
-                else if (ACE_OS::write (original, this->mmap_.addr (),
-                                        this->size_) == -1)
-                  {
-                    this->error_ = JAWS_File::WRITE_FAILED;
-                    ACE_OS::close (original);
-                    ACE_OS::unlink (this->filename_);
-                  }
-                else if (ACE_OS::stat (this->filename_, &this->stat_) == -1)
-		  this->error_ = JAWS_File::STAT_FAILED;
-
-                this->mmap_.unmap ();
-                ACE_OS::close (this->handle_);
-                this->handle_ = ACE_INVALID_HANDLE;
-                this->action_ = JAWS_File::IDLE;
-              }
-            while (0);
-            break;
-
-          case JAWS_File::IDLE:
-          default:
-            break;
-          }
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "[%t] released: %s\n", this->tempname_));
-  return this->reference_count_;
-}
-
-int
-JAWS_File::action (void) const
-{
-  ACE_Read_Guard<ACE_SYNCH_RW_MUTEX> m (((JAWS_File *) this)->lock_);
-  return this->action_;
-}
-
-int
-JAWS_File::action (int action_value)
-{
-  ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> m (this->lock_);
-  return (this->action_ = action_value);
-}
-
-int
-JAWS_File::error (void) const
-{
-  ACE_Read_Guard<ACE_SYNCH_RW_MUTEX> m (((JAWS_File *) this)->lock_);
-  return this->error_;
-}
-
-int
-JAWS_File::error (int error_value, const char * s)
-{
-  ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> m (this->lock_);
-  return this->error_i (error_value, s);
-}
-
-int
-JAWS_File::error_i (int error_value, const char * s)
-{
-  ACE_ERROR ((LM_ERROR, "%p.\n", s));
-  this->error_ = error_value;
-  return error_value;
-}
-
-const char *
-JAWS_File::filename (void) const
-{
-  ACE_Read_Guard<ACE_SYNCH_RW_MUTEX> m (((JAWS_File *) this)->lock_);
-  return this->filename_;
-}
-
-size_t
-JAWS_File::size (void) const
-{
-  ACE_Read_Guard<ACE_SYNCH_RW_MUTEX> m (((JAWS_File *) this)->lock_);
-  return this->size_;
-}
-
-ACE_HANDLE
-JAWS_File::handle (void) const
-{
-  ACE_Read_Guard<ACE_SYNCH_RW_MUTEX> m (((JAWS_File *) this)->lock_);
-  return this->handle_;
-}
-
-void *
-JAWS_File::address (void) const
-{
-  ACE_Read_Guard<ACE_SYNCH_RW_MUTEX> m (((JAWS_File *) this)->lock_);
-  return this->mmap_.addr ();
-}
-
-int
-JAWS_File::update (void) const
-{
-  ACE_Read_Guard<ACE_SYNCH_RW_MUTEX> m (((JAWS_File *) this)->lock_);
-  int result;
-  struct stat statbuf;
-
-  if (ACE_OS::stat (this->filename_, &statbuf) == -1)
-    result = 1;
-  else
-    // non-portable code may follow
-      result = (ACE_OS::difftime (this->stat_.st_mtime, statbuf.st_mtime) < 0);
-
-  return result;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/apps/JAWS/server/JAWS_File.h b/apps/JAWS/server/JAWS_File.h
deleted file mode 100644
index 1d9226a2aa8..00000000000
--- a/apps/JAWS/server/JAWS_File.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/* -*- c++ -*- */
-// Hey, Emacs!  This is a C++ file!
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps
-// 
-// = FILENAME
-//    JAWS_File.h
-//
-// = AUTHOR
-//    James Hu
-// 
-// ============================================================================
-
-#if !defined (JAWS_FILE_H)
-#define JAWS_FILE_H
-
-#include "ace/Mem_Map.h"
-#include "ace/Synch.h"
-
-// = Forward declarations.
-class JAWS_File;
-class JAWS_Virtual_Filesystem;
-
-class JAWS_File_Handle
-  // = TITLE
-  //     Abstraction over a real file.  This is meant to be the entry
-  //     point into the Cached Virtual Filesystem.  On creation, the
-  //     cache is checked, and reference count is incremented.  On
-  //     destruction, reference count is decremented.  If the
-  //     reference count is 0, the file is removed from the cache.
-  //
-  //     E.g. 1,
-  //       {
-  //         JAWS_File_Handle foo("foo.html");
-  //         this->peer ().send (foo.address (), foo.size ());
-  //       }
-  //
-  //     E.g. 2,
-  //       {
-  //         JAWS_File_Handle foo("foo.html");
-  //         io->transmitfile (foo.handle (), this->peer ().handle ());
-  //       }
-  //
-  //     E.g. 3,
-  //       {
-  //         JAWS_File_Handle foo("foo.html", content_length);
-  //         this->peer ().recv (foo.address (), content_length);
-  //       }
-{
-public:
-
-  JAWS_File_Handle (const char *filename);
-  // Query cache for file, and acquire it assumes the file is being
-  // opened for reading.
-
-  JAWS_File_Handle (const char *filename,
-		    int size);
-  // Create new entry, and acquire it presence of SIZE assumes the
-  // file is being opened for writing.
-
-  ~JAWS_File_Handle (void);
-  // Closes any open handles, release acquired file.
-
-  void *address (void) const;
-  // Base address of memory mapped file.
-
-  ACE_HANDLE handle (void) const;
-  // A handle (e.g., UNIX file descriptor, or NT file handle).
-
-  int error (void) const;
-  // Any associated error in handle creation and acquisition.
-
-  size_t size (void) const;
-  // The size of the file.
-
-protected:
-
-  JAWS_File_Handle (void);
-  // Default do nothing constructor.  Prevent it from being called.
-
-  void init (void);
-  // James, please document this function.
-
-private:
-  // James, please document.
-  JAWS_File *file_;
-
-  ACE_HANDLE handle_;
-};
-
-// James, can you please replace this with ACE_Hash_Map_Manager?
-
-class JAWS_Virtual_Filesystem
-  // = TITLE
-  //     A hash table holding the information about entry point into
-  //     the Cached Virtual Filesystem.  On creation, the cache is
-  //     checked, and reference count is incremented.  On destruction,
-  //     reference count is decremented.  If the reference count is 0,
-  //     the file is removed from the cache.
-{
-public:
-  static JAWS_Virtual_Filesystem * instance (void);
-  ~JAWS_Virtual_Filesystem (void);
-
-  // James, please document these methods.
-  JAWS_File *fetch (const char * filename);
-  JAWS_File *remove (const char * filename);
-  JAWS_File *insert (JAWS_File * new_file);
-  JAWS_File *replace (JAWS_File * new_file);
-
-protected:
-  JAWS_Virtual_Filesystem (void);
-
-private:
-
-  // James, please document these methods.
-
-  int fetch_i (const char * filename);
-  JAWS_File * remove_i (int index);
-  JAWS_File * insert_i (JAWS_File *new_file);
-
-public:
-
-  enum
-  {
-    DEFAULT_VIRTUAL_FILESYSTEM_TABLE_SIZE = 512,
-    // For this stupid implementation, use an array.  Someday, use a
-    // balanced search tree.
-
-    DEFAULT_VIRTUAL_FILESYSTEM_CACHE_SIZE = 10
-    // This determines the highwater mark in megabytes for the cache.
-    // This will be ignored for now.
-  };
-
-private:
-
-  JAWS_File *table_[DEFAULT_VIRTUAL_FILESYSTEM_TABLE_SIZE];
-  int size_;
-
-  static JAWS_Virtual_Filesystem *cvf_;
-  static ACE_SYNCH_RW_MUTEX lock_;
-};
-
-class JAWS_File
-  // = TITLE
-  //     Abstraction over a real file.  This is what the Virtual
-  //     Filesystem contains.  This class is not intended for general
-  //     consumption.  Please consult a physician before attempting to
-  //     use this class.
-{
-public:
-  JAWS_File (const char *filename);
-  // Creates a file for reading.
-
-  JAWS_File (const char *filename,
-	     int size);
-  // Creates a file for writing.
-
-  ~JAWS_File (void);
-  // Only if reference count is zero should this be called.
-
-  int acquire (void);
-  // Increment the reference_count_.
-
-  int release (void);
-  // Decrement the reference_count_.
-
-  // = action_ accessors
-  int action (void) const;
-  int action (int action_value);
-
-  // = error_ accessors
-  int error (void) const;
-  int error (int error_value,
-	     const char *s = "JAWS_File");
-
-  const char *filename (void) const;
-  // filename_ accessor
-
-  ACE_HANDLE handle (void) const;
-  // handle_ accessor.
-
-  void *address (void) const;
-  // Base memory address for memory mapped file.
-
-  size_t size (void) const;
-  // size_ accessor.
-
-  int update (void) const;
-  // True if file on disk is newer than cached file.
-
-protected:
-  JAWS_File (void);
-
-  // James, please document...
-
-  void init (void);
-
-private:
-  int error_i (int error_value, const char * s = "JAWS_File");
-
-public:
-
-  enum 
-  { 
-    IDLE = 0,
-    READING = 1,
-    WRITING = 2,
-    WAITING = 4 
-  };
-
-  // = action status indicators
-
-  // WAITING -- removed from Virtual Filesystem, but not deleted
-
-  enum 
-  {
-    // James, please rename OKIE_DOKIE to SUCCESS or something boring.
-
-    OKIE_DOKIE = 0,
-    ACCESS_FAILED,
-    OPEN_FAILED,
-    COPY_FAILED,
-    STAT_FAILED,
-    MEMMAP_FAILED,
-    WRITE_FAILED 
-  };
-
-private:
-  //  James, please document these fields.
-  char *tempname_;
-  char filename_[MAXPATHLEN + 1];
-
-  ACE_Mem_Map mmap_;
-  ACE_HANDLE handle_;
-
-  struct stat stat_;
-  size_t size_;
-
-  int action_;
-  int error_;
-
-  int reference_count_;
-  ACE_SYNCH_RW_MUTEX lock_;
-};
-
-#endif /* JAWS_FILE_H */
diff --git a/apps/JAWS/server/test_HTTP_Request.cpp b/apps/JAWS/server/test_HTTP_Request.cpp
deleted file mode 100644
index 461a81eb9a1..00000000000
--- a/apps/JAWS/server/test_HTTP_Request.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// $Id$
-
-#include <stdio.h>
-#include "HTTP_Request.h"
-#include "ace/Mem_Map.h"
-
-static char* request_strings [] =
-{ 
-  "GET \\~irfan\\hi\\mom.html\r\n\r\n",
-  "GET \\~irfan\\hi\\mom.html HTTP/1.0\r\n\r\n",
-  "PUT filename.html HTTP/1.0\nContent-type: text/plain\nContent-length: 15\r\n\r\nTHIS IS DATA!!!",
-  "GET \\~harrison\\mybutt.html in my program\r\n\r\n",
-  "PUT \\~harrison\bilename.html HTTP/1.0\ni suck... asldkasldk Content-type: text/plain\nContent-length: 1024 alskdkls",
-  "PUT bomb in my program\r\n\r\n"
-};
-
-static int total = 2;
-
-int
-main (void)
-{
-  int index = 0;
-  HTTP_Request request;
-  while (index < total)
-    {
-      const char *r = request_strings[index++];
-      int len = ::strlen (r);
-      request.init (r, len);
-      request.dump ();
-
-      if (request.type () == HTTP_Request::PUT)
-	{
-	  ACE_Mem_Map outfile;
-	  ACE_HANDLE handle = ACE_OS::open (request.filename (), 
-					    FILE_FLAG_SEQUENTIAL_SCAN | FILE_FLAG_OVERLAPPED | O_RDWR | O_CREAT);
-	  if (outfile.map (handle,
-			   request.content_length (),
-			   PROT_RDWR,
-			   MAP_SHARED) == -1)
-	    ACE_ERROR ((LM_ERROR, "%p: opening %s.\n",
-			"main",
-			request.filename ()));
-	  else
-	    {
-	      // Write the file.
-	      ACE_OS::memcpy (outfile.addr (), 
-			      request.data (),
-			      request.content_length ());
-	      outfile.sync ();
-	    }
-	}
-    }
- 
-  return 0;
-}
diff --git a/apps/JAWS/server/test_JAWS_File.cpp b/apps/JAWS/server/test_JAWS_File.cpp
deleted file mode 100644
index f11df16f4cc..00000000000
--- a/apps/JAWS/server/test_JAWS_File.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// test_JAWS_File.cpp
-
-#include "JAWS_File.h"
-
-const char *message = "this is the contents of a new testfile\n";
-
-void
-dump (JAWS_File_Handle &h)
-{
-  ACE_OS::printf ("%s", h.address ());
-}
-
-void
-delay (void)
-{
-  JAWS_File_Handle fh4("test_somefile");
-  dump (fh4);
-}
-
-int
-main (void)
-{
-  // Grab a file three times
-  {
-    JAWS_File_Handle fh1("test_somefile");
-    JAWS_File_Handle fh2("test_somefile");
-    JAWS_File_Handle fh3("test_somefile");
-
-    dump (fh1);
-    dump (fh2);
-
-    ::printf("change the test file now\n");
-    ::getchar ();
-
-    delay ();
-
-    {
-      JAWS_File_Handle fh5("test_somefile", ACE_OS::strlen (message));
-      ACE_OS::memcpy (fh5.address (), message, ACE_OS::strlen (message));
-    }
-
-    JAWS_File_Handle fh6("test_somefile");
-
-    dump (fh3);
-    dump (fh6);
-  }
-
-  JAWS_File_Handle fh7("test_somefile");
-  dump (fh7);
-
-  return 0;
-}