The first great Three Rings renaming. Cocktail changed to Narya, Cher

changed to Presents and Party changed to Crowd. Whee!


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@431 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/presents/server/Authenticator.java

@@ -1,10 +1,10 @@
 //
-// $Id: Authenticator.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
+// $Id: Authenticator.java,v 1.3 2001/10/11 04:07:53 mdb Exp $
 
-package com.threerings.cocktail.cher.server.net;
+package com.threerings.presents.server.net;
 
-import com.threerings.cocktail.cher.net.AuthRequest;
-import com.threerings.cocktail.cher.net.AuthResponse;
+import com.threerings.presents.net.AuthRequest;
+import com.threerings.presents.net.AuthResponse;
 
 /**
  * The authenticator is a pluggable component of the authentication

src/java/com/threerings/presents/server/ClientManager.java

@@ -1,15 +1,15 @@
 //
-// $Id: ClientManager.java,v 1.10 2001/08/07 21:20:48 mdb Exp $
+// $Id: ClientManager.java,v 1.11 2001/10/11 04:07:53 mdb Exp $
 
-package com.threerings.cocktail.cher.server;
+package com.threerings.presents.server;
 
 import java.io.IOException;
 import java.util.HashMap;
 
-import com.threerings.cocktail.cher.Log;
-import com.threerings.cocktail.cher.data.ClientObject;
-import com.threerings.cocktail.cher.net.Credentials;
-import com.threerings.cocktail.cher.server.net.*;
+import com.threerings.presents.Log;
+import com.threerings.presents.data.ClientObject;
+import com.threerings.presents.net.Credentials;
+import com.threerings.presents.server.net.*;
 
 /**
  * The client manager is responsible for managing the clients (surprise,
@@ -32,17 +32,17 @@ public class ClientManager implements ConnectionObserver
 
     /**
      * Instructs the client manager to construct instances of this derived
-     * class of <code>CherClient</code> to managed newly accepted client
+     * class of <code>PresentsClient</code> to managed newly accepted client
      * connections.
      *
-     * @see CherClient
+     * @see PresentsClient
      */
     public void setClientClass (Class clientClass)
     {
         // sanity check
-        if (!CherClient.class.isAssignableFrom(clientClass)) {
+        if (!PresentsClient.class.isAssignableFrom(clientClass)) {
             Log.warning("Requested to use client class that does not " +
-                        "derive from CherClient " +
+                        "derive from PresentsClient " +
                         "[class=" + clientClass.getName() + "].");
             return;
         }
@@ -56,7 +56,7 @@ public class ClientManager implements ConnectionObserver
      * <code>ClientObject</code> derived class when creating the
      * distributed object that corresponds to a particular client session.
      *
-     * @see com.threerings.cocktail.cher.data.ClientObject
+     * @see com.threerings.presents.data.ClientObject
      */
     public void setClientObjectClass (Class clobjClass)
     {
@@ -75,7 +75,7 @@ public class ClientManager implements ConnectionObserver
     /**
      * Returns the class that should be used when creating a distributed
      * object to accompany a particular client session. In general, this
-     * is only used by the <code>CherClient</code> object when it is
+     * is only used by the <code>PresentsClient</code> object when it is
      * setting up a client's session for the first time.
      */
     public Class getClientObjectClass ()
@@ -96,7 +96,7 @@ public class ClientManager implements ConnectionObserver
         String username = creds.getUsername();
 
         // see if there's a client already registered with this username
-        CherClient client = (CherClient)_usermap.get(username);
+        PresentsClient client = (PresentsClient)_usermap.get(username);
 
         if (client != null) {
             Log.info("Session resumed [username=" + username +
@@ -108,7 +108,7 @@ public class ClientManager implements ConnectionObserver
                      ", conn=" + conn + "].");
             // create a new client and stick'em in the table
             try {
-                client = (CherClient)_clientClass.newInstance();
+                client = (PresentsClient)_clientClass.newInstance();
                 client.startSession(this, username, conn);
                 _usermap.put(username, client);
             } catch (Exception e) {
@@ -136,7 +136,7 @@ public class ClientManager implements ConnectionObserver
         void connectionFailed (Connection conn, IOException fault)
     {
         // remove the client from the connection map
-        CherClient client = (CherClient)_conmap.remove(conn);
+        PresentsClient client = (PresentsClient)_conmap.remove(conn);
         if (client != null) {
             Log.info("Unmapped failed client [client=" + client +
                      ", conn=" + conn + ", fault=" + fault + "].");
@@ -159,7 +159,7 @@ public class ClientManager implements ConnectionObserver
     public synchronized void connectionClosed (Connection conn)
     {
         // remove the client from the connection map
-        CherClient client = (CherClient)_conmap.remove(conn);
+        PresentsClient client = (PresentsClient)_conmap.remove(conn);
         if (client != null) {
             Log.info("Unmapped client [client=" + client +
                      ", conn=" + conn + "].");
@@ -175,10 +175,10 @@ public class ClientManager implements ConnectionObserver
      * Called by the client instance when the client requests a logoff.
      * This is called from the conmgr thread.
      */
-    synchronized void clientDidEndSession (CherClient client)
+    synchronized void clientDidEndSession (PresentsClient client)
     {
         // remove the client from the username map
-        CherClient rc = (CherClient)_usermap.remove(client.getUsername());
+        PresentsClient rc = (PresentsClient)_usermap.remove(client.getUsername());
 
         // sanity check because we can
         if (rc == null) {
@@ -197,6 +197,6 @@ public class ClientManager implements ConnectionObserver
     protected HashMap _usermap = new HashMap();
     protected HashMap _conmap = new HashMap();
 
-    protected Class _clientClass = CherClient.class;
+    protected Class _clientClass = PresentsClient.class;
     protected Class _clobjClass = ClientObject.class;
 }

src/java/com/threerings/presents/server/DummyAuthenticator.java

@@ -1,11 +1,11 @@
 //
-// $Id: DummyAuthenticator.java,v 1.3 2001/10/01 22:14:55 mdb Exp $
+// $Id: DummyAuthenticator.java,v 1.4 2001/10/11 04:07:53 mdb Exp $
 
-package com.threerings.cocktail.cher.server;
+package com.threerings.presents.server;
 
-import com.threerings.cocktail.cher.Log;
-import com.threerings.cocktail.cher.net.*;
-import com.threerings.cocktail.cher.server.net.Authenticator;
+import com.threerings.presents.Log;
+import com.threerings.presents.net.*;
+import com.threerings.presents.server.net.Authenticator;
 
 public class DummyAuthenticator implements Authenticator
 {

src/java/com/threerings/presents/server/InvocationManager.java

@@ -1,15 +1,15 @@
 //
-// $Id: InvocationManager.java,v 1.7 2001/08/14 06:47:38 mdb Exp $
+// $Id: InvocationManager.java,v 1.8 2001/10/11 04:07:53 mdb Exp $
 
-package com.threerings.cocktail.cher.server;
+package com.threerings.presents.server;
 
 import java.lang.reflect.Method;
 import java.util.HashMap;
 
-import com.threerings.cocktail.cher.Log;
-import com.threerings.cocktail.cher.dobj.*;
-import com.threerings.cocktail.cher.data.*;
-import com.threerings.cocktail.cher.util.ClassUtil;
+import com.threerings.presents.Log;
+import com.threerings.presents.dobj.*;
+import com.threerings.presents.data.*;
+import com.threerings.presents.util.ClassUtil;
 
 /**
  * The invocation services provide client to server invocations (service
@@ -86,7 +86,7 @@ public class InvocationManager
         // construct a message event and deliver it
         MessageEvent nevt = new MessageEvent(
             cloid, InvocationObject.NOTIFICATION_NAME, nargs);
-        CherServer.omgr.postEvent(nevt);
+        PresentsServer.omgr.postEvent(nevt);
     }
 
     public void objectAvailable (DObject object)
@@ -137,7 +137,7 @@ public class InvocationManager
         // prune the method arguments from the full message arguments
         Object[] margs = new Object[args.length-1];
         int cloid = mevt.getSourceOid();
-        margs[0] = CherServer.omgr.getObject(cloid);
+        margs[0] = PresentsServer.omgr.getObject(cloid);
         // make sure the client is still around
         if (margs[0] == null) {
             Log.warning("Client no longer around for invocation provider " +

src/java/com/threerings/presents/server/InvocationProvider.java

@@ -1,14 +1,14 @@
 //
-// $Id: InvocationProvider.java,v 1.5 2001/08/11 02:02:24 mdb Exp $
+// $Id: InvocationProvider.java,v 1.6 2001/10/11 04:07:53 mdb Exp $
 
-package com.threerings.cocktail.cher.server;
+package com.threerings.presents.server;
 
 import com.samskivert.util.StringUtil;
 
-import com.threerings.cocktail.cher.Log;
-import com.threerings.cocktail.cher.data.ClientObject;
-import com.threerings.cocktail.cher.data.InvocationObject;
-import com.threerings.cocktail.cher.dobj.MessageEvent;
+import com.threerings.presents.Log;
+import com.threerings.presents.data.ClientObject;
+import com.threerings.presents.data.InvocationObject;
+import com.threerings.presents.dobj.MessageEvent;
 
 /**
  * Invocation providers should extend this class when implementing
@@ -123,7 +123,7 @@ public class InvocationProvider
             MessageEvent mevt = new MessageEvent(
                 source.getOid(), InvocationObject.RESPONSE_NAME, args);
             // and ship it off
-            CherServer.omgr.postEvent(mevt);
+            PresentsServer.omgr.postEvent(mevt);
 
         } else {
             Log.warning("Dropping invrsp due to disappearing client " +

src/java/com/threerings/presents/server/PresentsClient.java

@@ -1,7 +1,7 @@
 //
-// $Id: PresentsClient.java,v 1.19 2001/10/02 02:05:50 mdb Exp $
+// $Id: PresentsClient.java,v 1.20 2001/10/11 04:07:53 mdb Exp $
 
-package com.threerings.cocktail.cher.server;
+package com.threerings.presents.server;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -9,11 +9,11 @@ import java.util.Iterator;
 
 import com.samskivert.util.HashIntMap;
 
-import com.threerings.cocktail.cher.Log;
-import com.threerings.cocktail.cher.data.ClientObject;
-import com.threerings.cocktail.cher.dobj.*;
-import com.threerings.cocktail.cher.net.*;
-import com.threerings.cocktail.cher.server.net.*;
+import com.threerings.presents.Log;
+import com.threerings.presents.data.ClientObject;
+import com.threerings.presents.dobj.*;
+import com.threerings.presents.net.*;
+import com.threerings.presents.server.net.*;
 
 /**
  * A client object represents a client session in the server. It is
@@ -29,7 +29,7 @@ import com.threerings.cocktail.cher.server.net.*;
  * not overlap with its other client duties which are called from the
  * conmgr thread and therefore also need not be synchronized.
  */
-public class CherClient implements Subscriber, MessageHandler
+public class PresentsClient implements Subscriber, MessageHandler
 {
     /**
      * Returns the username with which this client instance is associated.
@@ -72,7 +72,7 @@ public class CherClient implements Subscriber, MessageHandler
             public void requestFailed (int oid, ObjectAccessException cause)
             {
                 Log.warning("Unable to create client object " +
-                            "[client=" + CherClient.this +
+                            "[client=" + PresentsClient.this +
                             ", error=" + cause + "].");
             }
 
@@ -82,7 +82,7 @@ public class CherClient implements Subscriber, MessageHandler
             }
         };
         Class clobjClass = _cmgr.getClientObjectClass();
-        CherServer.omgr.createObject(clobjClass, sub, false);
+        PresentsServer.omgr.createObject(clobjClass, sub, false);
     }
 
     /**
@@ -130,7 +130,7 @@ public class CherClient implements Subscriber, MessageHandler
                 return false;
             }
         };
-        CherServer.omgr.postEvent(event);
+        PresentsServer.omgr.postEvent(event);
     }
 
     /**
@@ -182,7 +182,7 @@ public class CherClient implements Subscriber, MessageHandler
                 return false;
             }
         };
-        CherServer.omgr.postEvent(event);
+        PresentsServer.omgr.postEvent(event);
     }
 
     /**
@@ -266,7 +266,7 @@ public class CherClient implements Subscriber, MessageHandler
     protected void sessionDidTerminate ()
     {
         // destroy the client object
-        CherServer.omgr.destroyObject(_clobj.getOid());
+        PresentsServer.omgr.destroyObject(_clobj.getOid());
     }
 
     /**
@@ -312,7 +312,7 @@ public class CherClient implements Subscriber, MessageHandler
         data.clientOid = _clobj.getOid();
 
         // give them the invocation oid
-        data.invOid = CherServer.invmgr.getOid();
+        data.invOid = PresentsServer.invmgr.getOid();
     }
 
     /**
@@ -343,7 +343,7 @@ public class CherClient implements Subscriber, MessageHandler
                 return false;
             }
         };
-        CherServer.omgr.postEvent(event);
+        PresentsServer.omgr.postEvent(event);
     }
 
     /**
@@ -468,7 +468,7 @@ public class CherClient implements Subscriber, MessageHandler
         /**
          * Dispatch the supplied message for the specified client.
          */
-        public void dispatch (CherClient client, UpstreamMessage mge);
+        public void dispatch (PresentsClient client, UpstreamMessage mge);
     }
 
     /**
@@ -476,14 +476,14 @@ public class CherClient implements Subscriber, MessageHandler
      */
     protected static class SubscribeDispatcher implements MessageDispatcher
     {
-        public void dispatch (CherClient client, UpstreamMessage msg)
+        public void dispatch (PresentsClient client, UpstreamMessage msg)
         {
             SubscribeRequest req = (SubscribeRequest)msg;
 //              Log.info("Subscribing [client=" + client +
 //                       ", oid=" + req.getOid() + "].");
 
             // forward the subscribe request to the omgr for processing
-            CherServer.omgr.subscribeToObject(req.getOid(), client);
+            PresentsServer.omgr.subscribeToObject(req.getOid(), client);
         }
     }
 
@@ -492,14 +492,14 @@ public class CherClient implements Subscriber, MessageHandler
      */
     protected static class UnsubscribeDispatcher implements MessageDispatcher
     {
-        public void dispatch (CherClient client, UpstreamMessage msg)
+        public void dispatch (PresentsClient client, UpstreamMessage msg)
         {
             UnsubscribeRequest req = (UnsubscribeRequest)msg;
 //              Log.info("Unsubscribing [client=" + client +
 //                       ", oid=" + req.getOid() + "].");
 
             // forward the unsubscribe request to the omgr for processing
-            CherServer.omgr.unsubscribeFromObject(req.getOid(), client);
+            PresentsServer.omgr.unsubscribeFromObject(req.getOid(), client);
             // update our subscription tracking table
             client.unmapSubscrip(req.getOid());
         }
@@ -510,7 +510,7 @@ public class CherClient implements Subscriber, MessageHandler
      */
     protected static class ForwardEventDispatcher implements MessageDispatcher
     {
-        public void dispatch (CherClient client, UpstreamMessage msg)
+        public void dispatch (PresentsClient client, UpstreamMessage msg)
         {
             ForwardEventRequest req = (ForwardEventRequest)msg;
             DEvent fevt = req.getEvent();
@@ -522,7 +522,7 @@ public class CherClient implements Subscriber, MessageHandler
 //                       ", event=" + fevt + "].");
 
             // forward the event to the omgr for processing
-            CherServer.omgr.postEvent(fevt);
+            PresentsServer.omgr.postEvent(fevt);
         }
     }
 
@@ -531,7 +531,7 @@ public class CherClient implements Subscriber, MessageHandler
      */
     protected static class PingDispatcher implements MessageDispatcher
     {
-        public void dispatch (CherClient client, UpstreamMessage msg)
+        public void dispatch (PresentsClient client, UpstreamMessage msg)
         {
             Log.info("Received client ping [client=" + client + "].");
             // send a pong response
@@ -549,7 +549,7 @@ public class CherClient implements Subscriber, MessageHandler
      */
     protected static class LogoffDispatcher implements MessageDispatcher
     {
-        public void dispatch (CherClient client, UpstreamMessage msg)
+        public void dispatch (PresentsClient client, UpstreamMessage msg)
         {
             Log.info("Client requested logoff " +
                      "[client=" + client + "].");

src/java/com/threerings/presents/server/PresentsDObjectMgr.java

@@ -1,7 +1,7 @@
 //
-// $Id: PresentsDObjectMgr.java,v 1.16 2001/10/03 03:40:44 mdb Exp $
+// $Id: PresentsDObjectMgr.java,v 1.17 2001/10/11 04:07:53 mdb Exp $
 
-package com.threerings.cocktail.cher.server;
+package com.threerings.presents.server;
 
 import java.lang.reflect.*;
 import java.util.HashMap;
@@ -9,28 +9,28 @@ import java.util.HashMap;
 import com.samskivert.util.HashIntMap;
 import com.samskivert.util.Queue;
 
-import com.threerings.cocktail.cher.Log;
-import com.threerings.cocktail.cher.dobj.*;
+import com.threerings.presents.Log;
+import com.threerings.presents.dobj.*;
 
 /**
- * The cher distributed object manager implements the
- * <code>DObjectManager</code> interface, providing an object manager that
- * runs on the server. By virtue of running on the server, it manages its
- * objects directly rather than managing proxies of objects which is what
- * is done on the client. Thus it simply queues up events and dispatches
- * them to subscribers.
+ * The presents distributed object manager implements the {@link
+ * DObjectManager} interface, providing an object manager that runs on the
+ * server. By virtue of running on the server, it manages its objects
+ * directly rather than managing proxies of objects which is what is done
+ * on the client. Thus it simply queues up events and dispatches them to
+ * subscribers.
  *
  * <p> The server object manager is meant to run on the main thread of the
  * server application and thus provides a method to be invoked by the
  * application main thread which won't return until the manager has been
  * requested to shut down.
  */
-public class CherDObjectMgr implements DObjectManager
+public class PresentsDObjectMgr implements DObjectManager
 {
     /**
      * Creates the dobjmgr and prepares it for operation.
      */
-    public CherDObjectMgr ()
+    public PresentsDObjectMgr ()
     {
         // we create a dummy object to live as oid zero and we'll use that
         // for some internal event trickery
@@ -474,7 +474,7 @@ public class CherDObjectMgr implements DObjectManager
 
                 // initialize this object
                 obj.setOid(oid);
-                obj.setManager(CherDObjectMgr.this);
+                obj.setManager(PresentsDObjectMgr.this);
                 // insert it into the table
                 _objects.put(oid, obj);
 
@@ -598,7 +598,7 @@ public class CherDObjectMgr implements DObjectManager
     protected static void registerEventHelpers ()
     {
         Class[] ptypes = new Class[] { DEvent.class, DObject.class };
-        Class omgrcl = CherDObjectMgr.class;
+        Class omgrcl = PresentsDObjectMgr.class;
         Method method;
 
         try {

src/java/com/threerings/presents/server/PresentsServer.java

@@ -1,32 +1,33 @@
 //
-// $Id: PresentsServer.java,v 1.13 2001/09/28 22:32:28 mdb Exp $
+// $Id: PresentsServer.java,v 1.14 2001/10/11 04:07:53 mdb Exp $
 
-package com.threerings.cocktail.cher.server;
+package com.threerings.presents.server;
 
 import com.samskivert.util.Config;
 
-import com.threerings.cocktail.cher.Log;
-import com.threerings.cocktail.cher.dobj.DObjectManager;
-import com.threerings.cocktail.cher.server.net.AuthManager;
-import com.threerings.cocktail.cher.server.net.ConnectionManager;
+import com.threerings.presents.Log;
+import com.threerings.presents.dobj.DObjectManager;
+import com.threerings.presents.server.net.AuthManager;
+import com.threerings.presents.server.net.ConnectionManager;
 
-import com.threerings.cocktail.cher.server.test.TestObject;
-import com.threerings.cocktail.cher.server.test.TestProvider;
-import com.threerings.cocktail.cher.client.test.TestService;
+import com.threerings.presents.server.test.TestObject;
+import com.threerings.presents.server.test.TestProvider;
+import com.threerings.presents.client.test.TestService;
 
 /**
- * The cher server provides a central point of access to the various
- * facilities that make up the cher framework. To facilitate extension and
- * customization, a single instance of the cher server should be created
- * and initialized in a process. To facilitate easy access to the services
- * provided by the cher server, static references to the various managers
- * are made available in the <code>CherServer</code> class. These will be
- * configured when the singleton instance is initialized.
+ * The presents server provides a central point of access to the various
+ * facilities that make up the presents framework. To facilitate extension
+ * and customization, a single instance of the presents server should be
+ * created and initialized in a process. To facilitate easy access to the
+ * services provided by the presents server, static references to the
+ * various managers are made available in the <code>PresentsServer</code>
+ * class. These will be configured when the singleton instance is
+ * initialized.
  */
-public class CherServer
+public class PresentsServer
 {
     /** The namespace used for server config properties. */
-    public static final String CONFIG_KEY = "cher";
+    public static final String CONFIG_KEY = "presents";
 
     /** The server configuration. */
     public static Config config;
@@ -41,7 +42,7 @@ public class CherServer
     public static ClientManager clmgr;
 
     /** The distributed object manager. */
-    public static CherDObjectMgr omgr;
+    public static PresentsDObjectMgr omgr;
 
     /** The invocation manager. */
     public static InvocationManager invmgr;
@@ -54,7 +55,7 @@ public class CherServer
     {
         // create our configuration object
         config = new Config();
-        // bind the cher server config into the namespace
+        // bind the presents server config into the namespace
         config.bindProperties(CONFIG_KEY, CONFIG_PATH, true);
 
         // create our authentication manager
@@ -64,7 +65,7 @@ public class CherServer
         // create our client manager
         clmgr = new ClientManager(conmgr);
         // create our distributed object manager
-        omgr = new CherDObjectMgr();
+        omgr = new PresentsDObjectMgr();
         // create our invocation manager
         invmgr = new InvocationManager(omgr);
 
@@ -147,9 +148,9 @@ public class CherServer
 
     public static void main (String[] args)
     {
-        Log.info("Cher server starting...");
+        Log.info("Presents server starting...");
 
-        CherServer server = new CherServer();
+        PresentsServer server = new PresentsServer();
         try {
             // initialize the server
             server.init();
@@ -182,7 +183,7 @@ public class CherServer
 
     // the path to the config file
     protected final static String CONFIG_PATH =
-        "rsrc/config/cocktail/cher/server";
+        "rsrc/config/presents/server";
 
     // the config key for our list of invocation provider mappings
     protected final static String PROVIDERS_KEY = CONFIG_KEY + ".providers";

src/java/com/threerings/presents/server/ServiceFailedException.java

@@ -1,7 +1,7 @@
 //
-// $Id: ServiceFailedException.java,v 1.1 2001/10/01 23:06:23 mdb Exp $
+// $Id: ServiceFailedException.java,v 1.2 2001/10/11 04:07:53 mdb Exp $
 
-package com.threerings.cocktail.cher.server;
+package com.threerings.presents.server;
 
 /**
  * An exception class for use in concert with invocation services when

src/java/com/threerings/presents/server/net/AuthManager.java

@@ -1,14 +1,14 @@
 //
-// $Id: AuthManager.java,v 1.4 2001/08/08 00:28:49 mdb Exp $
+// $Id: AuthManager.java,v 1.5 2001/10/11 04:07:53 mdb Exp $
 
-package com.threerings.cocktail.cher.server.net;
+package com.threerings.presents.server.net;
 
 import com.samskivert.util.LoopingThread;
 import com.samskivert.util.Queue;
 
-import com.threerings.cocktail.cher.Log;
-import com.threerings.cocktail.cher.net.AuthRequest;
-import com.threerings.cocktail.cher.net.AuthResponse;
+import com.threerings.presents.Log;
+import com.threerings.presents.net.AuthRequest;
+import com.threerings.presents.net.AuthResponse;
 
 /**
  * The authentication manager takes care of the authentication process.

src/java/com/threerings/presents/server/net/AuthingConnection.java

@@ -1,14 +1,14 @@
 //
-// $Id: AuthingConnection.java,v 1.3 2001/06/02 01:30:37 mdb Exp $
+// $Id: AuthingConnection.java,v 1.4 2001/10/11 04:07:53 mdb Exp $
 
-package com.threerings.cocktail.cher.server.net;
+package com.threerings.presents.server.net;
 
 import java.io.IOException;
 import ninja2.core.io_core.nbio.NonblockingSocket;
 
-import com.threerings.cocktail.cher.Log;
-import com.threerings.cocktail.cher.net.UpstreamMessage;
-import com.threerings.cocktail.cher.net.AuthRequest;
+import com.threerings.presents.Log;
+import com.threerings.presents.net.UpstreamMessage;
+import com.threerings.presents.net.AuthRequest;
 
 /**
  * The authing connection manages the client connection until

src/java/com/threerings/presents/server/net/Connection.java

@@ -1,16 +1,16 @@
 //
-// $Id: Connection.java,v 1.5 2001/08/03 03:09:58 mdb Exp $
+// $Id: Connection.java,v 1.6 2001/10/11 04:07:53 mdb Exp $
 
-package com.threerings.cocktail.cher.server.net;
+package com.threerings.presents.server.net;
 
 import java.io.*;
 import ninja2.core.io_core.nbio.*;
 
-import com.threerings.cocktail.cher.Log;
-import com.threerings.cocktail.cher.io.FramedInputStream;
-import com.threerings.cocktail.cher.io.TypedObjectFactory;
-import com.threerings.cocktail.cher.net.UpstreamMessage;
-import com.threerings.cocktail.cher.net.DownstreamMessage;
+import com.threerings.presents.Log;
+import com.threerings.presents.io.FramedInputStream;
+import com.threerings.presents.io.TypedObjectFactory;
+import com.threerings.presents.net.UpstreamMessage;
+import com.threerings.presents.net.DownstreamMessage;
 
 /**
  * The base connection class implements the net event handler interface

src/java/com/threerings/presents/server/net/ConnectionManager.java

@@ -1,7 +1,7 @@
 //
-// $Id: ConnectionManager.java,v 1.10 2001/10/09 18:27:25 mdb Exp $
+// $Id: ConnectionManager.java,v 1.11 2001/10/11 04:07:53 mdb Exp $
 
-package com.threerings.cocktail.cher.server.net;
+package com.threerings.presents.server.net;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -10,12 +10,12 @@ import java.util.ArrayList;
 import ninja2.core.io_core.nbio.*;
 import com.samskivert.util.*;
 
-import com.threerings.cocktail.cher.Log;
-import com.threerings.cocktail.cher.io.FramingOutputStream;
-import com.threerings.cocktail.cher.io.TypedObjectFactory;
-import com.threerings.cocktail.cher.net.Credentials;
-import com.threerings.cocktail.cher.net.DownstreamMessage;
-import com.threerings.cocktail.cher.server.CherServer;
+import com.threerings.presents.Log;
+import com.threerings.presents.io.FramingOutputStream;
+import com.threerings.presents.io.TypedObjectFactory;
+import com.threerings.presents.net.Credentials;
+import com.threerings.presents.net.DownstreamMessage;
+import com.threerings.presents.server.PresentsServer;
 
 /**
  * The connection manager manages the socket on which connections are
@@ -322,7 +322,7 @@ public class ConnectionManager extends LoopingThread
 
     /** The config key for our listening port. */
     protected static final String CM_PORT_KEY =
-        CherServer.CONFIG_KEY + ".conmgr_port";
+        PresentsServer.CONFIG_KEY + ".conmgr_port";
 
     /** The default port on which we listen for connections. */
     protected static final int DEFAULT_CM_PORT = 4007;

src/java/com/threerings/presents/server/net/ConnectionObserver.java

@@ -1,10 +1,10 @@
 //
-// $Id: ConnectionObserver.java,v 1.4 2001/06/02 01:30:37 mdb Exp $
+// $Id: ConnectionObserver.java,v 1.5 2001/10/11 04:07:53 mdb Exp $
 
-package com.threerings.cocktail.cher.server.net;
+package com.threerings.presents.server.net;
 
 import java.io.IOException;
-import com.threerings.cocktail.cher.net.Credentials;
+import com.threerings.presents.net.Credentials;
 
 /**
  * A connection observer can be registered with the connection manager to

src/java/com/threerings/presents/server/net/MessageHandler.java

@@ -1,9 +1,9 @@
 //
-// $Id: MessageHandler.java,v 1.1 2001/06/02 01:30:37 mdb Exp $
+// $Id: MessageHandler.java,v 1.2 2001/10/11 04:07:53 mdb Exp $
 
-package com.threerings.cocktail.cher.server.net;
+package com.threerings.presents.server.net;
 
-import com.threerings.cocktail.cher.net.UpstreamMessage;
+import com.threerings.presents.net.UpstreamMessage;
 
 /**
  * After the connection object has parsed an entire upstream message, it

src/java/com/threerings/presents/server/net/NetEventHandler.java

@@ -1,7 +1,7 @@
 //
-// $Id: NetEventHandler.java,v 1.2 2001/05/30 23:58:31 mdb Exp $
+// $Id: NetEventHandler.java,v 1.3 2001/10/11 04:07:53 mdb Exp $
 
-package com.threerings.cocktail.cher.server.net;
+package com.threerings.presents.server.net;
 
 import ninja2.core.io_core.nbio.Selectable;
 

src/java/com/threerings/presents/server/net/RunningConnection.java

@@ -1,11 +1,11 @@
 //
-// $Id: RunningConnection.java,v 1.4 2001/08/07 20:38:58 mdb Exp $
+// $Id: RunningConnection.java,v 1.5 2001/10/11 04:07:53 mdb Exp $
 
-package com.threerings.cocktail.cher.server.net;
+package com.threerings.presents.server.net;
 
 import java.io.IOException;
 import ninja2.core.io_core.nbio.NonblockingSocket;
-import com.threerings.cocktail.cher.net.UpstreamMessage;
+import com.threerings.presents.net.UpstreamMessage;
 
 /**
  * A running connection object represents a fully operational client