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/crowd/Log.java

@@ -1,16 +1,16 @@
 //
-// $Id: Log.java,v 1.1 2001/07/20 23:23:50 mdb Exp $
+// $Id: Log.java,v 1.2 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party;
+package com.threerings.crowd;
 
 /**
  * A placeholder class that contains a reference to the log object used by
- * the Party services.
+ * the Crowd services.
  */
 public class Log
 {
     public static com.samskivert.util.Log log =
-	new com.samskivert.util.Log("cocktail.party");
+	new com.samskivert.util.Log("crowd");
 
     /** Convenience function. */
     public static void debug (String message)

src/java/com/threerings/crowd/chat/ChatMessageHandler.java

@@ -1,15 +1,15 @@
 //
-// $Id: ChatMessageHandler.java,v 1.1 2001/08/03 02:14:41 mdb Exp $
+// $Id: ChatMessageHandler.java,v 1.2 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.chat;
+package com.threerings.crowd.chat;
 
-import com.threerings.cocktail.cher.dobj.MessageEvent;
+import com.threerings.presents.dobj.MessageEvent;
 
-import com.threerings.cocktail.party.Log;
-import com.threerings.cocktail.party.data.BodyObject;
-import com.threerings.cocktail.party.data.PlaceObject;
-import com.threerings.cocktail.party.server.PartyServer;
-import com.threerings.cocktail.party.server.PlaceManager;
+import com.threerings.crowd.Log;
+import com.threerings.crowd.data.BodyObject;
+import com.threerings.crowd.data.PlaceObject;
+import com.threerings.crowd.server.CrowdServer;
+import com.threerings.crowd.server.PlaceManager;
 
 /**
  * The chat message handler handles chat messages that are issued on a
@@ -23,7 +23,7 @@ public class ChatMessageHandler implements PlaceManager.MessageHandler
         // generate a chat notification with the message and name of the
         // speaker
         int soid = event.getSourceOid();
-        BodyObject source = (BodyObject)PartyServer.omgr.getObject(soid);
+        BodyObject source = (BodyObject)CrowdServer.omgr.getObject(soid);
         if (source == null) {
             Log.info("Chatter went away. Dropping chat request " +
                      "[req=" + event + "].");
@@ -39,6 +39,6 @@ public class ChatMessageHandler implements PlaceManager.MessageHandler
         Object[] outargs = new Object[] { source.username, message };
         MessageEvent nevt = new MessageEvent(
             target.getOid(), ChatService.SPEAK_NOTIFICATION, outargs);
-        PartyServer.omgr.postEvent(nevt);
+        CrowdServer.omgr.postEvent(nevt);
     }
 }

src/java/com/threerings/crowd/chat/client/ChatDirector.java

@@ -1,17 +1,17 @@
 //
-// $Id: ChatDirector.java,v 1.9 2001/10/11 03:10:55 mdb Exp $
+// $Id: ChatDirector.java,v 1.10 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.chat;
+package com.threerings.crowd.chat;
 
 import java.util.ArrayList;
 
-import com.threerings.cocktail.cher.client.*;
-import com.threerings.cocktail.cher.dobj.*;
+import com.threerings.presents.client.*;
+import com.threerings.presents.dobj.*;
 
-import com.threerings.cocktail.party.Log;
-import com.threerings.cocktail.party.client.LocationObserver;
-import com.threerings.cocktail.party.data.PlaceObject;
-import com.threerings.cocktail.party.util.PartyContext;
+import com.threerings.crowd.Log;
+import com.threerings.crowd.client.LocationObserver;
+import com.threerings.crowd.data.PlaceObject;
+import com.threerings.crowd.util.CrowdContext;
 
 /**
  * The chat director is the client side coordinator of all chat related
@@ -27,7 +27,7 @@ public class ChatDirector
      * observer so that it can automatically process place constrained
      * chat.
      */
-    public ChatDirector (PartyContext ctx)
+    public ChatDirector (CrowdContext ctx)
     {
         // keep the context around
         _ctx = ctx;
@@ -214,7 +214,7 @@ public class ChatDirector
         }
     }
 
-    protected PartyContext _ctx;
+    protected CrowdContext _ctx;
     protected PlaceObject _place;
 
     protected ArrayList _displays = new ArrayList();

src/java/com/threerings/crowd/chat/client/ChatDisplay.java

@@ -1,7 +1,7 @@
 //
-// $Id: ChatDisplay.java,v 1.2 2001/10/01 22:14:55 mdb Exp $
+// $Id: ChatDisplay.java,v 1.3 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.chat;
+package com.threerings.crowd.chat;
 
 /**
  * A chat display provides a means by which chat messages can be

src/java/com/threerings/crowd/chat/client/ChatService.java

@@ -1,11 +1,11 @@
 //
-// $Id: ChatService.java,v 1.5 2001/10/02 02:07:50 mdb Exp $
+// $Id: ChatService.java,v 1.6 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.chat;
+package com.threerings.crowd.chat;
 
-import com.threerings.cocktail.cher.client.Client;
-import com.threerings.cocktail.cher.client.InvocationDirector;
-import com.threerings.cocktail.party.Log;
+import com.threerings.presents.client.Client;
+import com.threerings.presents.client.InvocationDirector;
+import com.threerings.crowd.Log;
 
 /**
  * The chat services provide a mechanism by which the client can broadcast

src/java/com/threerings/crowd/chat/data/ChatCodes.java

@@ -1,9 +1,9 @@
 //
-// $Id: ChatCodes.java,v 1.1 2001/10/01 22:14:55 mdb Exp $
+// $Id: ChatCodes.java,v 1.2 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.chat;
+package com.threerings.crowd.chat;
 
-import com.threerings.cocktail.cher.client.InvocationCodes;
+import com.threerings.presents.client.InvocationCodes;
 
 /**
  * Contains codes used by the chat invocation services.

src/java/com/threerings/crowd/chat/server/ChatProvider.java

@@ -1,11 +1,11 @@
 //
-// $Id: ChatProvider.java,v 1.4 2001/10/01 22:14:55 mdb Exp $
+// $Id: ChatProvider.java,v 1.5 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.chat;
+package com.threerings.crowd.chat;
 
-import com.threerings.cocktail.cher.server.InvocationProvider;
-import com.threerings.cocktail.party.data.BodyObject;
-import com.threerings.cocktail.party.server.PartyServer;
+import com.threerings.presents.server.InvocationProvider;
+import com.threerings.crowd.data.BodyObject;
+import com.threerings.crowd.server.CrowdServer;
 
 /**
  * The chat provider handles the server side of the chat-related
@@ -22,7 +22,7 @@ public class ChatProvider
         BodyObject source, int invid, String target, String message)
     {
         // look up the target body object
-        BodyObject tobj = PartyServer.lookupBody(target);
+        BodyObject tobj = CrowdServer.lookupBody(target);
         if (tobj == null) {
             sendResponse(source, invid, TELL_FAILED_RESPONSE,
                          USER_NOT_ONLINE);
@@ -30,7 +30,7 @@ public class ChatProvider
 
         // deliver a tell notification to the target player
         Object[] args = new Object[] { source.username, message };
-        PartyServer.invmgr.sendNotification(
+        CrowdServer.invmgr.sendNotification(
             tobj.getOid(), MODULE_NAME, TELL_NOTIFICATION, args);
 
         sendResponse(source, invid, TELL_SUCCEEDED_RESPONSE);

src/java/com/threerings/crowd/client/LocationAdapter.java

@@ -1,9 +1,9 @@
 //
-// $Id: LocationAdapter.java,v 1.1 2001/08/22 00:08:12 mdb Exp $
+// $Id: LocationAdapter.java,v 1.2 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.client;
+package com.threerings.crowd.client;
 
-import com.threerings.cocktail.party.data.PlaceObject;
+import com.threerings.crowd.data.PlaceObject;
 
 /**
  * The location adapter makes life easier for a class that really only

src/java/com/threerings/crowd/client/LocationCodes.java

@@ -1,9 +1,9 @@
 //
-// $Id: LocationCodes.java,v 1.1 2001/10/01 22:14:55 mdb Exp $
+// $Id: LocationCodes.java,v 1.2 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.client;
+package com.threerings.crowd.client;
 
-import com.threerings.cocktail.cher.client.InvocationCodes;
+import com.threerings.presents.client.InvocationCodes;
 
 /**
  * Contains codes used by the location invocation services.

src/java/com/threerings/crowd/client/LocationDirector.java

@@ -1,17 +1,17 @@
 //
-// $Id: LocationDirector.java,v 1.10 2001/10/05 23:57:26 mdb Exp $
+// $Id: LocationDirector.java,v 1.11 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.client;
+package com.threerings.crowd.client;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.threerings.cocktail.cher.client.*;
-import com.threerings.cocktail.cher.dobj.*;
+import com.threerings.presents.client.*;
+import com.threerings.presents.dobj.*;
 
-import com.threerings.cocktail.party.Log;
-import com.threerings.cocktail.party.data.*;
-import com.threerings.cocktail.party.util.PartyContext;
+import com.threerings.crowd.Log;
+import com.threerings.crowd.data.*;
+import com.threerings.crowd.util.CrowdContext;
 
 /**
  * The location director provides a means by which entities on the client
@@ -23,7 +23,7 @@ import com.threerings.cocktail.party.util.PartyContext;
 public class LocationDirector
     implements ClientObserver, Subscriber
 {
-    public LocationDirector (PartyContext ctx)
+    public LocationDirector (CrowdContext ctx)
     {
         // keep this around for later
         _ctx = ctx;
@@ -341,7 +341,7 @@ public class LocationDirector
     }
 
     /** The context through which we access needed services. */
-    protected PartyContext _ctx;
+    protected CrowdContext _ctx;
 
     /** Our location observer list. */
     protected List _observers = new ArrayList();

src/java/com/threerings/crowd/client/LocationObserver.java

@@ -1,9 +1,9 @@
 //
-// $Id: LocationObserver.java,v 1.3 2001/08/02 04:59:54 mdb Exp $
+// $Id: LocationObserver.java,v 1.4 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.client;
+package com.threerings.crowd.client;
 
-import com.threerings.cocktail.party.data.PlaceObject;
+import com.threerings.crowd.data.PlaceObject;
 
 /**
  * The location observer interface makes it possible for entities to be

src/java/com/threerings/crowd/client/LocationService.java

@@ -1,11 +1,11 @@
 //
-// $Id: LocationService.java,v 1.3 2001/10/02 02:07:50 mdb Exp $
+// $Id: LocationService.java,v 1.4 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.client;
+package com.threerings.crowd.client;
 
-import com.threerings.cocktail.cher.client.Client;
-import com.threerings.cocktail.cher.client.InvocationDirector;
-import com.threerings.cocktail.party.Log;
+import com.threerings.presents.client.Client;
+import com.threerings.presents.client.InvocationDirector;
+import com.threerings.crowd.Log;
 
 /**
  * The location services provide a mechanism by which the client can

src/java/com/threerings/crowd/client/OccupantManager.java

@@ -1,18 +1,18 @@
 //
-// $Id: OccupantManager.java,v 1.5 2001/10/02 02:07:50 mdb Exp $
+// $Id: OccupantManager.java,v 1.6 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.client;
+package com.threerings.crowd.client;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 
 import com.samskivert.util.HashIntMap;
-import com.threerings.cocktail.cher.dobj.*;
+import com.threerings.presents.dobj.*;
 
-import com.threerings.cocktail.party.Log;
-import com.threerings.cocktail.party.data.OccupantInfo;
-import com.threerings.cocktail.party.data.PlaceObject;
-import com.threerings.cocktail.party.util.PartyContext;
+import com.threerings.crowd.Log;
+import com.threerings.crowd.data.OccupantInfo;
+import com.threerings.crowd.data.PlaceObject;
+import com.threerings.crowd.util.CrowdContext;
 
 /**
  * The occupant manager listens for occupants of places to enter and exit,
@@ -41,7 +41,7 @@ public class OccupantManager
     /**
      * Constructs a new occupant manager with the supplied context.
      */
-    public OccupantManager (PartyContext ctx)
+    public OccupantManager (CrowdContext ctx)
     {
         // register ourselves as a location observer
         ctx.getLocationDirector().addLocationObserver(this);

src/java/com/threerings/crowd/client/OccupantObserver.java

@@ -1,9 +1,9 @@
 //
-// $Id: OccupantObserver.java,v 1.1 2001/08/20 20:54:56 mdb Exp $
+// $Id: OccupantObserver.java,v 1.2 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.client;
+package com.threerings.crowd.client;
 
-import com.threerings.cocktail.party.data.OccupantInfo;
+import com.threerings.crowd.data.OccupantInfo;
 
 /**
  * An entity that is interested in hearing about bodies that enter and

src/java/com/threerings/crowd/client/PlaceController.java

@@ -1,14 +1,14 @@
 //
-// $Id: PlaceController.java,v 1.3 2001/10/09 17:20:03 mdb Exp $
+// $Id: PlaceController.java,v 1.4 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.client;
+package com.threerings.crowd.client;
 
 import java.awt.event.ActionEvent;
 import com.samskivert.swing.Controller;
 
-import com.threerings.cocktail.party.data.PlaceConfig;
-import com.threerings.cocktail.party.data.PlaceObject;
-import com.threerings.cocktail.party.util.PartyContext;
+import com.threerings.crowd.data.PlaceConfig;
+import com.threerings.crowd.data.PlaceObject;
+import com.threerings.crowd.util.CrowdContext;
 
 /**
  * Controls the user interface that is used to display a place. When the
@@ -32,7 +32,7 @@ public abstract class PlaceController
      * @param ctx the client context.
      * @param config the place configuration for this place.
      */
-    public void init (PartyContext ctx, PlaceConfig config)
+    public void init (CrowdContext ctx, PlaceConfig config)
     {
         // keep these around
         _ctx = ctx;
@@ -92,7 +92,7 @@ public abstract class PlaceController
     }
 
     /** A reference to the active client context. */
-    protected PartyContext _ctx;
+    protected CrowdContext _ctx;
 
     /** A reference to our place configuration. */
     protected PlaceConfig _config;

src/java/com/threerings/crowd/client/PlaceView.java

@@ -1,9 +1,9 @@
 //
-// $Id: PlaceView.java,v 1.4 2001/10/06 00:24:46 mdb Exp $
+// $Id: PlaceView.java,v 1.5 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.client;
+package com.threerings.crowd.client;
 
-import com.threerings.cocktail.party.data.PlaceObject;
+import com.threerings.crowd.data.PlaceObject;
 
 /**
  * This interface provides a convenient means for decoupling user
@@ -35,7 +35,7 @@ import com.threerings.cocktail.party.data.PlaceObject;
  * of place entering and exiting by virtue of the single dispatching
  * calls. It is useful to note that place-sensitive user interface
  * elements will also generally need a reference to the {@link
- * com.threerings.cocktail.party.util.PartyContext} derivative in use by
+ * com.threerings.crowd.util.CrowdContext} derivative in use by
  * the client, but those are best supplied at construct time.
  */
 public interface PlaceView

src/java/com/threerings/crowd/client/PlaceViewUtil.java

@@ -1,12 +1,12 @@
 //
-// $Id: PlaceViewUtil.java,v 1.2 2001/10/05 23:57:26 mdb Exp $
+// $Id: PlaceViewUtil.java,v 1.3 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.client;
+package com.threerings.crowd.client;
 
 import java.awt.Container;
 
-import com.threerings.cocktail.party.Log;
-import com.threerings.cocktail.party.data.PlaceObject;
+import com.threerings.crowd.Log;
+import com.threerings.crowd.data.PlaceObject;
 
 /**
  * Provides a mechanism for dispatching notifications to all user

src/java/com/threerings/crowd/data/BodyObject.dobj

@@ -1,9 +1,9 @@
 //
-// $Id: BodyObject.dobj,v 1.4 2001/08/21 19:37:21 mdb Exp $
+// $Id: BodyObject.dobj,v 1.5 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.data;
+package com.threerings.crowd.data;
 
-import com.threerings.cocktail.cher.data.ClientObject;
+import com.threerings.presents.data.ClientObject;
 
 public class BodyObject extends ClientObject
 {

src/java/com/threerings/crowd/data/OccupantInfo.java

@@ -1,25 +1,25 @@
 //
-// $Id: OccupantInfo.java,v 1.2 2001/08/20 20:54:57 mdb Exp $
+// $Id: OccupantInfo.java,v 1.3 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.data;
+package com.threerings.crowd.data;
 
 import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 
-import com.threerings.cocktail.cher.dobj.DSet;
+import com.threerings.presents.dobj.DSet;
 
 /**
  * The occupant info object contains all of the information about an
  * occupant of a place that should be shared with other occupants of the
  * place. These objects are stored in the place object itself and are
  * updated when bodies enter and exit a place. A system that builds upon
- * the Party framework can extend this class to include extra information
+ * the Crowd framework can extend this class to include extra information
  * about their occupants. They will need to be sure to return the proper
  * class from {@link
- * com.threerings.cocktail.party.server.PlaceManager#getOccupantInfoClass}
+ * com.threerings.crowd.server.PlaceManager#getOccupantInfoClass}
  * and populate their occupant info in {@link
- * com.threerings.cocktail.party.server.PlaceManager#populateOccupantInfo}.
+ * com.threerings.crowd.server.PlaceManager#populateOccupantInfo}.
  */
 public class OccupantInfo implements DSet.Element
 {

src/java/com/threerings/crowd/data/PlaceConfig.java

@@ -1,13 +1,13 @@
 //
-// $Id: PlaceConfig.java,v 1.1 2001/10/05 23:57:26 mdb Exp $
+// $Id: PlaceConfig.java,v 1.2 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.data;
+package com.threerings.crowd.data;
 
 import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 
-import com.threerings.cocktail.cher.io.Streamable;
+import com.threerings.presents.io.Streamable;
 
 /**
  * The place config class encapsulates the configuration information for a
@@ -36,14 +36,14 @@ public abstract class PlaceConfig implements Streamable
     /**
      * Returns the class that should be used to create a controller for
      * this place. The controller class must derive from {@link
-     * com.threerings.cocktail.party.client.PlaceController}.
+     * com.threerings.crowd.client.PlaceController}.
      */
     public abstract Class getControllerClass ();
 
     /**
      * Returns the name of the class that should be used to create a
      * manager for this place. The manager class must derive from {@link
-     * com.threerings.cocktail.party.server.PlaceManager}. <em>Note:</em>
+     * com.threerings.crowd.server.PlaceManager}. <em>Note:</em>
      * this method differs from {@link #getControllerClass} because we
      * want to avoid compile time linkage of the place config object
      * (which is used on the client) to server code. This allows a code

src/java/com/threerings/crowd/data/PlaceObject.dobj

@@ -1,9 +1,9 @@
 //
-// $Id: PlaceObject.dobj,v 1.5 2001/08/16 04:28:36 mdb Exp $
+// $Id: PlaceObject.dobj,v 1.6 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.data;
+package com.threerings.crowd.data;
 
-import com.threerings.cocktail.cher.dobj.*;
+import com.threerings.presents.dobj.*;
 
 public class PlaceObject extends DObject
 {

src/java/com/threerings/crowd/server/CrowdClient.java

@@ -1,16 +1,16 @@
 //
-// $Id: CrowdClient.java,v 1.2 2001/08/04 01:55:41 mdb Exp $
+// $Id: CrowdClient.java,v 1.3 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.server;
+package com.threerings.crowd.server;
 
-import com.threerings.cocktail.cher.server.CherClient;
-import com.threerings.cocktail.party.data.BodyObject;
+import com.threerings.presents.server.PresentsClient;
+import com.threerings.crowd.data.BodyObject;
 
 /**
- * The party client extends the cher client and does some initializations
- * necessary for the party services.
+ * The crowd client extends the presents client and does some
+ * initializations necessary for the crowd services.
  */
-public class PartyClient extends CherClient
+public class CrowdClient extends PresentsClient
 {
     protected void sessionWillStart ()
     {
@@ -23,7 +23,7 @@ public class PartyClient extends CherClient
         _bodobj.setUsername(_username);
 
         // register our body object mapping
-        PartyServer.mapBody(_username, _bodobj);
+        CrowdServer.mapBody(_username, _bodobj);
     }
 
     protected void sessionWillResume ()
@@ -38,7 +38,7 @@ public class PartyClient extends CherClient
         super.sessionDidTerminate();
 
         // unregister our body object mapping
-        PartyServer.unmapBody(_username);
+        CrowdServer.unmapBody(_username);
     }
 
     protected BodyObject _bodobj;

src/java/com/threerings/crowd/server/CrowdServer.java

@@ -1,23 +1,23 @@
 //
-// $Id: CrowdServer.java,v 1.7 2001/09/28 22:32:28 mdb Exp $
+// $Id: CrowdServer.java,v 1.8 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.server;
+package com.threerings.crowd.server;
 
 import java.util.HashMap;
 
-import com.threerings.cocktail.cher.server.CherServer;
+import com.threerings.presents.server.PresentsServer;
 
-import com.threerings.cocktail.party.Log;
-import com.threerings.cocktail.party.data.BodyObject;
+import com.threerings.crowd.Log;
+import com.threerings.crowd.data.BodyObject;
 
 /**
- * The party server extends the cher server by configuring it to use the
- * extensions provided by the party layer to support party services.
+ * The crowd server extends the presents server by configuring it to use the
+ * extensions provided by the crowd layer to support crowd services.
  */
-public class PartyServer extends CherServer
+public class CrowdServer extends PresentsServer
 {
     /** The namespace used for server config properties. */
-    public static final String CONFIG_KEY = "party";
+    public static final String CONFIG_KEY = "crowd";
 
     /** The place registry. */
     public static PlaceRegistry plreg;
@@ -28,14 +28,14 @@ public class PartyServer extends CherServer
     public void init ()
         throws Exception
     {
-        // do the cher server initialization
+        // do the presents server initialization
         super.init();
 
-        // bind the party server config into the namespace
+        // bind the crowd server config into the namespace
         config.bindProperties(CONFIG_KEY, CONFIG_PATH, true);
 
-        // configure the client to use our party client
-        clmgr.setClientClass(PartyClient.class);
+        // configure the client to use our crowd client
+        clmgr.setClientClass(CrowdClient.class);
 
         // configure the client to use the body object
         clmgr.setClientObjectClass(BodyObject.class);
@@ -46,11 +46,11 @@ public class PartyServer extends CherServer
         // register our invocation service providers
         registerProviders(config.getValue(PROVIDERS_KEY, (String[])null));
 
-        Log.info("Party server initialized.");
+        Log.info("Crowd server initialized.");
     }
 
     /**
-     * The party server maintains a mapping of username to body object for
+     * The crowd server maintains a mapping of username to body object for
      * all active users on the server. This should only be called from the
      * dobjmgr thread.
      */
@@ -60,7 +60,7 @@ public class PartyServer extends CherServer
     }
 
     /**
-     * Called by the party client to map a username to a particular body
+     * Called by the crowd client to map a username to a particular body
      * object. This should only be called from the dobjmgr thread.
      */
     protected static void mapBody (String username, BodyObject bodobj)
@@ -69,7 +69,7 @@ public class PartyServer extends CherServer
     }
 
     /**
-     * Called by the party client to unmap a username from a particular
+     * Called by the crowd client to unmap a username from a particular
      * body object. This should only be called from the dobjmgr thread.
      */
     protected static void unmapBody (String username)
@@ -79,7 +79,7 @@ public class PartyServer extends CherServer
 
     public static void main (String[] args)
     {
-        PartyServer server = new PartyServer();
+        CrowdServer server = new CrowdServer();
         try {
             server.init();
             server.run();
@@ -94,7 +94,7 @@ public class PartyServer extends CherServer
 
     // the path to the config file
     protected final static String CONFIG_PATH =
-        "rsrc/config/cocktail/party/server";
+        "rsrc/config/crowd/server";
 
     // the config key for our list of invocation provider mappings
     protected final static String PROVIDERS_KEY = CONFIG_KEY + ".providers";

src/java/com/threerings/crowd/server/LocationProvider.java

@@ -1,16 +1,16 @@
 //
-// $Id: LocationProvider.java,v 1.9 2001/10/05 23:57:26 mdb Exp $
+// $Id: LocationProvider.java,v 1.10 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.server;
+package com.threerings.crowd.server;
 
-import com.threerings.cocktail.cher.dobj.DObject;
-import com.threerings.cocktail.cher.server.InvocationProvider;
-import com.threerings.cocktail.cher.server.ServiceFailedException;
+import com.threerings.presents.dobj.DObject;
+import com.threerings.presents.server.InvocationProvider;
+import com.threerings.presents.server.ServiceFailedException;
 
-import com.threerings.cocktail.party.Log;
-import com.threerings.cocktail.party.client.LocationCodes;
-import com.threerings.cocktail.party.data.*;
-import com.threerings.cocktail.party.server.PartyServer;
+import com.threerings.crowd.Log;
+import com.threerings.crowd.client.LocationCodes;
+import com.threerings.crowd.data.*;
+import com.threerings.crowd.server.CrowdServer;
 
 /**
  * This class provides the server end of the location services.
@@ -52,7 +52,7 @@ public class LocationProvider
         int bodoid = source.getOid();
 
         // make sure the place in question actually exists
-        PlaceManager pmgr = PartyServer.plreg.getPlaceManager(placeId);
+        PlaceManager pmgr = CrowdServer.plreg.getPlaceManager(placeId);
         if (pmgr == null) {
             Log.info("Requested to move to non-existent place " +
                      "[source=" + source + ", place=" + placeId + "].");
@@ -78,7 +78,7 @@ public class LocationProvider
             // remove them from the occupant list of the previous location
             try {
                 PlaceObject pold = (PlaceObject)
-                    PartyServer.omgr.getObject(source.location);
+                    CrowdServer.omgr.getObject(source.location);
                 if (pold != null) {
                     Object key = new Integer(bodoid);
                     // remove their occupant info (which is keyed on oid)

src/java/com/threerings/crowd/server/PlaceManager.java

@@ -1,15 +1,15 @@
 //
-// $Id: PlaceManager.java,v 1.16 2001/10/09 18:41:01 mdb Exp $
+// $Id: PlaceManager.java,v 1.17 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.server;
+package com.threerings.crowd.server;
 
 import java.util.HashMap;
 import java.util.Properties;
 
-import com.threerings.cocktail.cher.dobj.*;
+import com.threerings.presents.dobj.*;
 
-import com.threerings.cocktail.party.Log;
-import com.threerings.cocktail.party.data.*;
+import com.threerings.crowd.Log;
+import com.threerings.crowd.data.*;
 
 /**
  * The place manager is the server-side entity that handles all
@@ -18,7 +18,7 @@ import com.threerings.cocktail.party.data.*;
  * places) should live in the place manager. An intelligently constructed
  * hierarchy of place manager classes working in concert with invocation
  * services should provide the majority of the server-side functionality
- * of an application built on the Cocktail platform.
+ * of an application built on the Presents platform.
  *
  * <p> The base place manager class takes care of the necessary
  * interactions with the place registry to manage place registration. It

src/java/com/threerings/crowd/server/PlaceRegistry.java

@@ -1,7 +1,7 @@
 //
-// $Id: PlaceRegistry.java,v 1.10 2001/10/05 23:57:26 mdb Exp $
+// $Id: PlaceRegistry.java,v 1.11 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.server;
+package com.threerings.crowd.server;
 
 import java.util.Iterator;
 
@@ -9,11 +9,11 @@ import com.samskivert.util.Config;
 import com.samskivert.util.HashIntMap;
 import com.samskivert.util.Queue;
 
-import com.threerings.cocktail.cher.dobj.*;
+import com.threerings.presents.dobj.*;
 
-import com.threerings.cocktail.party.Log;
-import com.threerings.cocktail.party.data.PlaceConfig;
-import com.threerings.cocktail.party.data.PlaceObject;
+import com.threerings.crowd.Log;
+import com.threerings.crowd.data.PlaceConfig;
+import com.threerings.crowd.data.PlaceObject;
 
 /**
  * The place registry keeps track of all of the active places in the
@@ -65,7 +65,7 @@ public class PlaceRegistry implements Subscriber
             _createq.append(pmgr);
 
             // and request to create the place object
-            PartyServer.omgr.createObject(
+            CrowdServer.omgr.createObject(
                 pmgr.getPlaceObjectClass(), this, false);
 
             return pmgr;

src/java/com/threerings/crowd/util/CrowdContext.java

@@ -1,18 +1,18 @@
 //
-// $Id: CrowdContext.java,v 1.5 2001/10/09 17:20:03 mdb Exp $
+// $Id: CrowdContext.java,v 1.6 2001/10/11 04:07:51 mdb Exp $
 
-package com.threerings.cocktail.party.util;
+package com.threerings.crowd.util;
 
-import com.threerings.cocktail.cher.util.CherContext;
-import com.threerings.cocktail.party.client.LocationDirector;
-import com.threerings.cocktail.party.client.OccupantManager;
-import com.threerings.cocktail.party.client.PlaceView;
+import com.threerings.presents.util.PresentsContext;
+import com.threerings.crowd.client.LocationDirector;
+import com.threerings.crowd.client.OccupantManager;
+import com.threerings.crowd.client.PlaceView;
 
 /**
- * The party context provides access to the various managers, etc. that
- * are needed by the party client code.
+ * The crowd context provides access to the various managers, etc. that
+ * are needed by the crowd client code.
  */
-public interface PartyContext extends CherContext
+public interface CrowdContext extends PresentsContext
 {
     /**
      * Returns a reference to the location director.