This commit was manufactured by cvs2svn to create tag 'AV_DEMO_1'.AV_DEMO_1

15 files changed, 0 insertions, 1654 deletions

diff --git a/java/netsvcs/Logger/DefaultLMR.java b/java/netsvcs/Logger/DefaultLMR.java
deleted file mode 100644
index 19e319de015..00000000000
--- a/java/netsvcs/Logger/DefaultLMR.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Logger
- *
- * = FILENAME
- *    DefaultLMR.java
- *
- *
- *@author Everett Anderson
- *
- *************************************************/
-package netsvcs.Logger;
-
-import java.io.*;
-
-/**
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>
- * The LogMessageReceiver removes the code that handles a log message from
- * the logging service acceptor.  The DefaultLMR simply calls the LogRecord's
- * print method.  
- *
- * @see netsvcs.Logger.ServerLoggingAcceptor
- * @see netsvcs.Logger.LogRecord
- */
-class DefaultLMR implements LogMessageReceiver
-{
-  public void logRecord (String hostname,
-			 LogRecord record)
-    {
-      record.print(hostname, true, System.err);
-    }
-}
diff --git a/java/netsvcs/Logger/LogMessageReceiver.java b/java/netsvcs/Logger/LogMessageReceiver.java
deleted file mode 100644
index c001e06f2bd..00000000000
--- a/java/netsvcs/Logger/LogMessageReceiver.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Logger
- *
- * = FILENAME
- *    LogMessageReceiver.java
- *
- *@author Everett Anderson
- *
- *************************************************/
-package netsvcs.Logger;
-
-import java.io.*;
-
-/**
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>
- * The LogMessageReceiver removes the code that handles a log message from
- * the logging service acceptor.  The DefaultLMR simply calls the LogRecord's
- * print method.  Other implementations of this interface can be built and
- * given to the ServerLoggingAcceptor to change the result.
- *
- * @see netsvcs.Logger.ServerLoggingAcceptor
- * @see netsvcs.Logger.LogRecord
- */
-public interface LogMessageReceiver
-{
-  public void logRecord (String hostname,
-			 LogRecord record);
-};
diff --git a/java/netsvcs/Logger/LogRecord.java b/java/netsvcs/Logger/LogRecord.java
deleted file mode 100644
index 721341cb252..00000000000
--- a/java/netsvcs/Logger/LogRecord.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Logger
- *
- * = FILENAME
- *    LogRecord.java
- *
- *@author Chris Cleeland, Everett Anderson
- *
- *************************************************/
-package netsvcs.Logger;
-
-import java.util.Date;
-import java.io.DataOutputStream;
-import java.io.DataInputStream;
-import java.io.PrintStream;
-import java.io.IOException;
-import JACE.OS.*;
-
-/**
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>
- * Communicates logging information.  Compatible with the C++ ACE
- * ACE_Log_Record class.
- *
- */
-public class LogRecord
-{
-  final public int MAXLOGMSGLEN = 4 * 1024;
-
-  private int type_;
-  private int length_;
-  private long msec_;
-  private int pid_;
-  private byte[] msgData_;
-  private final static int numIntMembers = 5;
-  private final static int sizeofIntInBytes = 4;
-
-  /**
-   * Create a default instance.
-   */
-  public LogRecord()
-  {
-    this(0, (int)new Date().getTime(), 0);
-  }
-
-  /**
-   * Create a LogRecord.  This is the designated initializer.
-   * @param priority a numeric specification of the priority (ascending)
-   * @param milliseconds time attached to the log entry in Unix <pre>time_t</pre> format 
-   * @param pid the process ID; not currently used
-   */
-  public LogRecord(int priority,
-		   long milliseconds,
-		   int pid)
-  {
-    type(priority);
-    timeStamp(milliseconds);
-    length(0);
-    pid(pid);
-  }
-
-  /**
-   * Conversion to string.  Only includes the <pre>msgData_</pre> member.
-   */
-  public String toString()
-  {
-    return new String(msgData_);
-  }
-
-  /**
-   * Place a textual representation of the record on a PrintStream.
-   * @param hostname name of the host generating this record
-   * @param verbose if <b>true</b>, print information in the form, (give example)
-   * @param ps A PrintStream instance to which the output should go.
-   * @see PrintStream,String
-   */
-  public void print(String hostname,
-		    boolean verbose,
-		    PrintStream ps)
-  {
-    String toprint;
-    if (verbose)
-      {
-	Date now = new Date(this.timeStamp());
-
-	/* 01234567890123456789012345 */
-	/* Wed Oct 18 14:25:36 1989n0 */
-	toprint = now.toString().substring(4) + "@"
-                + hostname + "@" + pid_ + "@" + type_ + "@"
-                + this.toString();
-      }
-    else
-      {
-	toprint = this.toString();
-      }
-    ps.println(toprint);
-  }
-
-  /**
-   * Streaming methods
-   */
-  public void streamInFrom(DataInputStream dis) throws IOException
-  {
-    // Order here must match layout order in the C++ class.
-    // This, of course, is VERY fragile, and ought not be used as
-    // a model for anything except how NOT to do anything.
-    type(dis.readInt());
-    length(dis.readInt());
-    this.timeStamp((long)dis.readInt() * 1000);
-
-    // Skip smaller time resolution info since we're lucky if Java's
-    // timer can handle more than millisecond precision, anyway
-    dis.skipBytes(4); 
-
-    pid(dis.readInt());
-
-    // Does readFully() allocate space for the buffer?  Either
-    // way, we won't have memory leaks :-)
-    int dataLength = (int) (length_ - numIntMembers * sizeofIntInBytes);
-    msgData_ = new byte[dataLength];
-    dis.readFully(msgData_, 0, dataLength);
-  }
-
-  public void streamOutTo(DataOutputStream dos) throws IOException
-  {
-    dos.writeInt(length());
-    dos.writeInt(type());
-    dos.writeInt(length());
-    dos.writeInt((int)(this.msec_ / 1000));
-    dos.writeInt(0);  
-    dos.writeInt(pid());
-
-    dos.write(msgData_);
-  }
-
-  /**
-   * Accessor methods
-   */
-  public int type()            { return type_; }
-  public void type(int t)      { type_ = t; }
-
-  public int length()          { return length_;  }
-  public void length(int l)    { length_ = l; }
-  private void setLen(int msgLen)
-       { length(msgLen + numIntMembers * sizeofIntInBytes); }
-
-  public long timeStamp()      { return this.msec_; }
-  public void timeStamp(long msec){ this.msec_ = msec; }
-
-  public int pid()             { return pid_; }
-  public void pid(int p)       { pid_ = p; }
-
-  public byte[] msgData()      { return msgData_; }
-  public void msgData(byte[] m)
-    { 
-      int size = m.length;
-
-      if (size > MAXLOGMSGLEN) 
-	size = MAXLOGMSGLEN;
-
-      this.msgData_ = new byte[size];
- 
-      System.arraycopy(m, 0, msgData_, 0, size);
-
-      setLen(size);
-    }
-
-  public void msgData(String m)
-  {
-    byte temp[] = m.getBytes();
-    if (temp.length > MAXLOGMSGLEN) {
-      this.msgData_ = new byte[MAXLOGMSGLEN];
-      
-      System.arraycopy(temp, 0, msgData_, 0, MAXLOGMSGLEN);
-    } else
-      this.msgData_ = temp;
-    
-    setLen(msgData_.length);
-  }
-};
-
diff --git a/java/netsvcs/Logger/Makefile b/java/netsvcs/Logger/Makefile
deleted file mode 100644
index 0f024034839..00000000000
--- a/java/netsvcs/Logger/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Makefile
- 
-.SUFFIXES: .java .class
-
-JACE_WRAPPER = $(WRAPPER_ROOT)/java
-
-all:
-	javac -d ${JACE_WRAPPER}/classes $(files)
-doc:
-	javadoc -d ${JACE_WRAPPER}/doc $(files) $(packages)
-
-files = LogMessageReceiver.java \
-	DefaultLMR.java \
-	LogRecord.java \
-	ServerLoggingAcceptor.java \
-	ServerLoggingHandler.java
-
-packages = netsvcs \
-	   netsvcs.Logger
-
-realclean: 
-	/bin/rm -rf ${JACE_WRAPPER}/classes/netsvcs/Logger
-
diff --git a/java/netsvcs/Logger/ServerLoggingAcceptor.java b/java/netsvcs/Logger/ServerLoggingAcceptor.java
deleted file mode 100644
index d5d4ae5220d..00000000000
--- a/java/netsvcs/Logger/ServerLoggingAcceptor.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Logger
- *
- * = FILENAME
- *    ServerLoggingAcceptor.java
- *
- *@author Chris Cleeland, Everett Anderson
- *
- *************************************************/
-package netsvcs.Logger;
-
-import JACE.SOCK_SAP.*;
-import JACE.Connection.*;
-import JACE.OS.*;
-import java.io.*;
-import java.net.*;
-import JACE.Misc.*;
-
-/**
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>
- * Acceptor:  Listens on a specified port and launches ServerLoggingHandlers
- * in response to requests.  A LogMessageReceiver can be specified on the
- * command line to change the way the logging service processes messages.
- *
- * @see netsvcs.Logger.ServerLoggingHandler, netsvcs.Logger.LogMessageReceiver
- */
-public class ServerLoggingAcceptor extends Acceptor implements Runnable
-{
-  /** Main function to bootstrap the process
-   *
-   *  Command line arguments:
-   *
-   *  -p <port>         Select a port for listening for requests
-   *  -r <class name>   Specify a LogMessageReceiver (make sure it's a full class name)
-   * 
-   */
-  public static void main (String [] args)
-    {
-      ServerLoggingAcceptor sla = new ServerLoggingAcceptor();
-
-      sla.init(args);
-    }
-
-  /** 
-   * Receives the command line and launches its own thread
-   */
-  public int init (String [] args)
-    {
-      this.parseArgs(args);
-
-      // If the user didn't specify a LogMessageReceiver, use the default
-      // (which just calls a print method on LogMessage)
-      if (this.receiver_ == null)
-	this.receiver_ = new DefaultLMR();
-
-      new Thread (this).start();
-      return 0;
-    }
-
-  /**
-   * Specify what LogMessageReceiver to use 
-   */
-  public void setLMR(LogMessageReceiver receiver)
-    {
-      this.receiver_ = receiver;
-    }
-
-  /** 
-   * Accessor for the LogMessageReceiver
-   */
-  public LogMessageReceiver getLMR ()
-    {
-      return this.receiver_;
-    }
-
-  /** 
-   * Create a new ServerLoggingHandler 
-   */
-  protected SvcHandler makeSvcHandler ()
-    throws InstantiationException, IllegalAccessException
-    {
-      return new netsvcs.Logger.ServerLoggingHandler (this.receiver_);
-    }
-
-  /**
-   * Run forever accepting new connections
-   */
-  public void run ()
-    {
-      try {
-
-	this.open (this.port_);
-	while (true) 
-	  this.accept();  
-
-      } catch (SocketException e)
-	{
-	  ACE.ERROR ("Socket Exception: " + e);
-	}
-      catch (InstantiationException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (IllegalAccessException e)
-	{
-	  ACE.ERROR (e);
-	}
-      catch (IOException e)
-	{
-	  ACE.ERROR (e);
-	}
-
-      ACE.ERROR("ServerLoggingAcceptor has exited");
-    }
-
-  /**
-   * Process the command line
-   */
-  protected void parseArgs (String args[])
-  {
-    String s;
-    GetOpt opt = new GetOpt (args, "p:r:");
-    for (int c; (c = opt.next ()) != -1; )
-      {
-	switch (c)
-	  {
-	  case 'p':
-	    s = opt.optarg ();
-	    this.port_ = (new Integer (s)).intValue ();
-	    break;
-	  case 'r':
-	    // Load the LMR with the given name
-	    s = new String(opt.optarg ());
-	    Class LMRfactory;
-	    try {
-	      LMRfactory = Class.forName(s);
-
-	      receiver_ = (LogMessageReceiver)LMRfactory.newInstance();
-
-	    } catch (ClassNotFoundException e) {
-	      ACE.ERROR("Unable to find LMR factory: " + e);
-	    } catch (InstantiationException e) {
-	      ACE.ERROR("Creating LMR: " + e);
-	    } catch (IllegalAccessException e) {
-	      ACE.ERROR("Creating LMR: " + e);
-	    }
-	    // Any of the above exceptions will result in just using the
-	    // default LMR
-	    break;
-	  default:
-	    ACE.ERROR ("Unknown argument: " + c);
-	    ACE.ERROR ("Valid args: -p <port> -r <LogMessageReceiver name>");
-	    break;
-	  }
-      }
-  }
-
-  private int port_ = ACE.DEFAULT_SERVER_PORT;
-  private LogMessageReceiver receiver_ = null;
-};
-
-
-
-
-
-
diff --git a/java/netsvcs/Logger/ServerLoggingHandler.java b/java/netsvcs/Logger/ServerLoggingHandler.java
deleted file mode 100644
index 9088e17d9d1..00000000000
--- a/java/netsvcs/Logger/ServerLoggingHandler.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Logger
- *
- * = FILENAME
- *    ServerLoggingHandler.java
- *
- *@author Chris Cleeland, Everett Anderson
- *
- *************************************************/
-package netsvcs.Logger;
-
-import JACE.SOCK_SAP.*;
-import JACE.Connection.*;
-import JACE.OS.*;
-import java.util.*;
-import java.io.*;
-
-/**
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>
- * Created by ServerLoggingAcceptor every time a client connects.  This reads 
- * a logging statement passes it to the LogMessageReceiver for processing.
- * </blockquote>
- *
- * @see netsvcs.Logger.ServerLoggingAcceptor
- */
-public class ServerLoggingHandler extends SvcHandler
-{
-  // Processes log messages
-  private LogMessageReceiver receiver_;
-
-  /**
-   * Constructor
-   *
-   *@param receiver    LogMessageReceiver that handles what to do with a message
-   */
-  public ServerLoggingHandler (LogMessageReceiver receiver)
-  {
-    super();
-    this.receiver_ = receiver;
-  }
-
-  /**
-   * Start this handler in its own thread
-   */
-  public int open(Object obj)
-  {
-    new Thread (this).start();
-    return 0;
-  }
-
-  /**
-   * Accessor: get the host name of the connected client
-   */
-  protected String hostName ()
-  {
-    return new String(this.peer().socket().getInetAddress().getHostName());
-  }
-
-  /**
-   * Receive input from the client, and send it to the LMR.  This is the
-   * main loop for this thread.
-   */
-  public void run()
-  {
-    DataInputStream dis = new DataInputStream(this.peer().inputStream());
-
-    for (;;)
-      {
-	// Messages arrive in the following format:
-	// o 4 byte length (network format)
-	// o message, in ACE.LogRecord format
-	//
-	// Hey!  We need exception catching in here too!
-	try
-	  {
-	    // Reconstitute a log message from the wire
-	    LogRecord rec = new LogRecord();
-
-	    // We don't really need this, because
-	    // the object already knows how to
-	    // extract itself properly.  However,
-	    // in order to interoperate with the
-	    // C++ version, this must be extracted.
-	    // Plus, it makes a convenient way to
-	    // check everything.
-	    int length = dis.readInt();
-	
-	    rec.streamInFrom(dis);
-	
-	    if (rec.length() == length)
-	      {
-		// Give the record to the log processor
-		this.receiver_.logRecord(this.hostName(),
-					   rec);
-	      }
-	    else
-	      {
-		ACE.ERROR(Thread.currentThread().getName() + ": Length error");
-	      }
-	  }
-	catch (EOFException eof)
-	  {
-	    try { 
-	      this.stream_.close(); 
-	    } catch (IOException n) { }
-
-	    return;
-	  }
-	catch (IOException ioe)
-	  {
-	    ACE.ERROR(Thread.currentThread().getName()
-			       + ": "
-			       + ioe);
-	  }
-      }
-  }
-};
-
diff --git a/java/netsvcs/Time/Clerk.java b/java/netsvcs/Time/Clerk.java
deleted file mode 100755
index f29e08e06f8..00000000000
--- a/java/netsvcs/Time/Clerk.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    netsvcs.Time
-// 
-// = FILENAME
-//    Clerk.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package netsvcs.Time;
-
-// Test driver for the time server clerk
-public class Clerk
-{
-  public static void main (String [] args)
-    {
-      TSClerkProcessor clerk = new TSClerkProcessor ();
-      clerk.init (args);
-    }
-}
diff --git a/java/netsvcs/Time/Makefile b/java/netsvcs/Time/Makefile
deleted file mode 100755
index b6dc6dd02ea..00000000000
--- a/java/netsvcs/Time/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-
-# Makefile
- 
-.SUFFIXES: .java .class
-
-JACE_WRAPPER = $(WRAPPER_ROOT)/java
-
-all:
-	javac -d ${JACE_WRAPPER}/classes $(files)
-doc:
-	javadoc -d ${JACE_WRAPPER}/doc $(files) $(packages)
-
-files =  TSClerkProcessor.java \
-	 TSClerkHandler.java \
-	 TSRequestAcceptor.java \
-	 TSRequestHandler.java \
-	 TSServerAcceptor.java \
-	 TSServerHandler.java \
-	 Clerk.java \
-	 Server.java
-
-packages = netsvcs \
-	   netsvcs.Time
-
-realclean: 
-	/bin/rm -rf ${JACE_WRAPPER}/classes/netsvcs/Time
-
diff --git a/java/netsvcs/Time/Server.java b/java/netsvcs/Time/Server.java
deleted file mode 100755
index 6b44ddf8d9f..00000000000
--- a/java/netsvcs/Time/Server.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// ============================================================================
-//
-// = PACKAGE
-//    netsvcs.Time
-// 
-// = FILENAME
-//    Server.java
-//
-// = AUTHOR
-//    Prashant Jain
-// 
-// ============================================================================
-package netsvcs.Time;
-
-// Test driver for the time service server
-public class Server
-{
-  public static void main (String [] args)
-    {
-      TSServerAcceptor server = new TSServerAcceptor ();
-      server.init (args);
-    }
-}
diff --git a/java/netsvcs/Time/TSClerkHandler.java b/java/netsvcs/Time/TSClerkHandler.java
deleted file mode 100755
index fc89b69c45c..00000000000
--- a/java/netsvcs/Time/TSClerkHandler.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Time
- *
- * = FILENAME
- *    TS_Clerk_Handler.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package netsvcs.Time;
-
-import java.io.*;
-import java.util.Date;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-import JACE.ASX.TimeValue;
-
-/**
- * <hr>
- * <p><h2>SYNOPSIS</h2>
- *
- * <blockquote>Requests the remote time on a server at regular
- * intervals.</blockquote>
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>TSClerkHandlers are created by a TSClerkProcessor.  There
- * is one handler for each server that the Clerk Processor factors into
- * its calculations.</blockquote>
- */
-public class TSClerkHandler extends SvcHandler
-{
-  /**
-   * Constructor.  TSClerkProcessor specifies the server machine and
-   * port, as well as the interval at which to make the query.
-   */
-  public TSClerkHandler (String hostname, 
-			 int port,
-			 TimerQueue tq, 
-			 int timeout,
-			 TSClerkProcessor parent)
-  {
-
-    this.hostname_ = hostname;
-    this.port_ = port;
-    this.tq_ = tq;
-    this.timeout_ = timeout;
-
-    this.initialTimeout_ = timeout;
-    this.processor_ = parent;
-
-    this.sendMsg_ = new String ("TIME_UPDATE_REQUEST");
-  }
-  
-  /**
-   * Called to start this handler in a new thread.  This only
-   * does it when the state of the handler is INITIALIZING.
-   */
-  public int open (Object obj)
-  {
-    if (this.state_ != RECONNECTING) {
-
-      Thread test = new Thread(this);
-
-      new Thread (this).start ();
-
-    }
-    return 0;
-  }
-
-  /**
-   * Accessor - return the host name of the server
-   */
-  public String hostname ()
-  {
-    return this.hostname_;
-  }
-
-  /**
-   * Accessor - return the port used to contact the server
-   */
-  public int port ()
-  {
-    return this.port_;
-  }
-
-  /**
-   * Accessor - returns the difference between the local time and
-   * the remote server. 
-   */
-  public long delta ()
-  {
-    return this.delta_;
-  }
-
-  /**
-   * Called when the thread starts.  Schedules itself with the
-   * timer queue.
-   */
-  public void run ()
-  {
-    this.timerId_ = this.tq_.scheduleTimer (this,
-					    null,
-					    new TimeValue (this.timeout_),
-					    new TimeValue (this.timeout_));
-
-  }
-
-  /**
-   * Accessor - return the state
-   */
-  public int state() 
-  {
-    return this.state_;
-  }
-
-  /**
-   * Sets the state of the handler
-   */
-  public void state(int newState)
-  {
-    this.state_ = newState;
-  }
-
-  /**
-   * Provides a new time out interval (exponentially increasing) so
-   * that if the server doesn't respond, we don't keep trying to
-   * reconnect as often.  Maximum value is 5 minutes.
-   */
-  public int recalculateTimeout() 
-  {
-    this.timeout_ *= 2;
-
-    if (this.timeout_ > this.max_timeout_)
-      this.timeout_ = max_timeout_;
-
-    return this.timeout_;
-  }
-
-  /**
-   * Start the recovery from a server disconnection by closing the
-   * port and recalculating the timeout value.
-   */
-  protected void errorRecovery()
-  {
-    ACE.DEBUG("Time Service failure with server " + this.hostname_);
-
-    this.timeout_ = this.recalculateTimeout();
-
-    this.reschedule();
-  }
-
-  /**
-   * Removes this handler from the timer queue, and reschedules it
-   * (presumably with a new timeout value)
-   */
-  public void reschedule()
-    {
-      this.tq_.cancelTimer(this);
-
-      this.timerId_ = this.tq_.scheduleTimer (this,
-					      null,
-					      new TimeValue (this.timeout_),
-					      new TimeValue (this.timeout_));
-    }
-
-  /**
-   * Called back by the timer queue.  If the handler isn't connected,
-   * it tries to reconnect to the server.  Otherwise, it requests
-   * the remote time.  The server is said to have disconnected when
-   * an exception is thrown in the socket system, or the result is
-   * a string with length <= 0.
-   */
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    if (this.state_ != CONNECTED) {
-
-      this.processor_.initiateConnection(this);
-
-      // If still not connected
-      if (this.state_ != CONNECTED) { 
-
-	// used to set state to reconnecting here
-	this.state_ = RECONNECTING;
-
-	// Reschedule to try again later
-	this.errorRecovery();
-	return 0;
-      } 
-
-      // If connected, poll the server at the requested intervals
-      this.resetTimeout();
-    }
-
-    StringBuffer ack = new StringBuffer ();
-    int ackLen;
-    try
-      {
-	// Used to calculate the turn-around time
-	long sendTime = System.currentTimeMillis();
-
-	this.peer ().send(this.sendMsg_);
-	ackLen = this.peer ().recv (ack);
-
-	long recvTime = System.currentTimeMillis();
-
-	if (ackLen <= 0) {
-
-	  this.state_ = DISCONNECTED;
-	  return -1;
-
-	} else {   
-
-	  long delta = (new Long(ack.toString())).longValue() - recvTime;
-
-	  delta += (recvTime - sendTime) / 2;
-
-	  this.delta_ = delta;
-
-          System.err.println("Delta: " + this.delta_);
-	}
-
-      }
-    catch (NullPointerException e)
-      {
-	ACE.ERROR ("connection reset by peer");
-	this.state_ = DISCONNECTED;
-	return -1;
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-	this.state_ = DISCONNECTED;
-	return -1;
-      }
-
-    return 0;
-  }
-  
-  /**
-   * Resets the timer interval to be the one supplied to the
-   * constructor.
-   */
-  public void resetTimeout()
-    {
-      this.timeout_ = this.initialTimeout_;
-
-      this.reschedule();
-    }
-    
-  private TSClerkProcessor processor_;
-  // Reference used to re-establish connections
-
-  public static final int MAX_RETRY_TIMEOUT = 300;
-  // Wait at most 5 minutes before trying to reconnect
-
-  // States
-  public static final int CONNECTED = 0;
-  public static final int DISCONNECTED = 1;
-  public static final int RECONNECTING = 2;
-
-  // If there has been a failure, try reconnecting
-  // at least every MAX_RETRY_TIMEOUT seconds
-  private int max_timeout_ = MAX_RETRY_TIMEOUT;
-
-  // State of the handler
-  private int state_ = DISCONNECTED;
-
-  // Difference between the remote time and the local time.
-  private long delta_ = 0;
-
-  // Name of the remote host
-  private String hostname_;
-
-  // Port used for the connection
-  private int port_;
-
-  // Current timer interval
-  private int timeout_;
-
-  // Reference to the Clerk Processor's timer queue
-  private TimerQueue tq_;
-
-  // Message to send for a time update
-  private String sendMsg_;
-
-  // ID of the handler in the queue
-  private int timerId_;
-
-  // Desired time interval to receive updates
-  private int initialTimeout_;
-
-}
diff --git a/java/netsvcs/Time/TSClerkProcessor.java b/java/netsvcs/Time/TSClerkProcessor.java
deleted file mode 100755
index d7b1773cc9e..00000000000
--- a/java/netsvcs/Time/TSClerkProcessor.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Time
- *
- * = FILENAME
- *    TSClerkProcessor.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package netsvcs.Time;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-import JACE.ASX.TimeValue;
-
-/**
- *
- * <hr>
- * <p><h2>SYNOPSIS</h2>
- *
- * <blockquote>Monitors a specified port (default 7989) and launches
- * TSClerkHandlers when connections are made.  The handlers communicate
- * with servers and calculate the difference between the server time
- * and local time.  The Clerk Processor averages these differences
- * and reports them to clients.</blockquote>
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>This doesn't actually change the system clock, but it
- * provides the average of the differences of the local and server
- * times.  A client could use this information to adjust the clock, or
- * just use the midpoint to determine the correct network time.</blockquote>
- *
- */
-public class TSClerkProcessor extends Connector implements Runnable
-{
-  /**
-   * Default constructor
-   */
-  public TSClerkProcessor ()
-  {
-    this.serverArray_ = new Vector ();
-
-  }
-
-  /**
-   * Parse the command line, setup the TSRequestAcceptor, and run
-   * the Clerk Processor in its own thread.
-   */
-  public int init (String [] args)
-    {
-      // Parse arguments
-      this.parseArgs (args);
-      
-      TSRequestAcceptor ra = new TSRequestAcceptor (this);
-      ra.init (args);
-
-      // Run in own thread of control so that we don't block the caller
-      new Thread (this).start ();
-      return 0;
-    }
-
-
-  /**
-   * Makes connections to the servers, schedules itself for intervals
-   * to update the delta time.
-   */
-  public void run ()
-  {
-
-    // Set up connections with all servers
-    Enumeration table = this.serverArray_.elements ();
-    while (table.hasMoreElements ())
-      {
-	this.initiateConnection((TSClerkHandler)table.nextElement());
-      }
-
-    // Set up timer
-    this.timer_id_ = this.tq_.scheduleTimer (this,
-					     null,
-					     new TimeValue (this.timeout_),
-					     new TimeValue (this.timeout_));
-  }
-
-  /**
-   * Makes connections to the servers.
-   */
-  public void initiateConnection (TSClerkHandler handler)
-  {
-    this.open (handler.hostname(), handler.port());
-
-    try
-      {
-	// Connect to the server
-	this.connect (handler);
-
-	// Set the state of the Clerk Handler so it queries the
-	// server at intervals.
-	handler.state(TSClerkHandler.CONNECTED);
-	
-      }
-    catch (UnknownHostException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (SocketException e)
-      {
-	ACE.ERROR ("Connection refused");
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-  }
-
-
-  /**
-   *
-   * Called by the timer queue.  Calls updateTime().
-   */
-  public int handleTimeout (TimeValue tv, Object obj)
-  {
-    return this.updateTime ();
-  }
-
-  /**
-   * Calculates the delta time by averaging the results from
-   * Clerk Handler delta()'s.  It only includes handlers whose
-   * state is currently CONNECTED.  If they're not connected, it
-   * reschedules them to begin the error correction process of
-   * trying to reconnect to the server (possible synch problems?).
-   */
-  protected int updateTime ()
-  {
-    TSClerkHandler handler;
-    int count = 0;
-    long totalDeltaTime = 0;
-
-    Enumeration table = this.serverArray_.elements ();
-
-    while (table.hasMoreElements ())
-      {
-	handler = (TSClerkHandler) table.nextElement ();
-
-	if (handler.state() != TSClerkHandler.CONNECTED) {
-
-	  // Reconnecting state means we don't need to put
-	  // it in the timer queue again
-	  if (handler.state() == TSClerkHandler.RECONNECTING)
-	    continue;
-	  else
-	  if (handler.state() == TSClerkHandler.DISCONNECTED) 
-	    handler.state(TSClerkHandler.RECONNECTING);
-
-	  handler.errorRecovery();
-	  continue;
-	}
-
-	long delta = handler.delta();
-
-	ACE.DEBUG(handler.hostname() + ": " + delta);
-
-	totalDeltaTime += delta;
-	count++;
-      }
-
-    if (count > 0) {
-
-      this.timeDelta_ = totalDeltaTime / count;
-
-      ACE.DEBUG("Average deviation: " + totalDeltaTime/count);
-
-    } else
-
-      this.timeDelta_ = 0;
-
-    return 0;
-  }
-
-  /**
-   * Return the delta time.
-   */
-  public long getDelta()
-    {
-      return this.timeDelta_;
-    }
-
-  /**
-   * Parse the command line.  Watches for -t <time> and
-   * -h <machine:port> switches.  Must specify time
-   * value before host switches!
-   */
-  protected void parseArgs (String args[])
-  {
-    String s;
-    GetOpt opt = new GetOpt (args, "t:h:");
-    for (int c; (c = opt.next ()) != -1; )
-      {
-	switch (c)
-	  {
-	  case 't':
-	    s = opt.optarg ();
-	    this.timeout_ = (new Integer (s)).intValue ();
-	    break;
-	  case 'h':
-	    s = opt.optarg ();
-	    this.addNewHandler (s);
-	    break;
-	  default:
-	    ACE.ERROR ("Bad command line argument: " + c);
-
-	    ACE.ERROR ("Valid arguments: -t <timeout> -h <hostname>:<port> -h ...");
-	    break;
-	  }
-      }
-  }
-  
-  /**
-   *
-   * Creates a new Clerk Handler and adds it to the serverArray_
-   */
-  private void addNewHandler (String s)
-  {
-    StringTokenizer tokens = new StringTokenizer (s, ":");
-    String hostname = tokens.nextToken ();
-
-    int port = (new Integer (tokens.nextToken ())).intValue ();
-    
-    // Create new handler and add it to array of servers
-    this.serverArray_.addElement (new TSClerkHandler (hostname, 
-						      port,
-						      this.tq_,
-						      this.timeout_,
-						      this));
-  }
-  
-  // Vector of TSClerkHandlers, one for each server
-  private Vector serverArray_;
-
-  // Default interval at which to update the time
-  private int timeout_ = 1000;
-
-  // Timer queue which calls handleTimeout when the Clerk Processor
-  // is supposed to update the time.
-  private TimerQueue tq_ = new TimerQueue (true);
-
-  // Clerk Processor ID in the timer queue
-  private int timer_id_;
-
-  // Average of the differences of the local and server times.
-  private long timeDelta_;
-}
diff --git a/java/netsvcs/Time/TSRequestAcceptor.java b/java/netsvcs/Time/TSRequestAcceptor.java
deleted file mode 100755
index e02b0b261ba..00000000000
--- a/java/netsvcs/Time/TSRequestAcceptor.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Time
- *
- * = FILENAME
- *    TSRequestAcceptor.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package netsvcs.Time;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-
-/**
- * <hr>
- * <p><h2>SYNOPSIS</h2>
- *
- * <blockquote>Monitors a specified port (default 7990) and launches 
- * TSRequestHandlers when connections are made.  The handlers
- * report the average deviation from the local time when input
- * is received to their sockets.</blockquote>
- * 
- * <p><h2>DESCRIPTION</h2>
- * <blockquote>This is in place of the shared memory system used in C++ ACE.  
- * The clients need to request the correct time range from the Clerk, so
- * they can do it with <a href="ACE.SOCK_SAP.SOCKStream.html#_top_">
- * <tt>sockets</tt></a>.  An instance of TSRequestAcceptor is created
- * and initialized in TSClerkProcessor init().  This should be the
- * only place it's used.</blockquote>
- *
- * @see ACE.SOCK_SAP.SOCKAcceptor,ACE.netsvcs.Time.TSClerkProcessor
- */
-
-public class TSRequestAcceptor extends Acceptor implements Runnable
-{
-  /**
-   * Create an instance of TSRequestAcceptor.  Default constructor.
-   */
-  public TSRequestAcceptor (TSClerkProcessor parent) 
-    {
-      this.parent_ = parent;
-    }
-
-  /**
-   *
-   * Process command line arguments (port), and start this instance
-   * in its own thread.
-   *
-   */
-  public int init(String [] args)
-    {
-      this.parseArgs (args);
-
-      new Thread (this).start();
-      return 0;
-    }
-
-  /**
-   *
-   * Called when the thread starts.  Open the port and accept
-   * connections.
-   */
-  public void run ()
-    {
-      try {
-	this.open (this.port_);
-	while (true)
-	  this.accept();
-      }
-    catch (SocketException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-
-    System.err.println("Stopped accepting");
-    }
-
-  /**
-   *
-   * Parse the command line.  This only looks for -p <port number>.
-   *
-   */
-  protected void parseArgs (String args[])
-    {
-      String s;
-      GetOpt opt = new GetOpt (args, "p:");
-
-      for (int c; (c = opt.next ()) != -1; )
-	{
-	  switch (c)
-	    {
-	    case 'p':
-	      s = opt.optarg ();
-	      this.port_ = (new Integer (s)).intValue ();
-	      break;
-	    default:
-	      ACE.ERROR("Invalid argument: " + c);
-	      break;
-	    }
-	}
-    }
-
-  /**
-   *
-   * Modifies to behavior of Acceptor accept() so the TSClerkProcessor
-   * reference can be passed to the TSRequestHandler.
-   *
-   */
-
-  protected SvcHandler makeSvcHandler ()
-        throws InstantiationException, IllegalAccessException
-  {
-    return (SvcHandler) new TSRequestHandler(parent_);
-  }
-
-  // Port to monitor
-  private int port_ = 7990;
-
-  // Reference to the Clerk Processor (which holds the time value)
-  private TSClerkProcessor parent_;
-};
-     
diff --git a/java/netsvcs/Time/TSRequestHandler.java b/java/netsvcs/Time/TSRequestHandler.java
deleted file mode 100755
index dbeded22250..00000000000
--- a/java/netsvcs/Time/TSRequestHandler.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package netsvcs.Time;
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Time
- *
- * = FILENAME
- *    TSRequestHandler.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-import java.io.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-
-/**
- * <hr>
- * <p><h2>SYNOPSIS</h2>
- *
- * <blockquote>Handles giving the client the average difference between
- * the local time and the server times.</blockquote>
- *
- * <p><h2>DESCRIPTION</h2>
- *
- * <blockquote>Whenever the RequestHandler receives input to the port, it
- * sends the current delta (average difference time) in return as a string.
- * Instances of this class are created by TSRequestAcceptor.</blockquote>
- */
-public class TSRequestHandler extends SvcHandler
-{
-  /**
-   * Constructor.  Takes in a reference to the Clerk Processor
-   * so it can call TSClerkProcessor getDelta().
-   */
-  public TSRequestHandler (TSClerkProcessor processor)
-  {
-    this.processor_ = processor;
-  }
-  
-  /**
-   *
-   * Run this in a separate thread.
-   */
-  public int open (Object obj)
-  {
-    new Thread (this).start ();
-    return 0;
-  }
-
-  /**
-   *
-   * Called when the thread starts.  This is the main code -- whenever
-   * input comes to the socket, it sends out the current delta time
-   * as a string.
-   */
-  public void run ()
-  {
-    int msgLen;
-    try
-      {
-	while (true)
-	  {
-	    StringBuffer msg = new StringBuffer ();
-	    
-	    msgLen = this.peer ().recv (msg);
-
-	    if (msgLen < 0)
-	      break;
-	    else {
-	      
-	      // No matter what was sent in, send the average difference back
-
-	      String msgOut = new String("" + this.processor_.getDelta() + '\n');
-	      this.peer ().send (msgOut);
-
-	    }
-	  }
-      }
-    catch (NullPointerException e)
-      {
-	ACE.ERROR ("Connection reset by peer");
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-    finally
-      {
-	try 
-	  {
-	    this.peer ().close ();
-	  }
-	catch (IOException e)
-	  {
-	    ACE.ERROR (e);
-	  }
-      }
-  }
-  
-
-  // Reference to the Clerk Processor to call getDelta()
-  TSClerkProcessor processor_;
-}
diff --git a/java/netsvcs/Time/TSServerAcceptor.java b/java/netsvcs/Time/TSServerAcceptor.java
deleted file mode 100755
index 2d54f7b740b..00000000000
--- a/java/netsvcs/Time/TSServerAcceptor.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Time
- *
- * = FILENAME
- *    TS_Server_Acceptor.java
- *
- *@author Prashant Jain
- *
- *************************************************/
-package netsvcs.Time;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Misc.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-
-/**
- * <hr>
- * <p><h2>DESCRIPTION</h2>
- *
- * Acceptor: listens to a port and launches TSServerHandlers
- * when connections are made.
- *
- * @see netsvcs.Time.TSServerHandler, JACE.Connection.Acceptor
- */
-public class TSServerAcceptor extends Acceptor implements Runnable
-{
-  // Run this in its own thread
-  public int init (String [] args)
-    {
-      // Parse arguments
-      this.parseArgs (args);
-
-      // Run in own thread of control so that we don't block the caller
-      new Thread (this).start ();
-      return 0;
-    }
-
-  // Create a TSServerHandler for each client that wants to connect
-  public void run ()
-  {
-    try
-      {
-	this.setHandlerFactory (Class.forName ("netsvcs.Time.TSServerHandler"));
-	this.open (this.port_);
-	while (true)
-	  this.accept ();
-      }
-    catch (ClassNotFoundException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (SocketException e)
-      {
-	ACE.ERROR ("Socket Exception: " + e);
-      }
-    catch (InstantiationException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IllegalAccessException e)
-      {
-	ACE.ERROR (e);
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-
-    System.err.println("Stopped accepting");
-  }
-
-  // Process the command line
-  protected void parseArgs (String args[])
-  {
-    String s;
-    GetOpt opt = new GetOpt (args, "p:");
-    for (int c; (c = opt.next ()) != -1; )
-      {
-	switch (c)
-	  {
-	  case 'p':
-	    s = opt.optarg ();
-	    this.port_ = (new Integer (s)).intValue ();
-	    break;
-	  default:
-	    ACE.ERROR ("Unknown argument: " + c);
-	    break;
-	  }
-      }
-  }
-
-  private int port_ = 7989;
-}
-
diff --git a/java/netsvcs/Time/TSServerHandler.java b/java/netsvcs/Time/TSServerHandler.java
deleted file mode 100755
index 4ee700254ed..00000000000
--- a/java/netsvcs/Time/TSServerHandler.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*************************************************
- *
- * = PACKAGE
- *    netsvcs.Time
- *
- * = FILENAME
- *    TS_Server_Handler.java
- *
- *@author Prashant Jain, Everett Anderson
- *
- *************************************************/
-package netsvcs.Time;
-
-import java.io.*;
-import java.util.*;
-import JACE.OS.*;
-import JACE.Connection.*;
-import JACE.Reactor.*;
-
-/**
- * <hr>
- * <p><h2>DESCRIPTION</h2>
- *     
- * <blockquote>Handles requests from a TSClerkHandler and sends
- * back the current local time.</blockquote>
- *
- * @see netsvcs.Time.TSClerkHandler. netsvcs.Time.TSServerAcceptor
- */
-
-public class TSServerHandler extends SvcHandler
-{
-  // Constructor
-  public TSServerHandler ()
-  {
-  }
-  
-  // Start this handler in its own thread
-  public int open (Object obj)
-  {
-
-    new Thread (this).start ();
-    return 0;
-  }
-
-  // Wait for messages from the Client and send the current local
-  // time back as a string.
-  public void run ()
-  {
-    int msgLen;
-    try
-      {
-	while (true)
-	  {
-	    // Use a new one each time since recv appends
-	    StringBuffer msg = new StringBuffer ();
-
-	    // Get the message from the client (blocks)
-	    msgLen = this.peer ().recv (msg);
-
-	    // Just keep waiting if there's a problem
-	    if (msgLen <= 0)
-	      break;
-
-	    // Is the message for the right thing?
-	    if (msg.toString().compareTo ("TIME_UPDATE_REQUEST") != 0) {
-	      System.err.println("Unknown message: \"" + msg + '\"');
-	      this.peer().send("\n");  // send so other side isn't stuck
-	      break;
-	    }
-
-	    // Get local time
-	    long time = System.currentTimeMillis();
-
-	    // Send as a string
-	    this.peer ().send ("" + time);
-
-	    ACE.DEBUG("Time: " + new Date(time));
-	  }
-      }
-    catch (NullPointerException e)
-      {
-	ACE.ERROR ("Connection reset by peer");
-      }
-    catch (IOException e)
-      {
-	ACE.ERROR (e);
-      }
-    finally
-      {
-	try 
-	  {
-	    this.peer ().close ();
-	  }
-	catch (IOException e)
-	  {
-	  }
-      }
-  }
-}