From 3782309a2e457072c4e22ca98a7581d1ea037384 Mon Sep 17 00:00:00 2001
From: Charlie Groves <charlie@threerings.net>
Date: Tue, 23 Nov 2010 22:19:50 +0000
Subject: [PATCH] Use runServer to start servers, and rename
 PrefixServer.Module to PrefixModule

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1018 c613c5cb-e716-0410-b11b-feb51c14d237
---
 .../com/threerings/micasa/server/MiCasaServer.java | 10 +---------
 .../micasa/simulator/client/SimulatorApp.java      |  2 +-
 .../com/threerings/stage/server/StageServer.java   |  2 +-
 .../threerings/whirled/server/WhirledServer.java   |  2 +-
 .../java/com/threerings/parlor/TestServer.java     | 14 +-------------
 5 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/threerings/micasa/server/MiCasaServer.java b/src/main/java/com/threerings/micasa/server/MiCasaServer.java
index 8d4244d1..6c72a996 100644
--- a/src/main/java/com/threerings/micasa/server/MiCasaServer.java
+++ b/src/main/java/com/threerings/micasa/server/MiCasaServer.java
@@ -21,7 +21,6 @@
 
 package com.threerings.micasa.server;
 
-import com.google.inject.Guice;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 
@@ -47,14 +46,7 @@ public class MiCasaServer extends CrowdServer
 {
     public static void main (String[] args)
     {
-        Injector injector = Guice.createInjector(new Module());
-        MiCasaServer server = injector.getInstance(MiCasaServer.class);
-        try {
-            server.init(injector);
-            server.run();
-        } catch (Exception e) {
-            log.warning("Unable to initialize server.", e);
-        }
+        runServer(new CrowdModule(), new PresentsServerModule(MiCasaServer.class));
     }
 
     @Override // from CrowdServer
diff --git a/src/main/java/com/threerings/micasa/simulator/client/SimulatorApp.java b/src/main/java/com/threerings/micasa/simulator/client/SimulatorApp.java
index 4c1b0990..6e9fb66b 100644
--- a/src/main/java/com/threerings/micasa/simulator/client/SimulatorApp.java
+++ b/src/main/java/com/threerings/micasa/simulator/client/SimulatorApp.java
@@ -68,7 +68,7 @@ public class SimulatorApp
         _frame.setController(ctrl);
 
         // create the server
-        Injector injector = Guice.createInjector(new SimpleServer.Module());
+        Injector injector = Guice.createInjector(new SimpleServer.CrowdModule());
         SimulatorServer server = createSimulatorServer(injector);
         server.init(injector, new ResultListener<SimulatorServer>() {
             public void requestCompleted (SimulatorServer result) {
diff --git a/src/main/java/com/threerings/stage/server/StageServer.java b/src/main/java/com/threerings/stage/server/StageServer.java
index 3b6b7d5d..fc8eea1d 100644
--- a/src/main/java/com/threerings/stage/server/StageServer.java
+++ b/src/main/java/com/threerings/stage/server/StageServer.java
@@ -40,7 +40,7 @@ import static com.threerings.stage.Log.log;
 public abstract class StageServer extends WhirledServer
 {
     /** Configures dependencies needed by the Stage services. */
-    public static class Module extends WhirledServer.Module
+    public static class StageModule extends WhirledModule
     {
         @Override protected void configure () {
             super.configure();
diff --git a/src/main/java/com/threerings/whirled/server/WhirledServer.java b/src/main/java/com/threerings/whirled/server/WhirledServer.java
index 36b33de4..682e2aca 100644
--- a/src/main/java/com/threerings/whirled/server/WhirledServer.java
+++ b/src/main/java/com/threerings/whirled/server/WhirledServer.java
@@ -39,7 +39,7 @@ import com.threerings.crowd.server.CrowdServer;
 public abstract class WhirledServer extends CrowdServer
 {
     /** Configures dependencies needed by the Whirled server. */
-    public static class Module extends CrowdServer.Module
+    public static class WhirledModule extends CrowdModule
     {
         @Override protected void configure () {
             super.configure();
diff --git a/src/test/java/com/threerings/parlor/TestServer.java b/src/test/java/com/threerings/parlor/TestServer.java
index 09749b3a..6b9362f6 100644
--- a/src/test/java/com/threerings/parlor/TestServer.java
+++ b/src/test/java/com/threerings/parlor/TestServer.java
@@ -21,16 +21,11 @@
 
 package com.threerings.parlor;
 
-import com.google.inject.Guice;
 import com.google.inject.Inject;
-import com.google.inject.Injector;
-
 import com.threerings.crowd.server.CrowdServer;
 
 import com.threerings.parlor.server.ParlorManager;
 
-import static com.threerings.parlor.Log.log;
-
 /**
  * A test server for the Parlor services.
  */
@@ -39,14 +34,7 @@ public class TestServer extends CrowdServer
     /** Main entry point for test server. */
     public static void main (String[] args)
     {
-        Injector injector = Guice.createInjector(new Module());
-        TestServer server = injector.getInstance(TestServer.class);
-        try {
-            server.init(injector);
-            server.run();
-        } catch (Exception e) {
-            log.warning("Unable to initialize server.", e);
-        }
+        runServer(new CrowdModule(), new PresentsServerModule(TestServer.class));
     }
 
     // we need the parlor manager injected to bootstrap its services