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

changed to Presents and Party changed to Crowd. Whee!


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@431 542714f4-19e9-0310-aa3c-eee0fc999fb1
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
@@ -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.
@@ -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
{
@@ -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.
@@ -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)
{
@@ -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);
@@ -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) {
@@ -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
@@ -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
@@ -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";