diff --git a/docs/crowd/design.txt b/docs/crowd/design.txt index 1bb9a5ddc..8d387045d 100644 --- a/docs/crowd/design.txt +++ b/docs/crowd/design.txt @@ -1,10 +1,10 @@ -Cocktail: Party Design -*- outline -*- +Crowd Design -*- outline -*- * Introduction -The Party layer builds upon the Cher layer through the addition of a few -key services. These services are based around the concept of bodies and -places. A client of the system is represented by a body and that body can -occupy a place. Bodies can communicate with one another through two +The Crowd layer builds upon the Presents layer through the addition of a +few key services. These services are based around the concept of bodies +and places. A client of the system is represented by a body and that body +can occupy a place. Bodies can communicate with one another through two mechanisms: they can speak which broadcasts their message to all other bodies that occupy the same place, or they can tell which delivers their message specifically to one target body regardless of place. @@ -16,11 +16,11 @@ to specialize the place concept and extend it with functionality specific to their needs. * Components -Wherein the individual classes and components that make up the Party +Wherein the individual classes and components that make up the Crowd framework are described. ** BodyObject -The body object extends the client object from the Cher framework and +The body object extends the client object from the Presents framework and tracks information like the current place occupied by the body. ** PlaceObject, PlaceManager diff --git a/docs/crowd/notes.txt b/docs/crowd/notes.txt index 5c10c7093..9ca8d0ce7 100644 --- a/docs/crowd/notes.txt +++ b/docs/crowd/notes.txt @@ -1,4 +1,4 @@ -Party Notes -*- outline -*- +Crowd Notes -*- outline -*- * TODO Wire up PlaceRegistry code to remove registrations when place objects are diff --git a/docs/design.txt b/docs/design.txt index a9fac90f3..abbc195ae 100644 --- a/docs/design.txt +++ b/docs/design.txt @@ -1,12 +1,19 @@ -Cocktail -*- outline -*- +Narya -*- outline -*- * What is it? -Cocktail is a platform on which multiplayer networked games may be -developed. The platform is (extremely) loosely based around the idea of a -cocktail party. For the most part, this just gives us a useful context -from which to choose names. The basic service of the Cocktail platform is -a simple information sharing mechanism based on the concept of distributed -objects. This layer is called "Cher" for reasons outlined in the Cher +Narya is a platform on which multiplayer networked games may be developed. +The various packages that comprise Narya attempt to be as loosely +connected as possible so that they may be used individually without having +to buy into our entire system. In some cases, packages depend wholesale on +other packages but that is generally only when the depending package +extends or makes serious use of the depended package (the networking layer +is used by the group management layer which is in turn used by the parlor +game layer). + +** You brought presents? +One basic service of the Narya platform is a simple information sharing +mechanism based on the concept of distributed objects. This layer is +called Presents for reasons explained and apologized for in the Presents design notes. A distributed object has a set of subscribers. Whenever a modification is @@ -27,15 +34,14 @@ view, controller pattern as well as into other useful patterns. The primary value of the design is to bring the level of abstraction up from network connections and packets, to objects and events. -** Getting the party started -Atop the distributed object layer, we further develop the concept of the -cocktail party. Parties tend to take place in rooms and be attended by -groups of people. This is the essence of the next layer of the system: a -framework for providing rooms, with occupants and mechanisms for the -people to move between those rooms. Within the rooms, we provide some -useful basic services like the ability to chat among the occupants of the -room, as well as some non-room-specific facilities like person to person -messaging from anywhere in the system and a location directory. +** Three's a crowd +Atop the Presents package, we've built the Crowd package: a framework for +providing rooms (called places), with occupants (also called bodies) and +mechanisms for the people to move between those rooms. Within the rooms, +we provide some useful basic services like the ability to chat among the +occupants of the room, as well as some non-room-specific facilities like +person to person messaging from anywhere in the system and a location +directory. Not all games developed with the platform will want to use the room concept, therefore we attempt at this layer and in all subsequent layers @@ -45,11 +51,31 @@ leverage some of the useful services without having to bend their design in uncomfortable ways or hack up some additional interface to the services we provide. -** Let's play -From here, we branch off into all sorts of interesting directions based on -the different kinds of games that are implemented with the system. We -provide matchmaking lobbies, an extension of the room concept to the game -room, on top of which is provided a framework for managing generic -turn-based games, and various other useful services. Again the philosophy -is to provide consistently designed, but decoupled services that can be -used within and along side whatever design works best for your game. +** Come into my parlor +The Parlor services branch off into all sorts of interesting directions +based on the different kinds of games that are implemented with the +system. We provide matchmaking lobbies, an extension of the room concept +to the game room, on top of which is provided a framework for managing +generic turn-based games, and various other useful services. Again the +philosophy is to provide consistently designed, but decoupled services +that can be used within and along side whatever design works best for your +game. + +** Visualized whirled peas +The Whirled services provide support for building online world games that +are composed of myriad scenes between which the user can navigate. It +provides a simple extensible framework for defining your scenes and +dynamically loading them into the server when a user traverses into them. + +** Miso +A tile-based isometric rendering engine. + +** Media +Various image and sound related services. + +** Resource +Services for distributing bundles of resources to clients and making sure +they are up to date. + +** Nodemap +Services for displaying maps made up of connected nodes. diff --git a/docs/parlor/design.txt b/docs/parlor/design.txt index 4b7f8557f..ee5c6f77c 100644 --- a/docs/parlor/design.txt +++ b/docs/parlor/design.txt @@ -6,11 +6,11 @@ implementation of simple networked games. These may be turn based, puzzle, party, or other types of games that involve one or more players acting out a fairly uncomplicated game mechanic. -It builds upon the Cocktail package also provided by the platform. The -Cocktail package is used to provide a basic network environment where -clients can share information with the server and with one another. It -allows the Parlor services to largely concentrate on requirements specific -to implementing simple online games. +It builds upon the Presents and Crowd packages also provided by the Narya +platform. These packages are used to provide a basic network environment +where clients can share information with the server and with one +another. It allows the Parlor services to largely concentrate on +requirements specific to implementing simple online games. The services provided are divided into the following components: @@ -40,7 +40,7 @@ This component aims to provide the following services: ** Game state management Once the game has begun, a means is needed to share the public game state with the players of the game and to communicate private game state if and -when necessary. This component uses the Cocktail distributed object +when necessary. This component uses the Presents distributed object services to share information among the players and provide channels of communication between the game manager and the players. diff --git a/docs/presents/design.txt b/docs/presents/design.txt index 4ee1dc1e4..e000694aa 100644 --- a/docs/presents/design.txt +++ b/docs/presents/design.txt @@ -1,17 +1,17 @@ -Cher Design -*- outline -*- +Presents Design -*- outline -*- -* Why Cher? -The basic function of this layer is to allow the sharing (Cher-ing) of -information among different nodes in the network. Plus, I don't think Cher -has ever had a software system named after her and it's high time. Imagine -Cher as the social lubricant that allows the party goers to communicate. +* Why Presents? +The basic function of this layer is to provide a network presence (as you +can see, we love to pun; don't complain, this package used to be called +Cher) and to allow the sharing of information among different nodes in the +network. * Overview -The Cher layer implements the distributed object services described in the -Cocktail design document. It does this within the context of an extensible -client/server application framework. Cher provides services that can be -integrated into your distributed application to share information between -a set of clients and entities operating on the server. +The Presents layer implements the distributed object services described in +the Narya design document. It does this within the context of an +extensible client/server application framework. Presents provides services +that can be integrated into your distributed application to share +information between a set of clients and entities operating on the server. * Authentication and bootstrapping The client initially transmits an authentication request to the server and @@ -121,15 +121,15 @@ This function will simply wrap up the arguments and pass them to the invocation manager for delivery to the appropriate client. * Server configuration -The Cher server binds a properties file into the configuration name space -under the key "cher". This properties file lives in -rsrc/config/cocktail/cher/server.properties and is loaded from the jar -file in which the Cher server code is provided. +The Presents server binds a properties file into the configuration name +space under the key "presents". This properties file lives in +rsrc/config/presents/server.properties and is loaded from the jar file in +which the Presents server code is provided. Values specified in this properties file can be overridden by a mechanism that will be provided by the configuration utilities used by the server. This is accomplished by placing a properties file earlier in the -classpath than the one supplied with the cher code. The values in that +classpath than the one supplied with the Presents code. The values in that earlier properties file will override the ones in the standard file. Values not supplied in the override file will be retrieved from the standard file. @@ -138,9 +138,9 @@ Derived server classes should place their server properties into the classpath with a path along the lines of rsrc/config//server.properties and should bind it into the config namespace with their own identifier. If they desire to override values in -the Cher server configuration, they should provide a -rsrc/config/cocktail/cher/server.properties in their jar file ensure that -their jar file occurs earlier in the classpath than the Cher server jar +the Presents server configuration, they should provide a +rsrc/config/presents/server.properties in their jar file ensure that their +jar file occurs earlier in the classpath than the Presents server jar file. * A note on thread-safety diff --git a/docs/presents/notes.txt b/docs/presents/notes.txt index 7308f5782..39d5a6adb 100644 --- a/docs/presents/notes.txt +++ b/docs/presents/notes.txt @@ -1,4 +1,4 @@ -Cher Notes -*- outline -*- +Presents Notes -*- outline -*- * TODO Pass cause back to client somehow via FailureResponse in Client.requestFailed diff --git a/docs/whirled/design.txt b/docs/whirled/design.txt index 3aae3a4eb..f540a9459 100644 --- a/docs/whirled/design.txt +++ b/docs/whirled/design.txt @@ -1,12 +1,12 @@ Whirled Design -*- mode: outline -*- * Overview -Whirled builds on top of the Cocktail platform and provides a framework -for building a virtual world made up of a node network of individual -scenes. In the abstract, scenes contain only exits to other scenes and the -world is one big directed graph. This is not unlike the structure of MUDs -where one classically thinks of rooms and exits. We've chosen the term -scene to avoid implying that we're indoors. +Whirled builds on top of the Presents and Crowd packages and provides a +framework for building a virtual world made up of a node network of +individual scenes. In the abstract, scenes contain only exits to other +scenes and the world is one big directed graph. This is not unlike the +structure of MUDs where one classically thinks of rooms and exits. We've +chosen the term scene to avoid implying that we're indoors. Whirled provides a means by which clients can move from scene to scene, and to different locations within the scene (though restricting clients to diff --git a/lib/README b/lib/README index 506ffa004..28a029dcc 100644 --- a/lib/README +++ b/lib/README @@ -1,7 +1,7 @@ Required external libraries --------------------------- -The cocktail code requires the following external Java libraries (JAR +The Narya code requires the following external Java libraries (JAR files) to be placed (or symlinked) here in the lib/ directory or in the shared library directory specified in the build.xml file (${java.libraries}). @@ -34,4 +34,4 @@ build system will automatically include them in the compile-time classpath. -- -$Id: README,v 1.4 2001/07/23 22:25:54 shaper Exp $ +$Id: README,v 1.5 2001/10/11 04:07:50 mdb Exp $ diff --git a/rsrc/config/crowd/server.properties b/rsrc/config/crowd/server.properties index 8b084d9a0..863edfb1b 100644 --- a/rsrc/config/crowd/server.properties +++ b/rsrc/config/crowd/server.properties @@ -1,10 +1,10 @@ # -# $Id: server.properties,v 1.2 2001/08/04 03:13:26 mdb Exp $ +# $Id: server.properties,v 1.3 2001/10/11 04:07:50 mdb Exp $ # -# Configuration for the Party server +# Configuration for the Crowd server # These invocation service providers will be registered with the # invocation manager during the server init process providers = \ - location = com.threerings.cocktail.party.server.LocationProvider, \ - chat = com.threerings.cocktail.party.chat.ChatProvider + location = com.threerings.crowd.server.LocationProvider, \ + chat = com.threerings.crowd.chat.ChatProvider diff --git a/rsrc/config/presents/server.properties b/rsrc/config/presents/server.properties index e2400dc9b..8bafa7dc5 100644 --- a/rsrc/config/presents/server.properties +++ b/rsrc/config/presents/server.properties @@ -1,7 +1,7 @@ # -# $Id: server.properties,v 1.3 2001/08/08 23:56:20 mdb Exp $ +# $Id: server.properties,v 1.4 2001/10/11 04:07:50 mdb Exp $ # -# Configuration for the Cher server +# Configuration for the Presents server # These invocation service providers will be registered with the # invocation manager during the server init process diff --git a/src/java/com/threerings/crowd/Log.java b/src/java/com/threerings/crowd/Log.java index c6bfd025b..901d05455 100644 --- a/src/java/com/threerings/crowd/Log.java +++ b/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) diff --git a/src/java/com/threerings/crowd/chat/ChatMessageHandler.java b/src/java/com/threerings/crowd/chat/ChatMessageHandler.java index 95d0a2c38..f3859c9f4 100644 --- a/src/java/com/threerings/crowd/chat/ChatMessageHandler.java +++ b/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); } } diff --git a/src/java/com/threerings/crowd/chat/client/ChatDirector.java b/src/java/com/threerings/crowd/chat/client/ChatDirector.java index fbb9f6001..566e46dec 100644 --- a/src/java/com/threerings/crowd/chat/client/ChatDirector.java +++ b/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(); diff --git a/src/java/com/threerings/crowd/chat/client/ChatDisplay.java b/src/java/com/threerings/crowd/chat/client/ChatDisplay.java index eb50e95ad..a7420d6e0 100644 --- a/src/java/com/threerings/crowd/chat/client/ChatDisplay.java +++ b/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 diff --git a/src/java/com/threerings/crowd/chat/client/ChatService.java b/src/java/com/threerings/crowd/chat/client/ChatService.java index c4b72daaf..abd1f7f8e 100644 --- a/src/java/com/threerings/crowd/chat/client/ChatService.java +++ b/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 diff --git a/src/java/com/threerings/crowd/chat/data/ChatCodes.java b/src/java/com/threerings/crowd/chat/data/ChatCodes.java index efcaad93b..e5958dce1 100644 --- a/src/java/com/threerings/crowd/chat/data/ChatCodes.java +++ b/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. diff --git a/src/java/com/threerings/crowd/chat/server/ChatProvider.java b/src/java/com/threerings/crowd/chat/server/ChatProvider.java index dd8c1c4c2..ea21dc6a8 100644 --- a/src/java/com/threerings/crowd/chat/server/ChatProvider.java +++ b/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); diff --git a/src/java/com/threerings/crowd/client/LocationAdapter.java b/src/java/com/threerings/crowd/client/LocationAdapter.java index a03d2d83d..fc38e373b 100644 --- a/src/java/com/threerings/crowd/client/LocationAdapter.java +++ b/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 diff --git a/src/java/com/threerings/crowd/client/LocationCodes.java b/src/java/com/threerings/crowd/client/LocationCodes.java index d9bf2b1d2..257868209 100644 --- a/src/java/com/threerings/crowd/client/LocationCodes.java +++ b/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. diff --git a/src/java/com/threerings/crowd/client/LocationDirector.java b/src/java/com/threerings/crowd/client/LocationDirector.java index 5f32a5b83..cdd28bf49 100644 --- a/src/java/com/threerings/crowd/client/LocationDirector.java +++ b/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(); diff --git a/src/java/com/threerings/crowd/client/LocationObserver.java b/src/java/com/threerings/crowd/client/LocationObserver.java index eb3e68a6f..6021d4421 100644 --- a/src/java/com/threerings/crowd/client/LocationObserver.java +++ b/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 diff --git a/src/java/com/threerings/crowd/client/LocationService.java b/src/java/com/threerings/crowd/client/LocationService.java index 22cf58689..cc5770098 100644 --- a/src/java/com/threerings/crowd/client/LocationService.java +++ b/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 diff --git a/src/java/com/threerings/crowd/client/OccupantManager.java b/src/java/com/threerings/crowd/client/OccupantManager.java index c2ec64cfa..be222d25d 100644 --- a/src/java/com/threerings/crowd/client/OccupantManager.java +++ b/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); diff --git a/src/java/com/threerings/crowd/client/OccupantObserver.java b/src/java/com/threerings/crowd/client/OccupantObserver.java index b29fa5b73..84f488e8f 100644 --- a/src/java/com/threerings/crowd/client/OccupantObserver.java +++ b/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 diff --git a/src/java/com/threerings/crowd/client/PlaceController.java b/src/java/com/threerings/crowd/client/PlaceController.java index 605de0bfe..77c2f6b17 100644 --- a/src/java/com/threerings/crowd/client/PlaceController.java +++ b/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; diff --git a/src/java/com/threerings/crowd/client/PlaceView.java b/src/java/com/threerings/crowd/client/PlaceView.java index bff7db7e0..04dca00d3 100644 --- a/src/java/com/threerings/crowd/client/PlaceView.java +++ b/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 diff --git a/src/java/com/threerings/crowd/client/PlaceViewUtil.java b/src/java/com/threerings/crowd/client/PlaceViewUtil.java index c0786131e..437d568a0 100644 --- a/src/java/com/threerings/crowd/client/PlaceViewUtil.java +++ b/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 diff --git a/src/java/com/threerings/crowd/data/BodyObject.dobj b/src/java/com/threerings/crowd/data/BodyObject.dobj index ee706a444..c3a1a0251 100644 --- a/src/java/com/threerings/crowd/data/BodyObject.dobj +++ b/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 { diff --git a/src/java/com/threerings/crowd/data/OccupantInfo.java b/src/java/com/threerings/crowd/data/OccupantInfo.java index 328e99550..9fab76876 100644 --- a/src/java/com/threerings/crowd/data/OccupantInfo.java +++ b/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 { diff --git a/src/java/com/threerings/crowd/data/PlaceConfig.java b/src/java/com/threerings/crowd/data/PlaceConfig.java index b46c4c483..0df7736de 100644 --- a/src/java/com/threerings/crowd/data/PlaceConfig.java +++ b/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}. Note: + * com.threerings.crowd.server.PlaceManager}. Note: * 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 diff --git a/src/java/com/threerings/crowd/data/PlaceObject.dobj b/src/java/com/threerings/crowd/data/PlaceObject.dobj index 2e27a316d..2cdf01a1a 100644 --- a/src/java/com/threerings/crowd/data/PlaceObject.dobj +++ b/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 { diff --git a/src/java/com/threerings/crowd/server/CrowdClient.java b/src/java/com/threerings/crowd/server/CrowdClient.java index 184660882..5c5d3a0e8 100644 --- a/src/java/com/threerings/crowd/server/CrowdClient.java +++ b/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; diff --git a/src/java/com/threerings/crowd/server/CrowdServer.java b/src/java/com/threerings/crowd/server/CrowdServer.java index a43d54463..c70857f8f 100644 --- a/src/java/com/threerings/crowd/server/CrowdServer.java +++ b/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"; diff --git a/src/java/com/threerings/crowd/server/LocationProvider.java b/src/java/com/threerings/crowd/server/LocationProvider.java index dc152b7f1..b9295a8c2 100644 --- a/src/java/com/threerings/crowd/server/LocationProvider.java +++ b/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) diff --git a/src/java/com/threerings/crowd/server/PlaceManager.java b/src/java/com/threerings/crowd/server/PlaceManager.java index 04cfe6c93..51cc0670c 100644 --- a/src/java/com/threerings/crowd/server/PlaceManager.java +++ b/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. * *

The base place manager class takes care of the necessary * interactions with the place registry to manage place registration. It diff --git a/src/java/com/threerings/crowd/server/PlaceRegistry.java b/src/java/com/threerings/crowd/server/PlaceRegistry.java index dd49e04a5..d81f1fe9a 100644 --- a/src/java/com/threerings/crowd/server/PlaceRegistry.java +++ b/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; diff --git a/src/java/com/threerings/crowd/util/CrowdContext.java b/src/java/com/threerings/crowd/util/CrowdContext.java index bfb7a1f5d..0324de541 100644 --- a/src/java/com/threerings/crowd/util/CrowdContext.java +++ b/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. diff --git a/src/java/com/threerings/parlor/client/ParlorCodes.java b/src/java/com/threerings/parlor/client/ParlorCodes.java index 294cd2b0d..c040f30e2 100644 --- a/src/java/com/threerings/parlor/client/ParlorCodes.java +++ b/src/java/com/threerings/parlor/client/ParlorCodes.java @@ -1,9 +1,9 @@ // -// $Id: ParlorCodes.java,v 1.4 2001/10/04 22:47:49 mdb Exp $ +// $Id: ParlorCodes.java,v 1.5 2001/10/11 04:07:51 mdb Exp $ package com.threerings.parlor.client; -import com.threerings.cocktail.cher.client.InvocationCodes; +import com.threerings.presents.client.InvocationCodes; /** * Contains codes used by the parlor invocation services. diff --git a/src/java/com/threerings/parlor/client/ParlorDirector.java b/src/java/com/threerings/parlor/client/ParlorDirector.java index f8827c796..a89689a7c 100644 --- a/src/java/com/threerings/parlor/client/ParlorDirector.java +++ b/src/java/com/threerings/parlor/client/ParlorDirector.java @@ -1,5 +1,5 @@ // -// $Id: ParlorDirector.java,v 1.9 2001/10/09 20:20:52 mdb Exp $ +// $Id: ParlorDirector.java,v 1.10 2001/10/11 04:07:51 mdb Exp $ package com.threerings.parlor.client; @@ -7,7 +7,7 @@ import java.util.ArrayList; import java.util.Iterator; import com.samskivert.util.HashIntMap; -import com.threerings.cocktail.cher.client.InvocationReceiver; +import com.threerings.presents.client.InvocationReceiver; import com.threerings.parlor.Log; import com.threerings.parlor.data.GameConfig; diff --git a/src/java/com/threerings/parlor/client/ParlorService.java b/src/java/com/threerings/parlor/client/ParlorService.java index 272b89ed4..a458e602f 100644 --- a/src/java/com/threerings/parlor/client/ParlorService.java +++ b/src/java/com/threerings/parlor/client/ParlorService.java @@ -1,10 +1,10 @@ // -// $Id: ParlorService.java,v 1.5 2001/10/02 02:09:06 mdb Exp $ +// $Id: ParlorService.java,v 1.6 2001/10/11 04:07:51 mdb Exp $ package com.threerings.parlor.client; -import com.threerings.cocktail.cher.client.Client; -import com.threerings.cocktail.cher.client.InvocationDirector; +import com.threerings.presents.client.Client; +import com.threerings.presents.client.InvocationDirector; import com.threerings.parlor.Log; import com.threerings.parlor.data.GameConfig; diff --git a/src/java/com/threerings/parlor/game/GameCodes.java b/src/java/com/threerings/parlor/game/GameCodes.java index 42403411c..d455ca25b 100644 --- a/src/java/com/threerings/parlor/game/GameCodes.java +++ b/src/java/com/threerings/parlor/game/GameCodes.java @@ -1,9 +1,9 @@ // -// $Id: GameCodes.java,v 1.1 2001/10/11 03:12:38 mdb Exp $ +// $Id: GameCodes.java,v 1.2 2001/10/11 04:07:51 mdb Exp $ package com.threerings.parlor.client; -import com.threerings.cocktail.cher.client.InvocationCodes; +import com.threerings.presents.client.InvocationCodes; /** * Contains codes used by the game services. diff --git a/src/java/com/threerings/parlor/game/GameConfig.java b/src/java/com/threerings/parlor/game/GameConfig.java index 0220efa31..f3bc85b07 100644 --- a/src/java/com/threerings/parlor/game/GameConfig.java +++ b/src/java/com/threerings/parlor/game/GameConfig.java @@ -1,5 +1,5 @@ // -// $Id: GameConfig.java,v 1.5 2001/10/06 00:25:29 mdb Exp $ +// $Id: GameConfig.java,v 1.6 2001/10/11 04:07:51 mdb Exp $ package com.threerings.parlor.data; @@ -7,7 +7,7 @@ import java.io.IOException; import java.io.DataInputStream; import java.io.DataOutputStream; -import com.threerings.cocktail.party.data.PlaceConfig; +import com.threerings.crowd.data.PlaceConfig; /** * The game config class encapsulates the configuration information for a diff --git a/src/java/com/threerings/parlor/game/GameController.java b/src/java/com/threerings/parlor/game/GameController.java index ea8db219d..9e6935733 100644 --- a/src/java/com/threerings/parlor/game/GameController.java +++ b/src/java/com/threerings/parlor/game/GameController.java @@ -1,5 +1,5 @@ // -// $Id: GameController.java,v 1.5 2001/10/11 03:12:38 mdb Exp $ +// $Id: GameController.java,v 1.6 2001/10/11 04:07:51 mdb Exp $ package com.threerings.parlor.client; @@ -7,11 +7,11 @@ import java.awt.event.ActionEvent; import com.samskivert.swing.Controller; -import com.threerings.cocktail.cher.dobj.*; -import com.threerings.cocktail.party.client.PlaceController; -import com.threerings.cocktail.party.data.PlaceConfig; -import com.threerings.cocktail.party.data.PlaceObject; -import com.threerings.cocktail.party.util.PartyContext; +import com.threerings.presents.dobj.*; +import com.threerings.crowd.client.PlaceController; +import com.threerings.crowd.data.PlaceConfig; +import com.threerings.crowd.data.PlaceObject; +import com.threerings.crowd.util.CrowdContext; import com.threerings.parlor.Log; import com.threerings.parlor.data.GameConfig; @@ -42,7 +42,7 @@ public abstract class GameController * @param config the configuration of the game we are intended to * control. */ - public void init (PartyContext ctx, PlaceConfig config) + public void init (CrowdContext ctx, PlaceConfig config) { // cast our references before we call super.init() so that when // super.init() calls createPlaceView(), we have our casted diff --git a/src/java/com/threerings/parlor/game/GameManager.java b/src/java/com/threerings/parlor/game/GameManager.java index 8766e9059..73ec643de 100644 --- a/src/java/com/threerings/parlor/game/GameManager.java +++ b/src/java/com/threerings/parlor/game/GameManager.java @@ -1,15 +1,15 @@ // -// $Id: GameManager.java,v 1.6 2001/10/11 03:12:38 mdb Exp $ +// $Id: GameManager.java,v 1.7 2001/10/11 04:07:51 mdb Exp $ package com.threerings.parlor.server; -import com.threerings.cocktail.cher.dobj.MessageEvent; +import com.threerings.presents.dobj.MessageEvent; -import com.threerings.cocktail.party.data.BodyObject; -import com.threerings.cocktail.party.data.PlaceObject; -import com.threerings.cocktail.party.server.PlaceManager; -import com.threerings.cocktail.party.server.PartyServer; -import com.threerings.cocktail.party.server.PartyServer; +import com.threerings.crowd.data.BodyObject; +import com.threerings.crowd.data.PlaceObject; +import com.threerings.crowd.server.PlaceManager; +import com.threerings.crowd.server.CrowdServer; +import com.threerings.crowd.server.CrowdServer; import com.threerings.parlor.Log; import com.threerings.parlor.client.GameCodes; @@ -77,9 +77,9 @@ public class GameManager Object[] args = new Object[] { new Integer(_gameobj.getOid()) }; for (int i = 0; i < _players.length; i++) { - BodyObject bobj = PartyServer.lookupBody(_players[i]); + BodyObject bobj = CrowdServer.lookupBody(_players[i]); // deliver a game ready notification to the player - PartyServer.invmgr.sendNotification( + CrowdServer.invmgr.sendNotification( bobj.getOid(), MODULE_NAME, GAME_READY_NOTIFICATION, args); } } @@ -169,7 +169,7 @@ public class GameManager { int cloid = event.getSourceOid(); BodyObject body = (BodyObject) - PartyServer.omgr.getObject(cloid); + CrowdServer.omgr.getObject(cloid); if (body == null) { Log.warning("Player sent am ready notification and then " + "disappeared [event=" + event + "]."); diff --git a/src/java/com/threerings/parlor/game/GameObject.dobj b/src/java/com/threerings/parlor/game/GameObject.dobj index 4745fedcf..0af1cc9bf 100644 --- a/src/java/com/threerings/parlor/game/GameObject.dobj +++ b/src/java/com/threerings/parlor/game/GameObject.dobj @@ -1,9 +1,9 @@ // -// $Id: GameObject.dobj,v 1.2 2001/10/01 06:19:15 mdb Exp $ +// $Id: GameObject.dobj,v 1.3 2001/10/11 04:07:51 mdb Exp $ package com.threerings.parlor.data; -import com.threerings.cocktail.party.data.PlaceObject; +import com.threerings.crowd.data.PlaceObject; /** * A game object hosts the shared data associated with a game played by diff --git a/src/java/com/threerings/parlor/server/ParlorManager.java b/src/java/com/threerings/parlor/server/ParlorManager.java index 265c7d29d..9e88fd111 100644 --- a/src/java/com/threerings/parlor/server/ParlorManager.java +++ b/src/java/com/threerings/parlor/server/ParlorManager.java @@ -1,16 +1,16 @@ // -// $Id: ParlorManager.java,v 1.7 2001/10/09 20:20:35 mdb Exp $ +// $Id: ParlorManager.java,v 1.8 2001/10/11 04:07:51 mdb Exp $ package com.threerings.parlor.server; import com.samskivert.util.Config; import com.samskivert.util.HashIntMap; -import com.threerings.cocktail.cher.server.InvocationManager; -import com.threerings.cocktail.cher.server.ServiceFailedException; +import com.threerings.presents.server.InvocationManager; +import com.threerings.presents.server.ServiceFailedException; -import com.threerings.cocktail.party.data.BodyObject; -import com.threerings.cocktail.party.server.PartyServer; +import com.threerings.crowd.data.BodyObject; +import com.threerings.crowd.server.CrowdServer; import com.threerings.parlor.Log; import com.threerings.parlor.client.ParlorCodes; @@ -176,7 +176,7 @@ public class ParlorManager // started up (which is done by the place registry once the // game object creation has completed) GameManager gmgr = (GameManager) - PartyServer.plreg.createPlace(invite.config); + CrowdServer.plreg.createPlace(invite.config); // provide the game manager with some initialization info String[] players = new String[] { diff --git a/src/java/com/threerings/parlor/server/ParlorProvider.java b/src/java/com/threerings/parlor/server/ParlorProvider.java index 72d2859fa..813fa8839 100644 --- a/src/java/com/threerings/parlor/server/ParlorProvider.java +++ b/src/java/com/threerings/parlor/server/ParlorProvider.java @@ -1,12 +1,12 @@ // -// $Id: ParlorProvider.java,v 1.5 2001/10/03 03:44:52 mdb Exp $ +// $Id: ParlorProvider.java,v 1.6 2001/10/11 04:07:51 mdb Exp $ package com.threerings.parlor.server; -import com.threerings.cocktail.cher.server.InvocationProvider; -import com.threerings.cocktail.cher.server.ServiceFailedException; -import com.threerings.cocktail.party.data.BodyObject; -import com.threerings.cocktail.party.server.PartyServer; +import com.threerings.presents.server.InvocationProvider; +import com.threerings.presents.server.ServiceFailedException; +import com.threerings.crowd.data.BodyObject; +import com.threerings.crowd.server.CrowdServer; import com.threerings.parlor.Log; import com.threerings.parlor.client.ParlorCodes; @@ -49,7 +49,7 @@ public class ParlorProvider // ensure that the invitee is online at present try { - BodyObject target = PartyServer.lookupBody(invitee); + BodyObject target = CrowdServer.lookupBody(invitee); if (target == null) { throw new ServiceFailedException(INVITEE_NOT_ONLINE); } diff --git a/src/java/com/threerings/parlor/util/ParlorContext.java b/src/java/com/threerings/parlor/util/ParlorContext.java index 6c0328718..cb12f26ad 100644 --- a/src/java/com/threerings/parlor/util/ParlorContext.java +++ b/src/java/com/threerings/parlor/util/ParlorContext.java @@ -1,16 +1,16 @@ // -// $Id: ParlorContext.java,v 1.1 2001/10/01 02:56:35 mdb Exp $ +// $Id: ParlorContext.java,v 1.2 2001/10/11 04:07:52 mdb Exp $ package com.threerings.parlor.util; -import com.threerings.cocktail.party.util.PartyContext; +import com.threerings.crowd.util.CrowdContext; import com.threerings.parlor.client.ParlorDirector; /** * The parlor context provides access to the various managers, etc. that * are needed by the parlor client code. */ -public interface ParlorContext extends PartyContext +public interface ParlorContext extends CrowdContext { /** * Returns a reference to the parlor director. diff --git a/src/java/com/threerings/presents/Log.java b/src/java/com/threerings/presents/Log.java index 4032f51ac..6b2b58bc7 100644 --- a/src/java/com/threerings/presents/Log.java +++ b/src/java/com/threerings/presents/Log.java @@ -1,16 +1,16 @@ // -// $Id: Log.java,v 1.4 2001/07/20 23:23:50 mdb Exp $ +// $Id: Log.java,v 1.5 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher; +package com.threerings.presents; /** * A placeholder class that contains a reference to the log object used by - * the Cher services. + * the Presents services. */ public class Log { public static com.samskivert.util.Log log = - new com.samskivert.util.Log("cocktail.cher"); + new com.samskivert.util.Log("presents"); /** Convenience function. */ public static void debug (String message) diff --git a/src/java/com/threerings/presents/client/Client.java b/src/java/com/threerings/presents/client/Client.java index 4e2305936..0cc827bbf 100644 --- a/src/java/com/threerings/presents/client/Client.java +++ b/src/java/com/threerings/presents/client/Client.java @@ -1,16 +1,16 @@ // -// $Id: Client.java,v 1.16 2001/10/09 18:17:33 mdb Exp $ +// $Id: Client.java,v 1.17 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.client; +package com.threerings.presents.client; import java.util.ArrayList; import java.util.List; -import com.threerings.cocktail.cher.Log; -import com.threerings.cocktail.cher.data.ClientObject; -import com.threerings.cocktail.cher.dobj.DObjectManager; -import com.threerings.cocktail.cher.net.BootstrapData; -import com.threerings.cocktail.cher.net.Credentials; +import com.threerings.presents.Log; +import com.threerings.presents.data.ClientObject; +import com.threerings.presents.dobj.DObjectManager; +import com.threerings.presents.net.BootstrapData; +import com.threerings.presents.net.Credentials; /** * Through the client object, a connection to the system is established diff --git a/src/java/com/threerings/presents/client/ClientAdapter.java b/src/java/com/threerings/presents/client/ClientAdapter.java index c4de3fdad..78d1d36f1 100644 --- a/src/java/com/threerings/presents/client/ClientAdapter.java +++ b/src/java/com/threerings/presents/client/ClientAdapter.java @@ -1,7 +1,7 @@ // -// $Id: ClientAdapter.java,v 1.2 2001/09/13 19:08:21 mdb Exp $ +// $Id: ClientAdapter.java,v 1.3 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.client; +package com.threerings.presents.client; /** * The client adapter makes life easier for client observer classes that diff --git a/src/java/com/threerings/presents/client/ClientDObjectMgr.java b/src/java/com/threerings/presents/client/ClientDObjectMgr.java index b9e4bee8e..a985198df 100644 --- a/src/java/com/threerings/presents/client/ClientDObjectMgr.java +++ b/src/java/com/threerings/presents/client/ClientDObjectMgr.java @@ -1,15 +1,15 @@ // -// $Id: ClientDObjectMgr.java,v 1.6 2001/09/17 05:18:20 mdb Exp $ +// $Id: ClientDObjectMgr.java,v 1.7 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.client; +package com.threerings.presents.client; import java.util.ArrayList; 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.cocktail.cher.net.*; +import com.threerings.presents.Log; +import com.threerings.presents.dobj.*; +import com.threerings.presents.net.*; /** * The client distributed object manager manages a set of proxy objects diff --git a/src/java/com/threerings/presents/client/ClientObserver.java b/src/java/com/threerings/presents/client/ClientObserver.java index e890202d3..1fabf5af0 100644 --- a/src/java/com/threerings/presents/client/ClientObserver.java +++ b/src/java/com/threerings/presents/client/ClientObserver.java @@ -1,7 +1,7 @@ // -// $Id: ClientObserver.java,v 1.2 2001/05/30 23:58:31 mdb Exp $ +// $Id: ClientObserver.java,v 1.3 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.client; +package com.threerings.presents.client; /** * A client observer is registered with the client instance to be notified diff --git a/src/java/com/threerings/presents/client/Communicator.java b/src/java/com/threerings/presents/client/Communicator.java index 7f12f1bb4..676ec0d4b 100644 --- a/src/java/com/threerings/presents/client/Communicator.java +++ b/src/java/com/threerings/presents/client/Communicator.java @@ -1,7 +1,7 @@ // -// $Id: Communicator.java,v 1.15 2001/10/03 03:39:39 mdb Exp $ +// $Id: Communicator.java,v 1.16 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.client; +package com.threerings.presents.client; import java.io.*; import java.net.Socket; @@ -10,11 +10,11 @@ import java.net.InetAddress; import com.samskivert.util.LoopingThread; import com.samskivert.util.Queue; -import com.threerings.cocktail.cher.Log; -import com.threerings.cocktail.cher.dobj.DObjectManager; -import com.threerings.cocktail.cher.io.*; -import com.threerings.cocktail.cher.io.ObjectStreamException; -import com.threerings.cocktail.cher.net.*; +import com.threerings.presents.Log; +import com.threerings.presents.dobj.DObjectManager; +import com.threerings.presents.io.*; +import com.threerings.presents.io.ObjectStreamException; +import com.threerings.presents.net.*; /** * The client performs all network I/O on separate threads (one for diff --git a/src/java/com/threerings/presents/client/InvocationCodes.java b/src/java/com/threerings/presents/client/InvocationCodes.java index 9f5318944..13f67e7de 100644 --- a/src/java/com/threerings/presents/client/InvocationCodes.java +++ b/src/java/com/threerings/presents/client/InvocationCodes.java @@ -1,7 +1,7 @@ // -// $Id: InvocationCodes.java,v 1.1 2001/10/01 22:14:54 mdb Exp $ +// $Id: InvocationCodes.java,v 1.2 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.client; +package com.threerings.presents.client; /** * The invocation codes interface provides codes that are commonly used by diff --git a/src/java/com/threerings/presents/client/InvocationDirector.java b/src/java/com/threerings/presents/client/InvocationDirector.java index bdf79b4a2..d10c7df2d 100644 --- a/src/java/com/threerings/presents/client/InvocationDirector.java +++ b/src/java/com/threerings/presents/client/InvocationDirector.java @@ -1,7 +1,7 @@ // -// $Id: InvocationDirector.java,v 1.12 2001/10/04 20:02:13 mdb Exp $ +// $Id: InvocationDirector.java,v 1.13 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.client; +package com.threerings.presents.client; import java.lang.reflect.Method; import java.util.HashMap; @@ -9,10 +9,10 @@ import java.util.HashMap; import com.samskivert.util.HashIntMap; import com.samskivert.util.StringUtil; -import com.threerings.cocktail.cher.Log; -import com.threerings.cocktail.cher.data.*; -import com.threerings.cocktail.cher.dobj.*; -import com.threerings.cocktail.cher.util.ClassUtil; +import com.threerings.presents.Log; +import com.threerings.presents.data.*; +import com.threerings.presents.dobj.*; +import com.threerings.presents.util.ClassUtil; /** * The invocation services provide client to server invocations (service diff --git a/src/java/com/threerings/presents/client/InvocationReceiver.java b/src/java/com/threerings/presents/client/InvocationReceiver.java index 22909b4ef..3270f62cc 100644 --- a/src/java/com/threerings/presents/client/InvocationReceiver.java +++ b/src/java/com/threerings/presents/client/InvocationReceiver.java @@ -1,7 +1,7 @@ // -// $Id: InvocationReceiver.java,v 1.3 2001/10/02 02:05:50 mdb Exp $ +// $Id: InvocationReceiver.java,v 1.4 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.client; +package com.threerings.presents.client; /** * Classes registered to process invocation notifications should implement diff --git a/src/java/com/threerings/presents/client/LogonException.java b/src/java/com/threerings/presents/client/LogonException.java index 9a07b81ea..526051a58 100644 --- a/src/java/com/threerings/presents/client/LogonException.java +++ b/src/java/com/threerings/presents/client/LogonException.java @@ -1,7 +1,7 @@ // -// $Id: LogonException.java,v 1.2 2001/05/30 23:58:31 mdb Exp $ +// $Id: LogonException.java,v 1.3 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.client; +package com.threerings.presents.client; /** * A logon exception is used to indicate a failure to log on to the diff --git a/src/java/com/threerings/presents/data/ClientObject.java b/src/java/com/threerings/presents/data/ClientObject.java index e5d8ef6d0..824a0a461 100644 --- a/src/java/com/threerings/presents/data/ClientObject.java +++ b/src/java/com/threerings/presents/data/ClientObject.java @@ -1,9 +1,9 @@ // -// $Id: ClientObject.java,v 1.1 2001/07/19 05:56:20 mdb Exp $ +// $Id: ClientObject.java,v 1.2 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.data; +package com.threerings.presents.data; -import com.threerings.cocktail.cher.dobj.DObject; +import com.threerings.presents.dobj.DObject; /** * Every client in the system has an associated client object to which diff --git a/src/java/com/threerings/presents/data/InvocationObject.java b/src/java/com/threerings/presents/data/InvocationObject.java index 4d0e56c0e..2f9af6d5d 100644 --- a/src/java/com/threerings/presents/data/InvocationObject.java +++ b/src/java/com/threerings/presents/data/InvocationObject.java @@ -1,9 +1,9 @@ // -// $Id: InvocationObject.java,v 1.2 2001/07/19 19:18:06 mdb Exp $ +// $Id: InvocationObject.java,v 1.3 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.data; +package com.threerings.presents.data; -import com.threerings.cocktail.cher.dobj.DObject; +import com.threerings.presents.dobj.DObject; /** * A single invocation object is created by the server invocation manager diff --git a/src/java/com/threerings/presents/dobj/AttributeChangedEvent.java b/src/java/com/threerings/presents/dobj/AttributeChangedEvent.java index 00068f099..f3f3d0a6d 100644 --- a/src/java/com/threerings/presents/dobj/AttributeChangedEvent.java +++ b/src/java/com/threerings/presents/dobj/AttributeChangedEvent.java @@ -1,14 +1,14 @@ // -// $Id: AttributeChangedEvent.java,v 1.8 2001/08/04 00:32:11 mdb Exp $ +// $Id: AttributeChangedEvent.java,v 1.9 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.lang.reflect.Method; -import com.threerings.cocktail.cher.dobj.io.ValueMarshaller; +import com.threerings.presents.dobj.io.ValueMarshaller; /** * An attribute changed event is dispatched when a single attribute of a diff --git a/src/java/com/threerings/presents/dobj/AttributesChangedEvent.java b/src/java/com/threerings/presents/dobj/AttributesChangedEvent.java index c266cc00c..263fd14ef 100644 --- a/src/java/com/threerings/presents/dobj/AttributesChangedEvent.java +++ b/src/java/com/threerings/presents/dobj/AttributesChangedEvent.java @@ -1,14 +1,14 @@ // -// $Id: AttributesChangedEvent.java,v 1.7 2001/08/04 00:32:11 mdb Exp $ +// $Id: AttributesChangedEvent.java,v 1.8 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import com.samskivert.util.StringUtil; -import com.threerings.cocktail.cher.dobj.io.ValueMarshaller; +import com.threerings.presents.dobj.io.ValueMarshaller; /** * An attributes changed event is dispatched when multiple diff --git a/src/java/com/threerings/presents/dobj/DEvent.java b/src/java/com/threerings/presents/dobj/DEvent.java index e2f8ce13d..bcfdf01ee 100644 --- a/src/java/com/threerings/presents/dobj/DEvent.java +++ b/src/java/com/threerings/presents/dobj/DEvent.java @@ -1,7 +1,7 @@ // -// $Id: DEvent.java,v 1.5 2001/08/04 00:32:11 mdb Exp $ +// $Id: DEvent.java,v 1.6 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; /** * A distributed object event is dispatched whenever any modification is diff --git a/src/java/com/threerings/presents/dobj/DEventUtil.java b/src/java/com/threerings/presents/dobj/DEventUtil.java index ca6920fc9..5a0eea299 100644 --- a/src/java/com/threerings/presents/dobj/DEventUtil.java +++ b/src/java/com/threerings/presents/dobj/DEventUtil.java @@ -1,7 +1,7 @@ // -// $Id: DEventUtil.java,v 1.2 2001/06/01 20:35:39 mdb Exp $ +// $Id: DEventUtil.java,v 1.3 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; import java.lang.reflect.Method; import java.util.HashMap; diff --git a/src/java/com/threerings/presents/dobj/DObject.java b/src/java/com/threerings/presents/dobj/DObject.java index af7102ca4..e0ad8b93e 100644 --- a/src/java/com/threerings/presents/dobj/DObject.java +++ b/src/java/com/threerings/presents/dobj/DObject.java @@ -1,16 +1,16 @@ // -// $Id: DObject.java,v 1.26 2001/08/21 19:35:02 mdb Exp $ +// $Id: DObject.java,v 1.27 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; import java.lang.reflect.Field; import java.util.ArrayList; import com.samskivert.util.ListUtil; -import com.threerings.cocktail.cher.Log; +import com.threerings.presents.Log; /** - * The distributed object forms the foundation of the cocktail system. All + * The distributed object forms the foundation of the Presents system. All * information shared among users of the system is done via distributed * objects. A distributed object has a set of subscribers. These * subscribers have access to the object or a proxy of the object and diff --git a/src/java/com/threerings/presents/dobj/DObjectManager.java b/src/java/com/threerings/presents/dobj/DObjectManager.java index 7624fab9c..51ab3f3fa 100644 --- a/src/java/com/threerings/presents/dobj/DObjectManager.java +++ b/src/java/com/threerings/presents/dobj/DObjectManager.java @@ -1,7 +1,7 @@ // -// $Id: DObjectManager.java,v 1.8 2001/08/07 20:38:58 mdb Exp $ +// $Id: DObjectManager.java,v 1.9 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; /** * The distributed object manager is responsible for managing the creation diff --git a/src/java/com/threerings/presents/dobj/DSet.java b/src/java/com/threerings/presents/dobj/DSet.java index 36776f3ff..fe07b8749 100644 --- a/src/java/com/threerings/presents/dobj/DSet.java +++ b/src/java/com/threerings/presents/dobj/DSet.java @@ -1,15 +1,15 @@ // -// $Id: DSet.java,v 1.7 2001/10/02 02:05:50 mdb Exp $ +// $Id: DSet.java,v 1.8 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.Iterator; -import com.threerings.cocktail.cher.Log; -import com.threerings.cocktail.cher.io.Streamable; +import com.threerings.presents.Log; +import com.threerings.presents.io.Streamable; /** * The distributed set class provides a means by which an unordered set of @@ -27,7 +27,7 @@ import com.threerings.cocktail.cher.io.Streamable; * sent over the wire. * *

Classes that wish to act as set elements must implement the {@link - * com.threerings.cocktail.cher.dobj.DSet.Element} interface which extends + * com.threerings.presents.dobj.DSet.Element} interface which extends * {@link Streamable} and adds the requirement that the object provide a * key which will be used to identify element equality. Thus an element is * declared to be in a set of the object returned by that element's diff --git a/src/java/com/threerings/presents/dobj/EntryAddedEvent.java b/src/java/com/threerings/presents/dobj/EntryAddedEvent.java index c5e00eb4e..7fa425c0a 100644 --- a/src/java/com/threerings/presents/dobj/EntryAddedEvent.java +++ b/src/java/com/threerings/presents/dobj/EntryAddedEvent.java @@ -1,14 +1,14 @@ // -// $Id: EntryAddedEvent.java,v 1.3 2001/08/16 03:45:43 mdb Exp $ +// $Id: EntryAddedEvent.java,v 1.4 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import com.threerings.cocktail.cher.Log; -import com.threerings.cocktail.cher.dobj.io.ElementUtil; +import com.threerings.presents.Log; +import com.threerings.presents.dobj.io.ElementUtil; /** * An element added event is dispatched when an element is added to a diff --git a/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java b/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java index 9a6e74595..3dd583336 100644 --- a/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java +++ b/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java @@ -1,13 +1,13 @@ // -// $Id: EntryRemovedEvent.java,v 1.4 2001/08/21 19:33:38 mdb Exp $ +// $Id: EntryRemovedEvent.java,v 1.5 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import com.threerings.cocktail.cher.dobj.io.ValueMarshaller; +import com.threerings.presents.dobj.io.ValueMarshaller; /** * An element removed event is dispatched when an element is removed from diff --git a/src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java b/src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java index 0dd11450c..ba913eb6c 100644 --- a/src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java +++ b/src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java @@ -1,14 +1,14 @@ // -// $Id: EntryUpdatedEvent.java,v 1.1 2001/08/16 03:45:43 mdb Exp $ +// $Id: EntryUpdatedEvent.java,v 1.2 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import com.threerings.cocktail.cher.Log; -import com.threerings.cocktail.cher.dobj.io.ElementUtil; +import com.threerings.presents.Log; +import com.threerings.presents.dobj.io.ElementUtil; /** * An element updated event is dispatched when an element of a diff --git a/src/java/com/threerings/presents/dobj/MessageEvent.java b/src/java/com/threerings/presents/dobj/MessageEvent.java index 91782a7bf..f32222fa5 100644 --- a/src/java/com/threerings/presents/dobj/MessageEvent.java +++ b/src/java/com/threerings/presents/dobj/MessageEvent.java @@ -1,7 +1,7 @@ // -// $Id: MessageEvent.java,v 1.5 2001/08/11 00:05:58 mdb Exp $ +// $Id: MessageEvent.java,v 1.6 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -9,7 +9,7 @@ import java.io.IOException; import java.lang.reflect.Method; import com.samskivert.util.StringUtil; -import com.threerings.cocktail.cher.dobj.io.ValueMarshaller; +import com.threerings.presents.dobj.io.ValueMarshaller; /** * A message event is used to dispatch a message to all subscribers of a diff --git a/src/java/com/threerings/presents/dobj/NoSuchObjectException.java b/src/java/com/threerings/presents/dobj/NoSuchObjectException.java index 3f0dc08f6..0a9377ca1 100644 --- a/src/java/com/threerings/presents/dobj/NoSuchObjectException.java +++ b/src/java/com/threerings/presents/dobj/NoSuchObjectException.java @@ -1,7 +1,7 @@ // -// $Id: NoSuchObjectException.java,v 1.1 2001/06/01 05:01:52 mdb Exp $ +// $Id: NoSuchObjectException.java,v 1.2 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; /** * A no such object exception is delivered when a subscriber requests diff --git a/src/java/com/threerings/presents/dobj/ObjectAccessException.java b/src/java/com/threerings/presents/dobj/ObjectAccessException.java index 36b1156f6..7effd8dcb 100644 --- a/src/java/com/threerings/presents/dobj/ObjectAccessException.java +++ b/src/java/com/threerings/presents/dobj/ObjectAccessException.java @@ -1,7 +1,7 @@ // -// $Id: ObjectAccessException.java,v 1.1 2001/06/01 05:01:52 mdb Exp $ +// $Id: ObjectAccessException.java,v 1.2 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; /** * An object access exception is delivered when an object is not diff --git a/src/java/com/threerings/presents/dobj/ObjectAddedEvent.java b/src/java/com/threerings/presents/dobj/ObjectAddedEvent.java index fd6b5fb62..0956a5b25 100644 --- a/src/java/com/threerings/presents/dobj/ObjectAddedEvent.java +++ b/src/java/com/threerings/presents/dobj/ObjectAddedEvent.java @@ -1,7 +1,7 @@ // -// $Id: ObjectAddedEvent.java,v 1.4 2001/08/04 00:32:11 mdb Exp $ +// $Id: ObjectAddedEvent.java,v 1.5 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/java/com/threerings/presents/dobj/ObjectDestroyedEvent.java b/src/java/com/threerings/presents/dobj/ObjectDestroyedEvent.java index c21755221..468084890 100644 --- a/src/java/com/threerings/presents/dobj/ObjectDestroyedEvent.java +++ b/src/java/com/threerings/presents/dobj/ObjectDestroyedEvent.java @@ -1,7 +1,7 @@ // -// $Id: ObjectDestroyedEvent.java,v 1.1 2001/08/07 20:38:58 mdb Exp $ +// $Id: ObjectDestroyedEvent.java,v 1.2 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/java/com/threerings/presents/dobj/ObjectRemovedEvent.java b/src/java/com/threerings/presents/dobj/ObjectRemovedEvent.java index 80b8280c3..5daa4ff1d 100644 --- a/src/java/com/threerings/presents/dobj/ObjectRemovedEvent.java +++ b/src/java/com/threerings/presents/dobj/ObjectRemovedEvent.java @@ -1,7 +1,7 @@ // -// $Id: ObjectRemovedEvent.java,v 1.4 2001/08/04 00:32:11 mdb Exp $ +// $Id: ObjectRemovedEvent.java,v 1.5 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/java/com/threerings/presents/dobj/OidList.java b/src/java/com/threerings/presents/dobj/OidList.java index ea98ecbc5..726db5d96 100644 --- a/src/java/com/threerings/presents/dobj/OidList.java +++ b/src/java/com/threerings/presents/dobj/OidList.java @@ -1,7 +1,7 @@ // -// $Id: OidList.java,v 1.3 2001/08/04 01:04:49 mdb Exp $ +// $Id: OidList.java,v 1.4 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/java/com/threerings/presents/dobj/ReleaseLockEvent.java b/src/java/com/threerings/presents/dobj/ReleaseLockEvent.java index 6ce7d5a56..c0e076d31 100644 --- a/src/java/com/threerings/presents/dobj/ReleaseLockEvent.java +++ b/src/java/com/threerings/presents/dobj/ReleaseLockEvent.java @@ -1,14 +1,14 @@ // -// $Id: ReleaseLockEvent.java,v 1.3 2001/08/04 01:05:12 mdb Exp $ +// $Id: ReleaseLockEvent.java,v 1.4 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.lang.reflect.Method; -import com.threerings.cocktail.cher.dobj.io.ValueMarshaller; +import com.threerings.presents.dobj.io.ValueMarshaller; /** * A release lock event is dispatched at the end of a chain of events to diff --git a/src/java/com/threerings/presents/dobj/Subscriber.java b/src/java/com/threerings/presents/dobj/Subscriber.java index 17d8ef099..9b6583197 100644 --- a/src/java/com/threerings/presents/dobj/Subscriber.java +++ b/src/java/com/threerings/presents/dobj/Subscriber.java @@ -1,7 +1,7 @@ // -// $Id: Subscriber.java,v 1.5 2001/08/02 04:49:08 mdb Exp $ +// $Id: Subscriber.java,v 1.6 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; /** * A subscriber is an entity that has access to a distributed object. The diff --git a/src/java/com/threerings/presents/dobj/TypedEvent.java b/src/java/com/threerings/presents/dobj/TypedEvent.java index 275c2972f..61e3774d9 100644 --- a/src/java/com/threerings/presents/dobj/TypedEvent.java +++ b/src/java/com/threerings/presents/dobj/TypedEvent.java @@ -1,13 +1,13 @@ // -// $Id: TypedEvent.java,v 1.1 2001/06/11 17:44:04 mdb Exp $ +// $Id: TypedEvent.java,v 1.2 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj; +package com.threerings.presents.dobj; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import com.threerings.cocktail.cher.io.TypedObject; +import com.threerings.presents.io.TypedObject; /** * A typed event is one that can be transmitted over the network. All diff --git a/src/java/com/threerings/presents/dobj/io/DObjectFactory.java b/src/java/com/threerings/presents/dobj/io/DObjectFactory.java index 925269c0b..190568bf6 100644 --- a/src/java/com/threerings/presents/dobj/io/DObjectFactory.java +++ b/src/java/com/threerings/presents/dobj/io/DObjectFactory.java @@ -1,16 +1,16 @@ // -// $Id: DObjectFactory.java,v 1.7 2001/08/07 20:38:58 mdb Exp $ +// $Id: DObjectFactory.java,v 1.8 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj.io; +package com.threerings.presents.dobj.io; import java.io.IOException; import java.io.DataInputStream; import java.io.DataOutputStream; import java.util.HashMap; -import com.threerings.cocktail.cher.Log; -import com.threerings.cocktail.cher.dobj.DObject; -import com.threerings.cocktail.cher.io.ObjectStreamException; +import com.threerings.presents.Log; +import com.threerings.presents.dobj.DObject; +import com.threerings.presents.io.ObjectStreamException; /** * The distributed object factory is responsible for marshalling and diff --git a/src/java/com/threerings/presents/dobj/io/EntryUtil.java b/src/java/com/threerings/presents/dobj/io/EntryUtil.java index e70db8ced..0f7da36d2 100644 --- a/src/java/com/threerings/presents/dobj/io/EntryUtil.java +++ b/src/java/com/threerings/presents/dobj/io/EntryUtil.java @@ -1,11 +1,11 @@ // -// $Id: EntryUtil.java,v 1.2 2001/08/21 21:16:53 mdb Exp $ +// $Id: EntryUtil.java,v 1.3 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj.io; +package com.threerings.presents.dobj.io; import java.io.*; -import com.threerings.cocktail.cher.dobj.DSet; +import com.threerings.presents.dobj.DSet; /** * Routines to simplify the process of moving set elements over the wire. diff --git a/src/java/com/threerings/presents/io/BooleanFieldMarshaller.java b/src/java/com/threerings/presents/io/BooleanFieldMarshaller.java index ce407951a..207b145d8 100644 --- a/src/java/com/threerings/presents/io/BooleanFieldMarshaller.java +++ b/src/java/com/threerings/presents/io/BooleanFieldMarshaller.java @@ -1,14 +1,14 @@ // -// $Id: BooleanFieldMarshaller.java,v 1.3 2001/06/11 17:42:20 mdb Exp $ +// $Id: BooleanFieldMarshaller.java,v 1.4 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj.io; +package com.threerings.presents.dobj.io; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.lang.reflect.Field; -import com.threerings.cocktail.cher.dobj.DObject; +import com.threerings.presents.dobj.DObject; public class BooleanFieldMarshaller implements FieldMarshaller { diff --git a/src/java/com/threerings/presents/io/DSetFieldMarshaller.java b/src/java/com/threerings/presents/io/DSetFieldMarshaller.java index 796e67c68..86660b73c 100644 --- a/src/java/com/threerings/presents/io/DSetFieldMarshaller.java +++ b/src/java/com/threerings/presents/io/DSetFieldMarshaller.java @@ -1,15 +1,15 @@ // -// $Id: DSetFieldMarshaller.java,v 1.1 2001/08/20 21:44:10 mdb Exp $ +// $Id: DSetFieldMarshaller.java,v 1.2 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj.io; +package com.threerings.presents.dobj.io; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.lang.reflect.Field; -import com.threerings.cocktail.cher.dobj.DObject; -import com.threerings.cocktail.cher.dobj.DSet; +import com.threerings.presents.dobj.DObject; +import com.threerings.presents.dobj.DSet; public class DSetFieldMarshaller implements FieldMarshaller { diff --git a/src/java/com/threerings/presents/io/DoubleFieldMarshaller.java b/src/java/com/threerings/presents/io/DoubleFieldMarshaller.java index 8235d70f6..120e95192 100644 --- a/src/java/com/threerings/presents/io/DoubleFieldMarshaller.java +++ b/src/java/com/threerings/presents/io/DoubleFieldMarshaller.java @@ -1,14 +1,14 @@ // -// $Id: DoubleFieldMarshaller.java,v 1.3 2001/06/11 17:42:20 mdb Exp $ +// $Id: DoubleFieldMarshaller.java,v 1.4 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj.io; +package com.threerings.presents.dobj.io; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.lang.reflect.Field; -import com.threerings.cocktail.cher.dobj.DObject; +import com.threerings.presents.dobj.DObject; public class DoubleFieldMarshaller implements FieldMarshaller { diff --git a/src/java/com/threerings/presents/io/FieldMarshaller.java b/src/java/com/threerings/presents/io/FieldMarshaller.java index 0581d64ba..93ce47667 100644 --- a/src/java/com/threerings/presents/io/FieldMarshaller.java +++ b/src/java/com/threerings/presents/io/FieldMarshaller.java @@ -1,14 +1,14 @@ // -// $Id: FieldMarshaller.java,v 1.3 2001/06/11 17:42:20 mdb Exp $ +// $Id: FieldMarshaller.java,v 1.4 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj.io; +package com.threerings.presents.dobj.io; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.lang.reflect.Field; -import com.threerings.cocktail.cher.dobj.DObject; +import com.threerings.presents.dobj.DObject; /** * A field marshaller knows how to marshall and unmarshall a particular diff --git a/src/java/com/threerings/presents/io/FieldMarshallerRegistry.java b/src/java/com/threerings/presents/io/FieldMarshallerRegistry.java index 6285af052..28916abed 100644 --- a/src/java/com/threerings/presents/io/FieldMarshallerRegistry.java +++ b/src/java/com/threerings/presents/io/FieldMarshallerRegistry.java @@ -1,11 +1,11 @@ // -// $Id: FieldMarshallerRegistry.java,v 1.5 2001/08/20 21:44:10 mdb Exp $ +// $Id: FieldMarshallerRegistry.java,v 1.6 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj.io; +package com.threerings.presents.dobj.io; import java.lang.reflect.Field; import java.util.Hashtable; -import com.threerings.cocktail.cher.Log; +import com.threerings.presents.Log; /** * Field marshaller instances are registered for each type of field that diff --git a/src/java/com/threerings/presents/io/FloatFieldMarshaller.java b/src/java/com/threerings/presents/io/FloatFieldMarshaller.java index 35f3be00d..583ea4076 100644 --- a/src/java/com/threerings/presents/io/FloatFieldMarshaller.java +++ b/src/java/com/threerings/presents/io/FloatFieldMarshaller.java @@ -1,14 +1,14 @@ // -// $Id: FloatFieldMarshaller.java,v 1.3 2001/06/11 17:42:20 mdb Exp $ +// $Id: FloatFieldMarshaller.java,v 1.4 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj.io; +package com.threerings.presents.dobj.io; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.lang.reflect.Field; -import com.threerings.cocktail.cher.dobj.DObject; +import com.threerings.presents.dobj.DObject; public class FloatFieldMarshaller implements FieldMarshaller { diff --git a/src/java/com/threerings/presents/io/FramedInputStream.java b/src/java/com/threerings/presents/io/FramedInputStream.java index 596ea9747..7d500ff20 100644 --- a/src/java/com/threerings/presents/io/FramedInputStream.java +++ b/src/java/com/threerings/presents/io/FramedInputStream.java @@ -1,7 +1,7 @@ // -// $Id: FramedInputStream.java,v 1.6 2001/08/21 23:26:21 mdb Exp $ +// $Id: FramedInputStream.java,v 1.7 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.io; +package com.threerings.presents.io; import java.io.EOFException; import java.io.IOException; @@ -9,7 +9,7 @@ import java.io.InputStream; import com.samskivert.util.StringUtil; -import com.threerings.cocktail.cher.Log; +import com.threerings.presents.Log; /** * The framed input stream reads input that was framed by a framing output diff --git a/src/java/com/threerings/presents/io/FramingOutputStream.java b/src/java/com/threerings/presents/io/FramingOutputStream.java index 2e9b45a11..b55be36dd 100644 --- a/src/java/com/threerings/presents/io/FramingOutputStream.java +++ b/src/java/com/threerings/presents/io/FramingOutputStream.java @@ -1,7 +1,7 @@ // -// $Id: FramingOutputStream.java,v 1.3 2001/05/30 23:58:31 mdb Exp $ +// $Id: FramingOutputStream.java,v 1.4 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.io; +package com.threerings.presents.io; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/java/com/threerings/presents/io/IntFieldMarshaller.java b/src/java/com/threerings/presents/io/IntFieldMarshaller.java index 81ef135f3..e7e560b61 100644 --- a/src/java/com/threerings/presents/io/IntFieldMarshaller.java +++ b/src/java/com/threerings/presents/io/IntFieldMarshaller.java @@ -1,14 +1,14 @@ // -// $Id: IntFieldMarshaller.java,v 1.3 2001/06/11 17:42:20 mdb Exp $ +// $Id: IntFieldMarshaller.java,v 1.4 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj.io; +package com.threerings.presents.dobj.io; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.lang.reflect.Field; -import com.threerings.cocktail.cher.dobj.DObject; +import com.threerings.presents.dobj.DObject; public class IntFieldMarshaller implements FieldMarshaller { diff --git a/src/java/com/threerings/presents/io/LongFieldMarshaller.java b/src/java/com/threerings/presents/io/LongFieldMarshaller.java index 86bfd7f2c..7dd82d0e0 100644 --- a/src/java/com/threerings/presents/io/LongFieldMarshaller.java +++ b/src/java/com/threerings/presents/io/LongFieldMarshaller.java @@ -1,14 +1,14 @@ // -// $Id: LongFieldMarshaller.java,v 1.3 2001/06/11 17:42:20 mdb Exp $ +// $Id: LongFieldMarshaller.java,v 1.4 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj.io; +package com.threerings.presents.dobj.io; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.lang.reflect.Field; -import com.threerings.cocktail.cher.dobj.DObject; +import com.threerings.presents.dobj.DObject; public class LongFieldMarshaller implements FieldMarshaller { diff --git a/src/java/com/threerings/presents/io/Marshaller.java b/src/java/com/threerings/presents/io/Marshaller.java index 45d2cd725..dc9dbd7b8 100644 --- a/src/java/com/threerings/presents/io/Marshaller.java +++ b/src/java/com/threerings/presents/io/Marshaller.java @@ -1,7 +1,7 @@ // -// $Id: Marshaller.java,v 1.4 2001/06/11 17:42:20 mdb Exp $ +// $Id: Marshaller.java,v 1.5 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj.io; +package com.threerings.presents.dobj.io; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -13,9 +13,9 @@ import java.util.Arrays; import java.util.ArrayList; import java.util.Comparator; -import com.threerings.cocktail.cher.Log; -import com.threerings.cocktail.cher.dobj.DObject; -import com.threerings.cocktail.cher.io.ObjectStreamException; +import com.threerings.presents.Log; +import com.threerings.presents.dobj.DObject; +import com.threerings.presents.io.ObjectStreamException; /** * The marshaller inspects the class with which it is constructed and diff --git a/src/java/com/threerings/presents/io/ObjectStreamException.java b/src/java/com/threerings/presents/io/ObjectStreamException.java index e0846c530..5f1d5df21 100644 --- a/src/java/com/threerings/presents/io/ObjectStreamException.java +++ b/src/java/com/threerings/presents/io/ObjectStreamException.java @@ -1,7 +1,7 @@ // -// $Id: ObjectStreamException.java,v 1.3 2001/05/30 23:58:31 mdb Exp $ +// $Id: ObjectStreamException.java,v 1.4 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.io; +package com.threerings.presents.io; import java.io.IOException; diff --git a/src/java/com/threerings/presents/io/OidListFieldMarshaller.java b/src/java/com/threerings/presents/io/OidListFieldMarshaller.java index 71a98f084..33037fa05 100644 --- a/src/java/com/threerings/presents/io/OidListFieldMarshaller.java +++ b/src/java/com/threerings/presents/io/OidListFieldMarshaller.java @@ -1,15 +1,15 @@ // -// $Id: OidListFieldMarshaller.java,v 1.1 2001/08/02 05:09:21 mdb Exp $ +// $Id: OidListFieldMarshaller.java,v 1.2 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj.io; +package com.threerings.presents.dobj.io; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.lang.reflect.Field; -import com.threerings.cocktail.cher.dobj.DObject; -import com.threerings.cocktail.cher.dobj.OidList; +import com.threerings.presents.dobj.DObject; +import com.threerings.presents.dobj.OidList; public class OidListFieldMarshaller implements FieldMarshaller { diff --git a/src/java/com/threerings/presents/io/ShortFieldMarshaller.java b/src/java/com/threerings/presents/io/ShortFieldMarshaller.java index 9a9068751..4c7792dc1 100644 --- a/src/java/com/threerings/presents/io/ShortFieldMarshaller.java +++ b/src/java/com/threerings/presents/io/ShortFieldMarshaller.java @@ -1,14 +1,14 @@ // -// $Id: ShortFieldMarshaller.java,v 1.3 2001/06/11 17:42:20 mdb Exp $ +// $Id: ShortFieldMarshaller.java,v 1.4 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj.io; +package com.threerings.presents.dobj.io; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.lang.reflect.Field; -import com.threerings.cocktail.cher.dobj.DObject; +import com.threerings.presents.dobj.DObject; public class ShortFieldMarshaller implements FieldMarshaller { diff --git a/src/java/com/threerings/presents/io/Streamable.java b/src/java/com/threerings/presents/io/Streamable.java index 5b3a1f1d8..400fc1316 100644 --- a/src/java/com/threerings/presents/io/Streamable.java +++ b/src/java/com/threerings/presents/io/Streamable.java @@ -1,7 +1,7 @@ // -// $Id: Streamable.java,v 1.1 2001/08/16 03:25:14 mdb Exp $ +// $Id: Streamable.java,v 1.2 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.io; +package com.threerings.presents.io; import java.io.IOException; import java.io.DataInputStream; diff --git a/src/java/com/threerings/presents/io/StringFieldMarshaller.java b/src/java/com/threerings/presents/io/StringFieldMarshaller.java index 2fbb80191..65cfb2e24 100644 --- a/src/java/com/threerings/presents/io/StringFieldMarshaller.java +++ b/src/java/com/threerings/presents/io/StringFieldMarshaller.java @@ -1,14 +1,14 @@ // -// $Id: StringFieldMarshaller.java,v 1.4 2001/06/11 17:42:20 mdb Exp $ +// $Id: StringFieldMarshaller.java,v 1.5 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj.io; +package com.threerings.presents.dobj.io; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; import java.lang.reflect.Field; -import com.threerings.cocktail.cher.dobj.DObject; +import com.threerings.presents.dobj.DObject; public class StringFieldMarshaller implements FieldMarshaller { diff --git a/src/java/com/threerings/presents/io/TypedObject.java b/src/java/com/threerings/presents/io/TypedObject.java index 0ba3125fe..c310db1a5 100644 --- a/src/java/com/threerings/presents/io/TypedObject.java +++ b/src/java/com/threerings/presents/io/TypedObject.java @@ -1,7 +1,7 @@ // -// $Id: TypedObject.java,v 1.4 2001/08/16 03:25:14 mdb Exp $ +// $Id: TypedObject.java,v 1.5 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.io; +package com.threerings.presents.io; /** * A typed object is one that is associated with a particular type code. diff --git a/src/java/com/threerings/presents/io/TypedObjectFactory.java b/src/java/com/threerings/presents/io/TypedObjectFactory.java index 8ecc18f7d..1a819e2d0 100644 --- a/src/java/com/threerings/presents/io/TypedObjectFactory.java +++ b/src/java/com/threerings/presents/io/TypedObjectFactory.java @@ -1,14 +1,14 @@ // -// $Id: TypedObjectFactory.java,v 1.6 2001/06/13 05:16:25 mdb Exp $ +// $Id: TypedObjectFactory.java,v 1.7 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.io; +package com.threerings.presents.io; import java.io.IOException; import java.io.DataInputStream; import java.io.DataOutputStream; import java.util.HashMap; -import com.threerings.cocktail.cher.Log; +import com.threerings.presents.Log; /** * The encodable factory is used to unserialize encodable object instances diff --git a/src/java/com/threerings/presents/io/TypedObjectRegistry.java b/src/java/com/threerings/presents/io/TypedObjectRegistry.java index 083a718b5..9b19e4743 100644 --- a/src/java/com/threerings/presents/io/TypedObjectRegistry.java +++ b/src/java/com/threerings/presents/io/TypedObjectRegistry.java @@ -1,10 +1,10 @@ // -// $Id: TypedObjectRegistry.java,v 1.6 2001/08/16 03:31:09 mdb Exp $ +// $Id: TypedObjectRegistry.java,v 1.7 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.io; +package com.threerings.presents.io; -import com.threerings.cocktail.cher.dobj.*; -import com.threerings.cocktail.cher.net.*; +import com.threerings.presents.dobj.*; +import com.threerings.presents.net.*; /** * The registry provides a single place where all typed objects that are diff --git a/src/java/com/threerings/presents/io/ValueMarshaller.java b/src/java/com/threerings/presents/io/ValueMarshaller.java index 39326307d..17390024a 100644 --- a/src/java/com/threerings/presents/io/ValueMarshaller.java +++ b/src/java/com/threerings/presents/io/ValueMarshaller.java @@ -1,13 +1,13 @@ // -// $Id: ValueMarshaller.java,v 1.4 2001/10/03 03:38:55 mdb Exp $ +// $Id: ValueMarshaller.java,v 1.5 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.dobj.io; +package com.threerings.presents.dobj.io; import java.io.*; import java.util.HashMap; import com.samskivert.util.HashIntMap; -import com.threerings.cocktail.cher.io.Streamable; +import com.threerings.presents.io.Streamable; /** * The value marshaller provides a mechanism for marshalling and @@ -37,7 +37,7 @@ public class ValueMarshaller * The value must be one of the valid distributed object attribute * types. * - * @see com.threerings.cocktail.cher.dobj.DObject + * @see com.threerings.presents.dobj.DObject * @see #readFrom */ public static void writeTo (DataOutputStream out, Object value) diff --git a/src/java/com/threerings/presents/net/AuthRequest.java b/src/java/com/threerings/presents/net/AuthRequest.java index e64850e9a..5a877b6cb 100644 --- a/src/java/com/threerings/presents/net/AuthRequest.java +++ b/src/java/com/threerings/presents/net/AuthRequest.java @@ -1,13 +1,13 @@ // -// $Id: AuthRequest.java,v 1.6 2001/07/19 19:30:14 mdb Exp $ +// $Id: AuthRequest.java,v 1.7 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.net; +package com.threerings.presents.net; import java.io.IOException; import java.io.DataInputStream; import java.io.DataOutputStream; -import com.threerings.cocktail.cher.io.TypedObjectFactory; +import com.threerings.presents.io.TypedObjectFactory; public class AuthRequest extends UpstreamMessage { diff --git a/src/java/com/threerings/presents/net/AuthResponse.java b/src/java/com/threerings/presents/net/AuthResponse.java index b7b89ba82..39e6efc07 100644 --- a/src/java/com/threerings/presents/net/AuthResponse.java +++ b/src/java/com/threerings/presents/net/AuthResponse.java @@ -1,13 +1,13 @@ // -// $Id: AuthResponse.java,v 1.8 2001/07/19 19:30:14 mdb Exp $ +// $Id: AuthResponse.java,v 1.9 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.net; +package com.threerings.presents.net; import java.io.IOException; import java.io.DataInputStream; import java.io.DataOutputStream; -import com.threerings.cocktail.cher.dobj.io.DObjectFactory; +import com.threerings.presents.dobj.io.DObjectFactory; /** * The auth response communicates authentication success or failure as diff --git a/src/java/com/threerings/presents/net/AuthResponseData.java b/src/java/com/threerings/presents/net/AuthResponseData.java index 8aea974d4..693279544 100644 --- a/src/java/com/threerings/presents/net/AuthResponseData.java +++ b/src/java/com/threerings/presents/net/AuthResponseData.java @@ -1,9 +1,9 @@ // -// $Id: AuthResponseData.java,v 1.8 2001/10/03 03:41:04 mdb Exp $ +// $Id: AuthResponseData.java,v 1.9 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.net; +package com.threerings.presents.net; -import com.threerings.cocktail.cher.dobj.DObject; +import com.threerings.presents.dobj.DObject; /** * An AuthResponseData object is communicated back to the diff --git a/src/java/com/threerings/presents/net/BootstrapData.java b/src/java/com/threerings/presents/net/BootstrapData.java index 840712568..f84ca8fd2 100644 --- a/src/java/com/threerings/presents/net/BootstrapData.java +++ b/src/java/com/threerings/presents/net/BootstrapData.java @@ -1,9 +1,9 @@ // -// $Id: BootstrapData.java,v 1.2 2001/10/09 18:17:52 mdb Exp $ +// $Id: BootstrapData.java,v 1.3 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.net; +package com.threerings.presents.net; -import com.threerings.cocktail.cher.dobj.DObject; +import com.threerings.presents.dobj.DObject; /** * A BootstrapData object is communicated back to the client diff --git a/src/java/com/threerings/presents/net/BootstrapNotification.java b/src/java/com/threerings/presents/net/BootstrapNotification.java index 1d8213a6a..cfc8c0cf6 100644 --- a/src/java/com/threerings/presents/net/BootstrapNotification.java +++ b/src/java/com/threerings/presents/net/BootstrapNotification.java @@ -1,13 +1,13 @@ // -// $Id: BootstrapNotification.java,v 1.2 2001/07/19 19:30:14 mdb Exp $ +// $Id: BootstrapNotification.java,v 1.3 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.net; +package com.threerings.presents.net; import java.io.IOException; import java.io.DataInputStream; import java.io.DataOutputStream; -import com.threerings.cocktail.cher.dobj.io.DObjectFactory; +import com.threerings.presents.dobj.io.DObjectFactory; /** * A bootstrap notification is delivered to the client once the server has diff --git a/src/java/com/threerings/presents/net/Credentials.java b/src/java/com/threerings/presents/net/Credentials.java index be2a1d82e..e11bb1e29 100644 --- a/src/java/com/threerings/presents/net/Credentials.java +++ b/src/java/com/threerings/presents/net/Credentials.java @@ -1,14 +1,14 @@ // -// $Id: Credentials.java,v 1.6 2001/07/19 19:30:14 mdb Exp $ +// $Id: Credentials.java,v 1.7 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.net; +package com.threerings.presents.net; import java.io.IOException; import java.io.DataInputStream; import java.io.DataOutputStream; -import com.threerings.cocktail.cher.io.TypedObject; -import com.threerings.cocktail.cher.io.TypedObjectFactory; +import com.threerings.presents.io.TypedObject; +import com.threerings.presents.io.TypedObjectFactory; /** * Credentials are supplied by the client implementation and sent along to diff --git a/src/java/com/threerings/presents/net/DownstreamMessage.java b/src/java/com/threerings/presents/net/DownstreamMessage.java index 82f41dfd4..6cf62b323 100644 --- a/src/java/com/threerings/presents/net/DownstreamMessage.java +++ b/src/java/com/threerings/presents/net/DownstreamMessage.java @@ -1,13 +1,13 @@ // -// $Id: DownstreamMessage.java,v 1.7 2001/07/19 19:30:14 mdb Exp $ +// $Id: DownstreamMessage.java,v 1.8 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.net; +package com.threerings.presents.net; import java.io.IOException; import java.io.DataInputStream; import java.io.DataOutputStream; -import com.threerings.cocktail.cher.io.TypedObject; +import com.threerings.presents.io.TypedObject; /** * The DownstreamMessage class encapsulates a message in the diff --git a/src/java/com/threerings/presents/net/EventNotification.java b/src/java/com/threerings/presents/net/EventNotification.java index bd91ae937..739fee737 100644 --- a/src/java/com/threerings/presents/net/EventNotification.java +++ b/src/java/com/threerings/presents/net/EventNotification.java @@ -1,14 +1,14 @@ // -// $Id: EventNotification.java,v 1.9 2001/07/19 19:30:14 mdb Exp $ +// $Id: EventNotification.java,v 1.10 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.net; +package com.threerings.presents.net; import java.io.IOException; import java.io.DataInputStream; import java.io.DataOutputStream; -import com.threerings.cocktail.cher.dobj.TypedEvent; -import com.threerings.cocktail.cher.io.TypedObjectFactory; +import com.threerings.presents.dobj.TypedEvent; +import com.threerings.presents.io.TypedObjectFactory; public class EventNotification extends DownstreamMessage { diff --git a/src/java/com/threerings/presents/net/FailureResponse.java b/src/java/com/threerings/presents/net/FailureResponse.java index 61207e3ef..af6a4b2b6 100644 --- a/src/java/com/threerings/presents/net/FailureResponse.java +++ b/src/java/com/threerings/presents/net/FailureResponse.java @@ -1,7 +1,7 @@ // -// $Id: FailureResponse.java,v 1.6 2001/07/19 19:30:14 mdb Exp $ +// $Id: FailureResponse.java,v 1.7 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.net; +package com.threerings.presents.net; import java.io.IOException; import java.io.DataInputStream; diff --git a/src/java/com/threerings/presents/net/ForwardEventRequest.java b/src/java/com/threerings/presents/net/ForwardEventRequest.java index 4b4a0a9b2..0c341f55c 100644 --- a/src/java/com/threerings/presents/net/ForwardEventRequest.java +++ b/src/java/com/threerings/presents/net/ForwardEventRequest.java @@ -1,14 +1,14 @@ // -// $Id: ForwardEventRequest.java,v 1.8 2001/07/19 19:30:14 mdb Exp $ +// $Id: ForwardEventRequest.java,v 1.9 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.net; +package com.threerings.presents.net; import java.io.IOException; import java.io.DataInputStream; import java.io.DataOutputStream; -import com.threerings.cocktail.cher.dobj.TypedEvent; -import com.threerings.cocktail.cher.io.TypedObjectFactory; +import com.threerings.presents.dobj.TypedEvent; +import com.threerings.presents.io.TypedObjectFactory; public class ForwardEventRequest extends UpstreamMessage { diff --git a/src/java/com/threerings/presents/net/LogoffRequest.java b/src/java/com/threerings/presents/net/LogoffRequest.java index a1b82ef96..ffcc5be22 100644 --- a/src/java/com/threerings/presents/net/LogoffRequest.java +++ b/src/java/com/threerings/presents/net/LogoffRequest.java @@ -1,7 +1,7 @@ // -// $Id: LogoffRequest.java,v 1.4 2001/07/19 19:30:14 mdb Exp $ +// $Id: LogoffRequest.java,v 1.5 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.net; +package com.threerings.presents.net; public class LogoffRequest extends UpstreamMessage { diff --git a/src/java/com/threerings/presents/net/ObjectResponse.java b/src/java/com/threerings/presents/net/ObjectResponse.java index 344bddba3..74bb808c0 100644 --- a/src/java/com/threerings/presents/net/ObjectResponse.java +++ b/src/java/com/threerings/presents/net/ObjectResponse.java @@ -1,14 +1,14 @@ // -// $Id: ObjectResponse.java,v 1.10 2001/07/19 19:30:14 mdb Exp $ +// $Id: ObjectResponse.java,v 1.11 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.net; +package com.threerings.presents.net; import java.io.IOException; import java.io.DataInputStream; import java.io.DataOutputStream; -import com.threerings.cocktail.cher.dobj.DObject; -import com.threerings.cocktail.cher.dobj.io.DObjectFactory; +import com.threerings.presents.dobj.DObject; +import com.threerings.presents.dobj.io.DObjectFactory; public class ObjectResponse extends DownstreamMessage { diff --git a/src/java/com/threerings/presents/net/PingRequest.java b/src/java/com/threerings/presents/net/PingRequest.java index f8aa6c452..4c87a814d 100644 --- a/src/java/com/threerings/presents/net/PingRequest.java +++ b/src/java/com/threerings/presents/net/PingRequest.java @@ -1,7 +1,7 @@ // -// $Id: PingRequest.java,v 1.4 2001/07/19 19:30:14 mdb Exp $ +// $Id: PingRequest.java,v 1.5 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.net; +package com.threerings.presents.net; public class PingRequest extends UpstreamMessage { diff --git a/src/java/com/threerings/presents/net/PongResponse.java b/src/java/com/threerings/presents/net/PongResponse.java index 461c40be3..2065a5a9e 100644 --- a/src/java/com/threerings/presents/net/PongResponse.java +++ b/src/java/com/threerings/presents/net/PongResponse.java @@ -1,7 +1,7 @@ // -// $Id: PongResponse.java,v 1.5 2001/07/19 19:30:14 mdb Exp $ +// $Id: PongResponse.java,v 1.6 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.net; +package com.threerings.presents.net; public class PongResponse extends DownstreamMessage { diff --git a/src/java/com/threerings/presents/net/SubscribeRequest.java b/src/java/com/threerings/presents/net/SubscribeRequest.java index c9ade4e0e..a8483ca74 100644 --- a/src/java/com/threerings/presents/net/SubscribeRequest.java +++ b/src/java/com/threerings/presents/net/SubscribeRequest.java @@ -1,7 +1,7 @@ // -// $Id: SubscribeRequest.java,v 1.4 2001/07/19 19:30:14 mdb Exp $ +// $Id: SubscribeRequest.java,v 1.5 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.net; +package com.threerings.presents.net; import java.io.IOException; import java.io.DataInputStream; diff --git a/src/java/com/threerings/presents/net/UnsubscribeRequest.java b/src/java/com/threerings/presents/net/UnsubscribeRequest.java index ef0b20143..6b19d1a47 100644 --- a/src/java/com/threerings/presents/net/UnsubscribeRequest.java +++ b/src/java/com/threerings/presents/net/UnsubscribeRequest.java @@ -1,7 +1,7 @@ // -// $Id: UnsubscribeRequest.java,v 1.5 2001/07/19 19:30:14 mdb Exp $ +// $Id: UnsubscribeRequest.java,v 1.6 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.net; +package com.threerings.presents.net; import java.io.IOException; import java.io.DataInputStream; diff --git a/src/java/com/threerings/presents/net/UpstreamMessage.java b/src/java/com/threerings/presents/net/UpstreamMessage.java index 404f8d75a..cdb1c17c0 100644 --- a/src/java/com/threerings/presents/net/UpstreamMessage.java +++ b/src/java/com/threerings/presents/net/UpstreamMessage.java @@ -1,13 +1,13 @@ // -// $Id: UpstreamMessage.java,v 1.7 2001/07/19 19:30:14 mdb Exp $ +// $Id: UpstreamMessage.java,v 1.8 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.net; +package com.threerings.presents.net; import java.io.IOException; import java.io.DataInputStream; import java.io.DataOutputStream; -import com.threerings.cocktail.cher.io.TypedObject; +import com.threerings.presents.io.TypedObject; /** * The UpstreamMessage class encapsulates a message in the diff --git a/src/java/com/threerings/presents/net/UsernamePasswordCreds.java b/src/java/com/threerings/presents/net/UsernamePasswordCreds.java index 257961515..495f4d25f 100644 --- a/src/java/com/threerings/presents/net/UsernamePasswordCreds.java +++ b/src/java/com/threerings/presents/net/UsernamePasswordCreds.java @@ -1,7 +1,7 @@ // -// $Id: UsernamePasswordCreds.java,v 1.5 2001/06/02 01:30:37 mdb Exp $ +// $Id: UsernamePasswordCreds.java,v 1.6 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.net; +package com.threerings.presents.net; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/java/com/threerings/presents/server/Authenticator.java b/src/java/com/threerings/presents/server/Authenticator.java index c8b116b90..a4a09827f 100644 --- a/src/java/com/threerings/presents/server/Authenticator.java +++ b/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 diff --git a/src/java/com/threerings/presents/server/ClientManager.java b/src/java/com/threerings/presents/server/ClientManager.java index 0bd585489..d18480fc1 100644 --- a/src/java/com/threerings/presents/server/ClientManager.java +++ b/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 CherClient to managed newly accepted client + * class of PresentsClient 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 * ClientObject 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 CherClient object when it is + * is only used by the PresentsClient 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; } diff --git a/src/java/com/threerings/presents/server/DummyAuthenticator.java b/src/java/com/threerings/presents/server/DummyAuthenticator.java index 3b9a9ac31..ae22cb37f 100644 --- a/src/java/com/threerings/presents/server/DummyAuthenticator.java +++ b/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 { diff --git a/src/java/com/threerings/presents/server/InvocationManager.java b/src/java/com/threerings/presents/server/InvocationManager.java index 81242cc66..37b5d5c9c 100644 --- a/src/java/com/threerings/presents/server/InvocationManager.java +++ b/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 " + diff --git a/src/java/com/threerings/presents/server/InvocationProvider.java b/src/java/com/threerings/presents/server/InvocationProvider.java index fad4243e3..4c6cf0cf8 100644 --- a/src/java/com/threerings/presents/server/InvocationProvider.java +++ b/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 " + diff --git a/src/java/com/threerings/presents/server/PresentsClient.java b/src/java/com/threerings/presents/server/PresentsClient.java index cfe868d52..9c71e8307 100644 --- a/src/java/com/threerings/presents/server/PresentsClient.java +++ b/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 + "]."); diff --git a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java index 3e8dca145..4ebc84edb 100644 --- a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java +++ b/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 - * 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. + * 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. * *

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 { diff --git a/src/java/com/threerings/presents/server/PresentsServer.java b/src/java/com/threerings/presents/server/PresentsServer.java index 3e21f494d..963e81474 100644 --- a/src/java/com/threerings/presents/server/PresentsServer.java +++ b/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 CherServer 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 PresentsServer + * 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"; diff --git a/src/java/com/threerings/presents/server/ServiceFailedException.java b/src/java/com/threerings/presents/server/ServiceFailedException.java index 05e39741c..16e4c9d65 100644 --- a/src/java/com/threerings/presents/server/ServiceFailedException.java +++ b/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 diff --git a/src/java/com/threerings/presents/server/net/AuthManager.java b/src/java/com/threerings/presents/server/net/AuthManager.java index bc13013be..9c42fbc0f 100644 --- a/src/java/com/threerings/presents/server/net/AuthManager.java +++ b/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. diff --git a/src/java/com/threerings/presents/server/net/AuthingConnection.java b/src/java/com/threerings/presents/server/net/AuthingConnection.java index 47406b3a2..7b57f6347 100644 --- a/src/java/com/threerings/presents/server/net/AuthingConnection.java +++ b/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 diff --git a/src/java/com/threerings/presents/server/net/Connection.java b/src/java/com/threerings/presents/server/net/Connection.java index dbddf5e7c..ab10c6587 100644 --- a/src/java/com/threerings/presents/server/net/Connection.java +++ b/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 diff --git a/src/java/com/threerings/presents/server/net/ConnectionManager.java b/src/java/com/threerings/presents/server/net/ConnectionManager.java index b917ac5ce..b55239865 100644 --- a/src/java/com/threerings/presents/server/net/ConnectionManager.java +++ b/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; diff --git a/src/java/com/threerings/presents/server/net/ConnectionObserver.java b/src/java/com/threerings/presents/server/net/ConnectionObserver.java index 539323e17..6ff8b6676 100644 --- a/src/java/com/threerings/presents/server/net/ConnectionObserver.java +++ b/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 diff --git a/src/java/com/threerings/presents/server/net/MessageHandler.java b/src/java/com/threerings/presents/server/net/MessageHandler.java index 0c7de45fa..6dddc40d1 100644 --- a/src/java/com/threerings/presents/server/net/MessageHandler.java +++ b/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 diff --git a/src/java/com/threerings/presents/server/net/NetEventHandler.java b/src/java/com/threerings/presents/server/net/NetEventHandler.java index 80576e41e..1365661c3 100644 --- a/src/java/com/threerings/presents/server/net/NetEventHandler.java +++ b/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; diff --git a/src/java/com/threerings/presents/server/net/RunningConnection.java b/src/java/com/threerings/presents/server/net/RunningConnection.java index 98357b320..57b1666bc 100644 --- a/src/java/com/threerings/presents/server/net/RunningConnection.java +++ b/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 diff --git a/src/java/com/threerings/presents/util/ClassUtil.java b/src/java/com/threerings/presents/util/ClassUtil.java index 6f1906f5d..b02569715 100644 --- a/src/java/com/threerings/presents/util/ClassUtil.java +++ b/src/java/com/threerings/presents/util/ClassUtil.java @@ -1,7 +1,7 @@ // -// $Id: ClassUtil.java,v 1.3 2001/10/03 03:38:21 mdb Exp $ +// $Id: ClassUtil.java,v 1.4 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.util; +package com.threerings.presents.util; import java.lang.reflect.Method; import java.util.HashMap; @@ -9,7 +9,7 @@ import java.util.HashMap; import com.samskivert.util.MethodFinder; import com.samskivert.util.StringUtil; -import com.threerings.cocktail.cher.Log; +import com.threerings.presents.Log; /** * Class related utility functions. diff --git a/src/java/com/threerings/presents/util/Invoker.java b/src/java/com/threerings/presents/util/Invoker.java index 1b593137c..2587ce01d 100644 --- a/src/java/com/threerings/presents/util/Invoker.java +++ b/src/java/com/threerings/presents/util/Invoker.java @@ -1,13 +1,13 @@ // -// $Id: Invoker.java,v 1.2 2001/08/14 06:48:31 mdb Exp $ +// $Id: Invoker.java,v 1.3 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.util; +package com.threerings.presents.util; import com.samskivert.util.LoopingThread; import com.samskivert.util.Queue; -import com.threerings.cocktail.cher.Log; -import com.threerings.cocktail.cher.server.CherServer; +import com.threerings.presents.Log; +import com.threerings.presents.server.PresentsServer; /** * The invoker is used to invoke self-contained units of code on an @@ -19,7 +19,7 @@ import com.threerings.cocktail.cher.server.CherServer; * *

The invoker is a useful tool for services that need to block and * therefore cannot be run on the distributed object thread. For example, - * a user of the Cher system might provide an invoker on which to run + * a user of the Presents system might provide an invoker on which to run * database queries. * *

Bear in mind that each invoker instance runs units on its own @@ -102,7 +102,7 @@ public class Invoker extends LoopingThread if (((Unit)unit).invoke()) { // if it returned true, we post it to the dobjmgr // thread to invoke the result processing - CherServer.omgr.postUnit((Runnable)unit); + PresentsServer.omgr.postUnit((Runnable)unit); } } catch (Exception e) { diff --git a/src/java/com/threerings/presents/util/PresentsContext.java b/src/java/com/threerings/presents/util/PresentsContext.java index 2ec8752e1..38d6e9adf 100644 --- a/src/java/com/threerings/presents/util/PresentsContext.java +++ b/src/java/com/threerings/presents/util/PresentsContext.java @@ -1,14 +1,14 @@ // -// $Id: PresentsContext.java,v 1.3 2001/07/21 01:06:24 mdb Exp $ +// $Id: PresentsContext.java,v 1.4 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.util; +package com.threerings.presents.util; import com.samskivert.util.Context; -import com.threerings.cocktail.cher.client.Client; -import com.threerings.cocktail.cher.dobj.DObjectManager; +import com.threerings.presents.client.Client; +import com.threerings.presents.dobj.DObjectManager; -public interface CherContext extends Context +public interface PresentsContext extends Context { /** * Returns a reference to the client. This reference should be valid diff --git a/src/java/com/threerings/presents/util/StreamableArrayList.java b/src/java/com/threerings/presents/util/StreamableArrayList.java index 0de48d4d8..972793272 100644 --- a/src/java/com/threerings/presents/util/StreamableArrayList.java +++ b/src/java/com/threerings/presents/util/StreamableArrayList.java @@ -1,14 +1,14 @@ // -// $Id: StreamableArrayList.java,v 1.1 2001/10/04 23:02:07 mdb Exp $ +// $Id: StreamableArrayList.java,v 1.2 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.util; +package com.threerings.presents.util; import java.io.IOException; import java.io.DataInputStream; import java.io.DataOutputStream; import java.util.ArrayList; -import com.threerings.cocktail.cher.io.Streamable; +import com.threerings.presents.io.Streamable; /** * Provides a means by which an ordered collection of streamable instances @@ -17,7 +17,7 @@ import com.threerings.cocktail.cher.io.Streamable; * object value can be supplied, but bear in mind that once the list is * created, it's elements cannot be changed without rebroadcasting the * entire list. It is not like a {@link - * com.threerings.cocktail.cher.dobj.DSet} which allows individual + * com.threerings.presents.dobj.DSet} which allows individual * elements to be added or removed. */ public class StreamableArrayList diff --git a/src/java/com/threerings/whirled/client/SceneCodes.java b/src/java/com/threerings/whirled/client/SceneCodes.java index 6a8fdf57a..477b9f376 100644 --- a/src/java/com/threerings/whirled/client/SceneCodes.java +++ b/src/java/com/threerings/whirled/client/SceneCodes.java @@ -1,9 +1,9 @@ // -// $Id: SceneCodes.java,v 1.1 2001/10/01 22:16:02 mdb Exp $ +// $Id: SceneCodes.java,v 1.2 2001/10/11 04:07:54 mdb Exp $ package com.threerings.whirled.client; -import com.threerings.cocktail.party.client.LocationCodes; +import com.threerings.crowd.client.LocationCodes; /** * Contains codes used by the scene invocation services. diff --git a/src/java/com/threerings/whirled/client/SceneDirector.java b/src/java/com/threerings/whirled/client/SceneDirector.java index 64e11b29c..3d491b3e2 100644 --- a/src/java/com/threerings/whirled/client/SceneDirector.java +++ b/src/java/com/threerings/whirled/client/SceneDirector.java @@ -1,18 +1,18 @@ // -// $Id: SceneDirector.java,v 1.5 2001/10/05 23:59:36 mdb Exp $ +// $Id: SceneDirector.java,v 1.6 2001/10/11 04:07:54 mdb Exp $ package com.threerings.whirled.client; import java.io.IOException; import com.samskivert.util.HashIntMap; -import com.threerings.cocktail.cher.dobj.DObject; -import com.threerings.cocktail.cher.dobj.ObjectAccessException; +import com.threerings.presents.dobj.DObject; +import com.threerings.presents.dobj.ObjectAccessException; -import com.threerings.cocktail.party.client.LocationDirector; -import com.threerings.cocktail.party.client.LocationObserver; -import com.threerings.cocktail.party.data.PlaceConfig; -import com.threerings.cocktail.party.data.PlaceObject; +import com.threerings.crowd.client.LocationDirector; +import com.threerings.crowd.client.LocationObserver; +import com.threerings.crowd.data.PlaceConfig; +import com.threerings.crowd.data.PlaceObject; import com.threerings.whirled.Log; import com.threerings.whirled.client.persist.SceneRepository; @@ -29,9 +29,9 @@ import com.threerings.whirled.util.WhirledContext; * *

Note that when the scene director is in use instead of the location * director, scene ids instead of place oids will be supplied to {@link - * com.threerings.cocktail.party.client.LocationObserver#locationMayChange} + * com.threerings.crowd.client.LocationObserver#locationMayChange} * and {@link - * com.threerings.cocktail.party.client.LocationObserver#locationChangeFailed}. + * com.threerings.crowd.client.LocationObserver#locationChangeFailed}. */ public class SceneDirector extends LocationDirector implements SceneCodes diff --git a/src/java/com/threerings/whirled/client/SceneService.java b/src/java/com/threerings/whirled/client/SceneService.java index cbd70b1c0..af4652940 100644 --- a/src/java/com/threerings/whirled/client/SceneService.java +++ b/src/java/com/threerings/whirled/client/SceneService.java @@ -1,10 +1,10 @@ // -// $Id: SceneService.java,v 1.4 2001/10/02 02:08:16 mdb Exp $ +// $Id: SceneService.java,v 1.5 2001/10/11 04:07:54 mdb Exp $ package com.threerings.whirled.client; -import com.threerings.cocktail.cher.client.Client; -import com.threerings.cocktail.cher.client.InvocationDirector; +import com.threerings.presents.client.Client; +import com.threerings.presents.client.InvocationDirector; import com.threerings.whirled.Log; diff --git a/src/java/com/threerings/whirled/data/DummyScene.java b/src/java/com/threerings/whirled/data/DummyScene.java index 7182ad7e8..13413acdf 100644 --- a/src/java/com/threerings/whirled/data/DummyScene.java +++ b/src/java/com/threerings/whirled/data/DummyScene.java @@ -1,9 +1,9 @@ // -// $Id: DummyScene.java,v 1.4 2001/10/05 23:59:37 mdb Exp $ +// $Id: DummyScene.java,v 1.5 2001/10/11 04:07:54 mdb Exp $ package com.threerings.whirled.test; -import com.threerings.cocktail.party.data.PlaceConfig; +import com.threerings.crowd.data.PlaceConfig; import com.threerings.whirled.data.Scene; public class DummyScene implements Scene diff --git a/src/java/com/threerings/whirled/data/Scene.java b/src/java/com/threerings/whirled/data/Scene.java index cf01aa730..187197fec 100644 --- a/src/java/com/threerings/whirled/data/Scene.java +++ b/src/java/com/threerings/whirled/data/Scene.java @@ -1,9 +1,9 @@ // -// $Id: Scene.java,v 1.5 2001/10/05 23:59:36 mdb Exp $ +// $Id: Scene.java,v 1.6 2001/10/11 04:07:54 mdb Exp $ package com.threerings.whirled.data; -import com.threerings.cocktail.party.data.PlaceConfig; +import com.threerings.crowd.data.PlaceConfig; /** * The base scene interface. This encapsulates the minimum information diff --git a/src/java/com/threerings/whirled/data/SceneObject.java b/src/java/com/threerings/whirled/data/SceneObject.java index 10e910594..3ab640f9f 100644 --- a/src/java/com/threerings/whirled/data/SceneObject.java +++ b/src/java/com/threerings/whirled/data/SceneObject.java @@ -1,9 +1,9 @@ // -// $Id: SceneObject.java,v 1.1 2001/08/11 04:09:50 mdb Exp $ +// $Id: SceneObject.java,v 1.2 2001/10/11 04:07:54 mdb Exp $ package com.threerings.whirled.data; -import com.threerings.cocktail.party.data.PlaceObject; +import com.threerings.crowd.data.PlaceObject; public class SceneObject extends PlaceObject { diff --git a/src/java/com/threerings/whirled/server/SceneManager.java b/src/java/com/threerings/whirled/server/SceneManager.java index c96787ed7..e93a99d4e 100644 --- a/src/java/com/threerings/whirled/server/SceneManager.java +++ b/src/java/com/threerings/whirled/server/SceneManager.java @@ -1,11 +1,11 @@ // -// $Id: SceneManager.java,v 1.5 2001/10/05 23:59:36 mdb Exp $ +// $Id: SceneManager.java,v 1.6 2001/10/11 04:07:54 mdb Exp $ package com.threerings.whirled.server; -import com.threerings.cocktail.party.chat.ChatMessageHandler; -import com.threerings.cocktail.party.chat.ChatService; -import com.threerings.cocktail.party.server.PlaceManager; +import com.threerings.crowd.chat.ChatMessageHandler; +import com.threerings.crowd.chat.ChatService; +import com.threerings.crowd.server.PlaceManager; import com.threerings.whirled.data.Scene; diff --git a/src/java/com/threerings/whirled/server/SceneProvider.java b/src/java/com/threerings/whirled/server/SceneProvider.java index 23bb5897c..d08c17eeb 100644 --- a/src/java/com/threerings/whirled/server/SceneProvider.java +++ b/src/java/com/threerings/whirled/server/SceneProvider.java @@ -1,13 +1,13 @@ // -// $Id: SceneProvider.java,v 1.3 2001/10/05 23:59:36 mdb Exp $ +// $Id: SceneProvider.java,v 1.4 2001/10/11 04:07:54 mdb Exp $ package com.threerings.whirled.server; -import com.threerings.cocktail.cher.server.InvocationProvider; -import com.threerings.cocktail.cher.server.ServiceFailedException; +import com.threerings.presents.server.InvocationProvider; +import com.threerings.presents.server.ServiceFailedException; -import com.threerings.cocktail.party.data.*; -import com.threerings.cocktail.party.server.LocationProvider; +import com.threerings.crowd.data.*; +import com.threerings.crowd.server.LocationProvider; import com.threerings.whirled.Log; import com.threerings.whirled.client.SceneCodes; diff --git a/src/java/com/threerings/whirled/server/SceneRegistry.java b/src/java/com/threerings/whirled/server/SceneRegistry.java index e3ec8a1a4..5e703dcab 100644 --- a/src/java/com/threerings/whirled/server/SceneRegistry.java +++ b/src/java/com/threerings/whirled/server/SceneRegistry.java @@ -1,5 +1,5 @@ // -// $Id: SceneRegistry.java,v 1.4 2001/10/05 23:59:36 mdb Exp $ +// $Id: SceneRegistry.java,v 1.5 2001/10/11 04:07:54 mdb Exp $ package com.threerings.whirled.server; @@ -7,9 +7,9 @@ import java.util.ArrayList; import java.util.Properties; import com.samskivert.util.HashIntMap; -import com.threerings.cocktail.cher.util.Invoker; +import com.threerings.presents.util.Invoker; -import com.threerings.cocktail.party.server.PartyServer; +import com.threerings.crowd.server.CrowdServer; import com.threerings.whirled.Log; import com.threerings.whirled.data.Scene; @@ -161,7 +161,7 @@ public class SceneRegistry try { SceneManager scmgr = (SceneManager) - PartyServer.plreg.createPlace(scene.getPlaceConfig()); + CrowdServer.plreg.createPlace(scene.getPlaceConfig()); // configure the scene manager with references to useful // stuff; we'll somehow need to convey configuration diff --git a/src/java/com/threerings/whirled/server/WhirledServer.java b/src/java/com/threerings/whirled/server/WhirledServer.java index 7cae22caa..e5dc0ae6e 100644 --- a/src/java/com/threerings/whirled/server/WhirledServer.java +++ b/src/java/com/threerings/whirled/server/WhirledServer.java @@ -1,5 +1,5 @@ // -// $Id: WhirledServer.java,v 1.6 2001/10/05 23:59:36 mdb Exp $ +// $Id: WhirledServer.java,v 1.7 2001/10/11 04:07:54 mdb Exp $ package com.threerings.whirled.server; @@ -7,17 +7,17 @@ import com.samskivert.jdbc.ConnectionProvider; import com.samskivert.jdbc.StaticConnectionProvider; import com.samskivert.util.Config; -import com.threerings.cocktail.party.server.PartyServer; +import com.threerings.crowd.server.CrowdServer; import com.threerings.whirled.Log; import com.threerings.whirled.server.persist.SceneRepository; import com.threerings.whirled.test.DummySceneRepository; /** - * The whirled server extends the party server and provides access to + * The whirled server extends the crowd server and provides access to * managers and the like that are needed by the whirled serviecs. */ -public class WhirledServer extends PartyServer +public class WhirledServer extends CrowdServer { /** The namespace used for server config properties. */ public static final String CONFIG_KEY = "whirled"; @@ -34,7 +34,7 @@ public class WhirledServer extends PartyServer public void init () throws Exception { - // do the cher server initialization + // do the base server initialization super.init(); // bind the whirled server config into the namespace diff --git a/src/java/com/threerings/whirled/util/WhirledContext.java b/src/java/com/threerings/whirled/util/WhirledContext.java index 29c82f132..ed749eaeb 100644 --- a/src/java/com/threerings/whirled/util/WhirledContext.java +++ b/src/java/com/threerings/whirled/util/WhirledContext.java @@ -1,16 +1,16 @@ // -// $Id: WhirledContext.java,v 1.2 2001/10/01 22:16:02 mdb Exp $ +// $Id: WhirledContext.java,v 1.3 2001/10/11 04:07:54 mdb Exp $ package com.threerings.whirled.util; -import com.threerings.cocktail.party.util.PartyContext; +import com.threerings.crowd.util.CrowdContext; import com.threerings.whirled.client.SceneDirector; /** * The whirled context provides access to the various managers, etc. that * are needed by the whirled client code. */ -public interface WhirledContext extends PartyContext +public interface WhirledContext extends CrowdContext { /** * Returns a reference to the scene director. diff --git a/tests/rsrc/config/presents/server.properties b/tests/rsrc/config/presents/server.properties index e76d61acd..6f4b1ab6b 100644 --- a/tests/rsrc/config/presents/server.properties +++ b/tests/rsrc/config/presents/server.properties @@ -1,9 +1,9 @@ # -# $Id: server.properties,v 1.1 2001/08/07 20:38:58 mdb Exp $ +# $Id: server.properties,v 1.2 2001/10/11 04:07:50 mdb Exp $ # -# Configuration for the Cher test server +# Configuration for the Presents test server # These invocation service providers will be registered with the # invocation manager during the server init process providers = \ - test = com.threerings.cocktail.cher.server.test.TestProvider + test = com.threerings.presents.server.test.TestProvider diff --git a/tests/src/java/com/threerings/crowd/client/TestClient.java b/tests/src/java/com/threerings/crowd/client/TestClient.java index 098f79dda..dc9693d1b 100644 --- a/tests/src/java/com/threerings/crowd/client/TestClient.java +++ b/tests/src/java/com/threerings/crowd/client/TestClient.java @@ -1,18 +1,18 @@ // -// $Id: TestClient.java,v 1.5 2001/10/09 17:20:03 mdb Exp $ +// $Id: TestClient.java,v 1.6 2001/10/11 04:07:51 mdb Exp $ -package com.threerings.cocktail.party.client.test; +package com.threerings.crowd.client.test; import com.samskivert.util.Config; import com.samskivert.util.Queue; -import com.threerings.cocktail.cher.client.*; -import com.threerings.cocktail.cher.dobj.DObjectManager; -import com.threerings.cocktail.cher.net.*; +import com.threerings.presents.client.*; +import com.threerings.presents.dobj.DObjectManager; +import com.threerings.presents.net.*; -import com.threerings.cocktail.party.Log; -import com.threerings.cocktail.party.client.*; -import com.threerings.cocktail.party.util.PartyContext; +import com.threerings.crowd.Log; +import com.threerings.crowd.client.*; +import com.threerings.crowd.util.CrowdContext; public class TestClient implements Client.Invoker, ClientObserver @@ -20,7 +20,7 @@ public class TestClient public TestClient (Credentials creds) { // create our context - _ctx = new PartyContextImpl(); + _ctx = new CrowdContextImpl(); // create the handles on our various services _config = new Config(); @@ -95,7 +95,7 @@ public class TestClient tclient.run(); } - protected class PartyContextImpl implements PartyContext + protected class CrowdContextImpl implements CrowdContext { public Config getConfig () { @@ -132,7 +132,7 @@ public class TestClient protected Client _client; protected LocationDirector _locdir; protected OccupantManager _occmgr; - protected PartyContext _ctx; + protected CrowdContext _ctx; protected Queue _queue = new Queue(); } diff --git a/tests/src/java/com/threerings/io/FrameTest.java b/tests/src/java/com/threerings/io/FrameTest.java index 35dee0d86..8852d1e57 100644 --- a/tests/src/java/com/threerings/io/FrameTest.java +++ b/tests/src/java/com/threerings/io/FrameTest.java @@ -1,10 +1,10 @@ // -// $Id: FrameTest.java,v 1.2 2001/05/30 23:58:31 mdb Exp $ +// $Id: FrameTest.java,v 1.3 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.io.test; +package com.threerings.presents.io.test; import java.io.*; -import com.threerings.cocktail.cher.io.*; +import com.threerings.presents.io.*; public class FrameTest { diff --git a/tests/src/java/com/threerings/parlor/TestClient.java b/tests/src/java/com/threerings/parlor/TestClient.java index 6b6307478..a4d69b4e3 100644 --- a/tests/src/java/com/threerings/parlor/TestClient.java +++ b/tests/src/java/com/threerings/parlor/TestClient.java @@ -1,17 +1,17 @@ // -// $Id: TestClient.java,v 1.2 2001/10/09 17:20:58 mdb Exp $ +// $Id: TestClient.java,v 1.3 2001/10/11 04:07:51 mdb Exp $ package com.threerings.parlor.test; import com.samskivert.util.Config; import com.samskivert.util.Queue; -import com.threerings.cocktail.cher.client.*; -import com.threerings.cocktail.cher.dobj.DObjectManager; -import com.threerings.cocktail.cher.net.*; +import com.threerings.presents.client.*; +import com.threerings.presents.dobj.DObjectManager; +import com.threerings.presents.net.*; -import com.threerings.cocktail.party.data.BodyObject; -import com.threerings.cocktail.party.client.*; +import com.threerings.crowd.data.BodyObject; +import com.threerings.crowd.client.*; import com.threerings.parlor.Log; import com.threerings.parlor.client.*; diff --git a/tests/src/java/com/threerings/parlor/TestController.java b/tests/src/java/com/threerings/parlor/TestController.java index 67c00c3a1..c103221a4 100644 --- a/tests/src/java/com/threerings/parlor/TestController.java +++ b/tests/src/java/com/threerings/parlor/TestController.java @@ -1,9 +1,9 @@ // -// $Id: TestController.java,v 1.2 2001/10/06 00:25:29 mdb Exp $ +// $Id: TestController.java,v 1.3 2001/10/11 04:07:51 mdb Exp $ package com.threerings.parlor.test; -import com.threerings.cocktail.party.client.PlaceView; +import com.threerings.crowd.client.PlaceView; import com.threerings.parlor.client.GameController; public class TestController extends GameController diff --git a/tests/src/java/com/threerings/parlor/TestServer.java b/tests/src/java/com/threerings/parlor/TestServer.java index 5906e215d..4e1243e87 100644 --- a/tests/src/java/com/threerings/parlor/TestServer.java +++ b/tests/src/java/com/threerings/parlor/TestServer.java @@ -1,9 +1,9 @@ // -// $Id: TestServer.java,v 1.1 2001/10/03 03:45:44 mdb Exp $ +// $Id: TestServer.java,v 1.2 2001/10/11 04:07:51 mdb Exp $ package com.threerings.parlor.test; -import com.threerings.cocktail.party.server.PartyServer; +import com.threerings.crowd.server.CrowdServer; import com.threerings.parlor.Log; import com.threerings.parlor.server.ParlorManager; @@ -11,7 +11,7 @@ import com.threerings.parlor.server.ParlorManager; /** * A test server for the Parlor services. */ -public class TestServer extends PartyServer +public class TestServer extends CrowdServer { /** The parlor manager in operation on this server. */ public static ParlorManager parmgr = new ParlorManager(); diff --git a/tests/src/java/com/threerings/presents/client/TestClient.java b/tests/src/java/com/threerings/presents/client/TestClient.java index 3cc9fc999..7130ab814 100644 --- a/tests/src/java/com/threerings/presents/client/TestClient.java +++ b/tests/src/java/com/threerings/presents/client/TestClient.java @@ -1,16 +1,16 @@ // -// $Id: TestClient.java,v 1.9 2001/10/02 02:05:50 mdb Exp $ +// $Id: TestClient.java,v 1.10 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.client.test; +package com.threerings.presents.client.test; import com.samskivert.util.Queue; -import com.threerings.cocktail.cher.Log; -import com.threerings.cocktail.cher.net.*; -import com.threerings.cocktail.cher.client.*; -import com.threerings.cocktail.cher.dobj.*; +import com.threerings.presents.Log; +import com.threerings.presents.net.*; +import com.threerings.presents.client.*; +import com.threerings.presents.dobj.*; -import com.threerings.cocktail.cher.server.test.TestObject; +import com.threerings.presents.server.test.TestObject; /** * A standalone test client. diff --git a/tests/src/java/com/threerings/presents/client/TestReceiver.java b/tests/src/java/com/threerings/presents/client/TestReceiver.java index a01d9cc43..71ae19db2 100644 --- a/tests/src/java/com/threerings/presents/client/TestReceiver.java +++ b/tests/src/java/com/threerings/presents/client/TestReceiver.java @@ -1,10 +1,10 @@ // -// $Id: TestReceiver.java,v 1.3 2001/08/04 02:54:01 mdb Exp $ +// $Id: TestReceiver.java,v 1.4 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.client.test; +package com.threerings.presents.client.test; -import com.threerings.cocktail.cher.Log; -import com.threerings.cocktail.cher.client.InvocationReceiver; +import com.threerings.presents.Log; +import com.threerings.presents.client.InvocationReceiver; public class TestReceiver implements InvocationReceiver { diff --git a/tests/src/java/com/threerings/presents/client/TestService.java b/tests/src/java/com/threerings/presents/client/TestService.java index dae98c96f..66da15b61 100644 --- a/tests/src/java/com/threerings/presents/client/TestService.java +++ b/tests/src/java/com/threerings/presents/client/TestService.java @@ -1,11 +1,11 @@ // -// $Id: TestService.java,v 1.3 2001/10/02 02:05:50 mdb Exp $ +// $Id: TestService.java,v 1.4 2001/10/11 04:07:52 mdb Exp $ -package com.threerings.cocktail.cher.client.test; +package com.threerings.presents.client.test; -import com.threerings.cocktail.cher.Log; -import com.threerings.cocktail.cher.client.Client; -import com.threerings.cocktail.cher.client.InvocationDirector; +import com.threerings.presents.Log; +import com.threerings.presents.client.Client; +import com.threerings.presents.client.InvocationDirector; /** * A test of the invocation services. diff --git a/tests/src/java/com/threerings/presents/server/DOMTest.java b/tests/src/java/com/threerings/presents/server/DOMTest.java index 9bbac6f9b..4c1e656c4 100644 --- a/tests/src/java/com/threerings/presents/server/DOMTest.java +++ b/tests/src/java/com/threerings/presents/server/DOMTest.java @@ -1,11 +1,11 @@ // -// $Id: DOMTest.java,v 1.1 2001/06/09 23:39:42 mdb Exp $ +// $Id: DOMTest.java,v 1.2 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.server.test; +package com.threerings.presents.server.test; -import com.threerings.cocktail.cher.Log; -import com.threerings.cocktail.cher.dobj.*; -import com.threerings.cocktail.cher.server.*; +import com.threerings.presents.Log; +import com.threerings.presents.dobj.*; +import com.threerings.presents.server.*; /** * A simple test case for the dobjmgr. @@ -40,7 +40,7 @@ public class DOMTest implements Subscriber return true; } - public static CherDObjectMgr omgr = new CherDObjectMgr(); + public static PresentsDObjectMgr omgr = new PresentsDObjectMgr(); public static void main (String[] args) { diff --git a/tests/src/java/com/threerings/presents/server/DestroyedRefTest.java b/tests/src/java/com/threerings/presents/server/DestroyedRefTest.java index 1789ddf05..055c2732f 100644 --- a/tests/src/java/com/threerings/presents/server/DestroyedRefTest.java +++ b/tests/src/java/com/threerings/presents/server/DestroyedRefTest.java @@ -1,11 +1,11 @@ // -// $Id: DestroyedRefTest.java,v 1.1 2001/08/08 21:56:48 mdb Exp $ +// $Id: DestroyedRefTest.java,v 1.2 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.server.test; +package com.threerings.presents.server.test; -import com.threerings.cocktail.cher.Log; -import com.threerings.cocktail.cher.dobj.*; -import com.threerings.cocktail.cher.server.CherServer; +import com.threerings.presents.Log; +import com.threerings.presents.dobj.*; +import com.threerings.presents.server.PresentsServer; /** * Tests that the dobjmgr will not allow a destroyed object to be added to @@ -17,8 +17,8 @@ public class DestroyedRefTest public void run () { // create two test objects - CherServer.omgr.createObject(TestObject.class, this, true); - CherServer.omgr.createObject(TestObject.class, this, true); + PresentsServer.omgr.createObject(TestObject.class, this, true); + PresentsServer.omgr.createObject(TestObject.class, this, true); } public void objectAvailable (DObject object) @@ -63,7 +63,7 @@ public class DestroyedRefTest } else if (event instanceof AttributeChangedEvent) { // go bye bye - CherServer.shutdown(); + PresentsServer.shutdown(); } else { Log.info("Got unexpected event: " + event); diff --git a/tests/src/java/com/threerings/presents/server/RefTest.java b/tests/src/java/com/threerings/presents/server/RefTest.java index bafb69249..3d30d21f1 100644 --- a/tests/src/java/com/threerings/presents/server/RefTest.java +++ b/tests/src/java/com/threerings/presents/server/RefTest.java @@ -1,11 +1,11 @@ // -// $Id: RefTest.java,v 1.1 2001/08/08 00:28:49 mdb Exp $ +// $Id: RefTest.java,v 1.2 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.server.test; +package com.threerings.presents.server.test; -import com.threerings.cocktail.cher.Log; -import com.threerings.cocktail.cher.dobj.*; -import com.threerings.cocktail.cher.server.CherServer; +import com.threerings.presents.Log; +import com.threerings.presents.dobj.*; +import com.threerings.presents.server.PresentsServer; /** * Tests the oid list reference tracking code. @@ -16,8 +16,8 @@ public class RefTest public void run () { // create two test objects - CherServer.omgr.createObject(TestObject.class, this, true); - CherServer.omgr.createObject(TestObject.class, this, true); + PresentsServer.omgr.createObject(TestObject.class, this, true); + PresentsServer.omgr.createObject(TestObject.class, this, true); } public void objectAvailable (DObject object) @@ -56,7 +56,7 @@ public class RefTest } else { Log.info("Other object destroyed."); // go bye bye - CherServer.shutdown(); + PresentsServer.shutdown(); } } else if (event instanceof ObjectRemovedEvent) { diff --git a/tests/src/java/com/threerings/presents/server/TestObject.dobj b/tests/src/java/com/threerings/presents/server/TestObject.dobj index c5aaf838e..0b111949d 100644 --- a/tests/src/java/com/threerings/presents/server/TestObject.dobj +++ b/tests/src/java/com/threerings/presents/server/TestObject.dobj @@ -1,9 +1,9 @@ // -// $Id: TestObject.dobj,v 1.3 2001/08/08 00:28:49 mdb Exp $ +// $Id: TestObject.dobj,v 1.4 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.server.test; +package com.threerings.presents.server.test; -import com.threerings.cocktail.cher.dobj.*; +import com.threerings.presents.dobj.*; /** * I use this to test until I get the actual DObject generation script diff --git a/tests/src/java/com/threerings/presents/server/TestProvider.java b/tests/src/java/com/threerings/presents/server/TestProvider.java index 35ceeb300..5812b1a9d 100644 --- a/tests/src/java/com/threerings/presents/server/TestProvider.java +++ b/tests/src/java/com/threerings/presents/server/TestProvider.java @@ -1,13 +1,13 @@ // -// $Id: TestProvider.java,v 1.7 2001/08/11 00:12:11 mdb Exp $ +// $Id: TestProvider.java,v 1.8 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.server.test; +package com.threerings.presents.server.test; -import com.threerings.cocktail.cher.Log; -import com.threerings.cocktail.cher.client.test.TestService; -import com.threerings.cocktail.cher.data.ClientObject; -import com.threerings.cocktail.cher.server.CherServer; -import com.threerings.cocktail.cher.server.InvocationProvider; +import com.threerings.presents.Log; +import com.threerings.presents.client.test.TestService; +import com.threerings.presents.data.ClientObject; +import com.threerings.presents.server.PresentsServer; +import com.threerings.presents.server.InvocationProvider; /** * A test of the invocation services. @@ -21,7 +21,7 @@ public class TestProvider extends InvocationProvider // issue a test notification just for kicks Object[] args = new Object[] { new Integer(1), "two" }; - CherServer.invmgr.sendNotification( + PresentsServer.invmgr.sendNotification( source.getOid(), TestService.MODULE, "Test", args); // and issue a response to this invocation request diff --git a/tests/src/java/com/threerings/presents/server/TestServer.java b/tests/src/java/com/threerings/presents/server/TestServer.java index aa7c1aadd..8fc271cba 100644 --- a/tests/src/java/com/threerings/presents/server/TestServer.java +++ b/tests/src/java/com/threerings/presents/server/TestServer.java @@ -1,13 +1,13 @@ // -// $Id: TestServer.java,v 1.3 2001/09/28 22:32:28 mdb Exp $ +// $Id: TestServer.java,v 1.4 2001/10/11 04:07:53 mdb Exp $ -package com.threerings.cocktail.cher.server.test; +package com.threerings.presents.server.test; -import com.threerings.cocktail.cher.Log; -import com.threerings.cocktail.cher.dobj.*; -import com.threerings.cocktail.cher.server.*; +import com.threerings.presents.Log; +import com.threerings.presents.dobj.*; +import com.threerings.presents.server.*; -public class TestServer extends CherServer +public class TestServer extends PresentsServer { /** The namespace used for server config properties. */ public static final String CONFIG_KEY = "test"; @@ -19,7 +19,7 @@ public class TestServer extends CherServer { 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); // register our invocation service providers @@ -61,7 +61,7 @@ public class TestServer extends CherServer // the path to the config file protected final static String CONFIG_PATH = - "rsrc/config/cocktail/cher/test/server"; + "rsrc/config/presents/test/server"; // the config key for our list of invocation provider mappings protected final static String PROVIDERS_KEY = CONFIG_KEY + ".providers"; diff --git a/tests/src/java/com/threerings/whirled/TestClient.java b/tests/src/java/com/threerings/whirled/TestClient.java index 9c85ca27d..ecfe671a9 100644 --- a/tests/src/java/com/threerings/whirled/TestClient.java +++ b/tests/src/java/com/threerings/whirled/TestClient.java @@ -1,18 +1,18 @@ // -// $Id: TestClient.java,v 1.5 2001/10/09 17:20:58 mdb Exp $ +// $Id: TestClient.java,v 1.6 2001/10/11 04:07:54 mdb Exp $ package com.threerings.whirled.test; import com.samskivert.util.Config; import com.samskivert.util.Queue; -import com.threerings.cocktail.cher.client.*; -import com.threerings.cocktail.cher.dobj.DObjectManager; -import com.threerings.cocktail.cher.net.*; +import com.threerings.presents.client.*; +import com.threerings.presents.dobj.DObjectManager; +import com.threerings.presents.net.*; -import com.threerings.cocktail.party.Log; -import com.threerings.cocktail.party.client.*; -import com.threerings.cocktail.party.data.PlaceObject; +import com.threerings.crowd.Log; +import com.threerings.crowd.client.*; +import com.threerings.crowd.data.PlaceObject; import com.threerings.whirled.client.SceneDirector; import com.threerings.whirled.client.persist.SceneRepository; diff --git a/tests/src/java/com/threerings/whirled/TestConfig.java b/tests/src/java/com/threerings/whirled/TestConfig.java index d465c4e81..5f19d4670 100644 --- a/tests/src/java/com/threerings/whirled/TestConfig.java +++ b/tests/src/java/com/threerings/whirled/TestConfig.java @@ -1,9 +1,9 @@ // -// $Id: TestConfig.java,v 1.1 2001/10/05 23:59:37 mdb Exp $ +// $Id: TestConfig.java,v 1.2 2001/10/11 04:07:54 mdb Exp $ package com.threerings.whirled.test; -import com.threerings.cocktail.party.data.PlaceConfig; +import com.threerings.crowd.data.PlaceConfig; import com.threerings.whirled.server.SceneManager; public class TestConfig extends PlaceConfig diff --git a/tests/src/java/com/threerings/whirled/TestController.java b/tests/src/java/com/threerings/whirled/TestController.java index 586cd6951..0c40d34f7 100644 --- a/tests/src/java/com/threerings/whirled/TestController.java +++ b/tests/src/java/com/threerings/whirled/TestController.java @@ -1,9 +1,9 @@ // -// $Id: TestController.java,v 1.1 2001/10/05 23:59:37 mdb Exp $ +// $Id: TestController.java,v 1.2 2001/10/11 04:07:54 mdb Exp $ package com.threerings.whirled.test; -import com.threerings.cocktail.party.client.*; +import com.threerings.crowd.client.*; public class TestController extends PlaceController {