AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
changed to Presents and Party changed to Crowd. Whee!


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@431 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2001-10-11 04:07:54 +00:00
parent ac477756ea
commit 8a4c46badc
170 changed files with 832 additions and 805 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/java/com/threerings/crowd/client/TestClient.java
+11 -11
View File
@@ -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();
}
tests/src/java/com/threerings/io/FrameTest.java
+3 -3
View File
@@ -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
{
tests/src/java/com/threerings/parlor/TestClient.java
+6 -6
View File
@@ -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.*;
tests/src/java/com/threerings/parlor/TestController.java
+2 -2
View File
@@ -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
tests/src/java/com/threerings/parlor/TestServer.java
+3 -3
View File
@@ -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();
tests/src/java/com/threerings/presents/client/TestClient.java
+7 -7
View File
@@ -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.
tests/src/java/com/threerings/presents/client/TestReceiver.java
+4 -4
View File
@@ -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
{
tests/src/java/com/threerings/presents/client/TestService.java
+5 -5
View File
@@ -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.
tests/src/java/com/threerings/presents/server/DOMTest.java
+6 -6
View File
@@ -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)
{
tests/src/java/com/threerings/presents/server/DestroyedRefTest.java
+8 -8
View File
@@ -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);
tests/src/java/com/threerings/presents/server/RefTest.java
+8 -8
View File
@@ -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) {
tests/src/java/com/threerings/presents/server/TestObject.dobj
+3 -3
View File
@@ -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
tests/src/java/com/threerings/presents/server/TestProvider.java
+8 -8
View File
@@ -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
tests/src/java/com/threerings/presents/server/TestServer.java
+8 -8
View File
@@ -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";
tests/src/java/com/threerings/whirled/TestClient.java
+7 -7
View File
@@ -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;
tests/src/java/com/threerings/whirled/TestConfig.java
+2 -2
View File
@@ -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
tests/src/java/com/threerings/whirled/TestController.java
+2 -2
View File
@@ -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
{