From 935cf0e7c20f66fd3e428919a847fdae641ed441 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Sat, 7 Jun 2008 17:45:10 +0000
Subject: [PATCH] Basic Guice compliance.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@529 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 etc/libs-incl.xml                                  |  1 +
 .../com/threerings/jme/server/JabberServer.java    | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/etc/libs-incl.xml b/etc/libs-incl.xml
index b1bc9028..72b6754d 100644
--- a/etc/libs-incl.xml
+++ b/etc/libs-incl.xml
@@ -10,6 +10,7 @@
     <include name="commons-logging.jar"/>
     <include name="commons-beanutils.jar"/>
     <include name="google-collect.jar"/>
+    <include name="guice.jar"/>
     <include name="junit4.jar"/>
     <include name="retroweaver-all-1.2.2.jar"/>
     <include name="xml-writer.jar"/>
diff --git a/tests/src/java/com/threerings/jme/server/JabberServer.java b/tests/src/java/com/threerings/jme/server/JabberServer.java
index cf695b58..b8c26580 100644
--- a/tests/src/java/com/threerings/jme/server/JabberServer.java
+++ b/tests/src/java/com/threerings/jme/server/JabberServer.java
@@ -3,6 +3,9 @@
 
 package com.threerings.jme.server;
 
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
 import com.threerings.crowd.data.PlaceObject;
 import com.threerings.crowd.server.CrowdServer;
 import com.threerings.crowd.server.PlaceManager;
@@ -17,11 +20,11 @@ import static com.threerings.crowd.Log.log;
  */
 public class JabberServer extends CrowdServer
 {
-    // documentation inherited
-    public void init ()
+    @Override // from CrowdServer
+    public void init (Injector injector)
         throws Exception
     {
-        super.init();
+        super.init(injector);
 
         // create a single location
         _place = plreg.createPlace(new JabberConfig());
@@ -30,9 +33,10 @@ public class JabberServer extends CrowdServer
 
     public static void main (String[] args)
     {
-        JabberServer server = new JabberServer();
+        Injector injector = Guice.createInjector(new Module());
+        JabberServer server = injector.getInstance(JabberServer.class);
         try {
-            server.init();
+            server.init(injector);
             server.run();
         } catch (Exception e) {
             log.warning("Unable to initialize server.", e);