From a6842ae5e145b9db134fe574700c6e0c146bb91d Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Sat, 7 Jun 2008 19:14:10 +0000
Subject: [PATCH] Properly mark some singletons as such.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5156 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 src/java/com/threerings/crowd/peer/server/CrowdPeerManager.java | 2 ++
 src/java/com/threerings/presents/server/PresentsInvoker.java    | 2 ++
 tests/src/java/com/threerings/bureau/server/RegistryTester.java | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/java/com/threerings/crowd/peer/server/CrowdPeerManager.java b/src/java/com/threerings/crowd/peer/server/CrowdPeerManager.java
index 1e7b960bc..94ac83b02 100644
--- a/src/java/com/threerings/crowd/peer/server/CrowdPeerManager.java
+++ b/src/java/com/threerings/crowd/peer/server/CrowdPeerManager.java
@@ -22,6 +22,7 @@
 package com.threerings.crowd.peer.server;
 
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 
 import com.threerings.util.Name;
 
@@ -49,6 +50,7 @@ import com.threerings.crowd.peer.data.CrowdPeerMarshaller;
 /**
  * Extends the standard peer manager and bridges certain Crowd services.
  */
+@Singleton
 public class CrowdPeerManager extends PeerManager
     implements CrowdPeerProvider, ChatProvider.ChatForwarder
 {
diff --git a/src/java/com/threerings/presents/server/PresentsInvoker.java b/src/java/com/threerings/presents/server/PresentsInvoker.java
index 162dbd965..350d3a02d 100644
--- a/src/java/com/threerings/presents/server/PresentsInvoker.java
+++ b/src/java/com/threerings/presents/server/PresentsInvoker.java
@@ -24,6 +24,7 @@ package com.threerings.presents.server;
 import java.util.Iterator;
 
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 
 import com.samskivert.util.Invoker;
 import com.samskivert.util.StringUtil;
@@ -33,6 +34,7 @@ import static com.threerings.presents.Log.log;
 /**
  * Extends the generic {@link Invoker} and integrates it a bit more into the Presents system.
  */
+@Singleton
 public class PresentsInvoker extends Invoker
     implements ShutdownManager.Shutdowner, ReportManager.Reporter
 {
diff --git a/tests/src/java/com/threerings/bureau/server/RegistryTester.java b/tests/src/java/com/threerings/bureau/server/RegistryTester.java
index b7586a7ed..884a58918 100644
--- a/tests/src/java/com/threerings/bureau/server/RegistryTester.java
+++ b/tests/src/java/com/threerings/bureau/server/RegistryTester.java
@@ -28,6 +28,7 @@ import com.google.common.collect.Lists;
 import com.google.inject.Guice;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
+import com.google.inject.Singleton;
 
 import com.threerings.bureau.data.AgentObject;
 
@@ -42,6 +43,7 @@ import static com.threerings.bureau.Log.log;
  * TODO: add more types of testing
  * TODO: allow a quitAfter configuration parameter to shut down automatically
  */
+@Singleton
 public class RegistryTester
 {
     /**