diff --git a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
index 9d1e9d63..359a1359 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
@@ -21,6 +21,8 @@
 
 package com.threerings.micasa.lobby;
 
+import javax.annotation.Generated;
+
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
@@ -28,6 +30,8 @@ import com.threerings.presents.server.InvocationException;
 /**
  * Dispatches requests to the {@link LobbyProvider}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from LobbyService.java.")
 public class LobbyDispatcher extends InvocationDispatcher<LobbyMarshaller>
 {
     /**
diff --git a/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java b/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java
index 6a56fc33..bd481a10 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java
@@ -21,11 +21,12 @@
 
 package com.threerings.micasa.lobby;
 
-import java.util.List;
+import javax.annotation.Generated;
 
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
+import java.util.List;
 
 /**
  * Provides the implementation of the {@link LobbyService} interface
@@ -34,6 +35,8 @@ import com.threerings.presents.dobj.InvocationResponseEvent;
  * interfaces that marshall the response arguments and deliver them back
  * to the requesting client.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from LobbyService.java.")
 public class LobbyMarshaller extends InvocationMarshaller
     implements LobbyService
 {
diff --git a/src/java/com/threerings/micasa/lobby/LobbyObject.java b/src/java/com/threerings/micasa/lobby/LobbyObject.java
index 58ce6486..805f3a27 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyObject.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyObject.java
@@ -21,6 +21,7 @@
 
 package com.threerings.micasa.lobby;
 
+import javax.annotation.Generated;
 import com.threerings.crowd.data.PlaceObject;
 
 /**
diff --git a/src/java/com/threerings/micasa/lobby/LobbyProvider.java b/src/java/com/threerings/micasa/lobby/LobbyProvider.java
index 6a7e5fc8..e4d688a1 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyProvider.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyProvider.java
@@ -21,6 +21,8 @@
 
 package com.threerings.micasa.lobby;
 
+import javax.annotation.Generated;
+
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
@@ -28,6 +30,8 @@ import com.threerings.presents.server.InvocationProvider;
 /**
  * Defines the server-side of the {@link LobbyService}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from LobbyService.java.")
 public interface LobbyProvider extends InvocationProvider
 {
     /**
diff --git a/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java b/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java
index 58917299..7f24e63c 100644
--- a/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java
+++ b/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java
@@ -21,6 +21,7 @@
 
 package com.threerings.micasa.lobby.table;
 
+import javax.annotation.Generated;
 import com.threerings.presents.dobj.DSet;
 
 import com.threerings.parlor.data.Table;
@@ -33,9 +34,11 @@ public class TableLobbyObject extends LobbyObject
 {
     // AUTO-GENERATED: FIELDS START
     /** The field name of the <code>tableSet</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String TABLE_SET = "tableSet";
 
     /** The field name of the <code>tableService</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String TABLE_SERVICE = "tableService";
     // AUTO-GENERATED: FIELDS END
 
@@ -81,6 +84,7 @@ public class TableLobbyObject extends LobbyObject
      * <code>tableSet</code> set. The set will not change until the event is
      * actually propagated through the system.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void addToTableSet (Table elem)
     {
         requestEntryAdd(TABLE_SET, tableSet, elem);
@@ -91,6 +95,7 @@ public class TableLobbyObject extends LobbyObject
      * the <code>tableSet</code> set. The set will not change until the
      * event is actually propagated through the system.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void removeFromTableSet (Comparable<?> key)
     {
         requestEntryRemove(TABLE_SET, tableSet, key);
@@ -101,6 +106,7 @@ public class TableLobbyObject extends LobbyObject
      * <code>tableSet</code> set. The set will not change until the event is
      * actually propagated through the system.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void updateTableSet (Table elem)
     {
         requestEntryUpdate(TABLE_SET, tableSet, elem);
@@ -116,6 +122,7 @@ public class TableLobbyObject extends LobbyObject
      * change. Proxied copies of this object (on clients) will apply the
      * value change when they received the attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setTableSet (DSet<Table> value)
     {
         requestAttributeChange(TABLE_SET, value, this.tableSet);
@@ -131,6 +138,7 @@ public class TableLobbyObject extends LobbyObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setTableService (TableMarshaller value)
     {
         TableMarshaller ovalue = this.tableService;
diff --git a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
index 59b1f162..297f6f48 100644
--- a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
+++ b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
@@ -21,12 +21,12 @@
 
 package com.threerings.micasa.simulator.data;
 
-import com.threerings.presents.client.Client;
-import com.threerings.presents.data.InvocationMarshaller;
-
-import com.threerings.parlor.game.data.GameConfig;
+import javax.annotation.Generated;
 
 import com.threerings.micasa.simulator.client.SimulatorService;
+import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.presents.client.Client;
+import com.threerings.presents.data.InvocationMarshaller;
 
 /**
  * Provides the implementation of the {@link SimulatorService} interface
@@ -35,6 +35,8 @@ import com.threerings.micasa.simulator.client.SimulatorService;
  * interfaces that marshall the response arguments and deliver them back
  * to the requesting client.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from SimulatorService.java.")
 public class SimulatorMarshaller extends InvocationMarshaller
     implements SimulatorService
 {
diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
index 64656643..3abf5420 100644
--- a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
+++ b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
@@ -21,17 +21,19 @@
 
 package com.threerings.micasa.simulator.server;
 
+import javax.annotation.Generated;
+
+import com.threerings.micasa.simulator.data.SimulatorMarshaller;
+import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 
-import com.threerings.parlor.game.data.GameConfig;
-
-import com.threerings.micasa.simulator.data.SimulatorMarshaller;
-
 /**
  * Dispatches requests to the {@link SimulatorProvider}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from SimulatorService.java.")
 public class SimulatorDispatcher extends InvocationDispatcher<SimulatorMarshaller>
 {
     /**
diff --git a/src/java/com/threerings/parlor/card/client/CardGameDecoder.java b/src/java/com/threerings/parlor/card/client/CardGameDecoder.java
index 99ae7c36..a0624143 100644
--- a/src/java/com/threerings/parlor/card/client/CardGameDecoder.java
+++ b/src/java/com/threerings/parlor/card/client/CardGameDecoder.java
@@ -21,10 +21,9 @@
 
 package com.threerings.parlor.card.client;
 
-import com.threerings.presents.client.InvocationDecoder;
-
 import com.threerings.parlor.card.data.Card;
 import com.threerings.parlor.card.data.Hand;
+import com.threerings.presents.client.InvocationDecoder;
 
 /**
  * Dispatches calls to a {@link CardGameReceiver} instance.
diff --git a/src/java/com/threerings/parlor/card/data/CardGameObject.java b/src/java/com/threerings/parlor/card/data/CardGameObject.java
index 180035db..c38628d3 100644
--- a/src/java/com/threerings/parlor/card/data/CardGameObject.java
+++ b/src/java/com/threerings/parlor/card/data/CardGameObject.java
@@ -21,6 +21,7 @@
 
 package com.threerings.parlor.card.data;
 
+import javax.annotation.Generated;
 import com.threerings.parlor.game.data.GameObject;
 
 /**
diff --git a/src/java/com/threerings/parlor/card/server/CardGameSender.java b/src/java/com/threerings/parlor/card/server/CardGameSender.java
index b9a2301b..4f46dbe2 100644
--- a/src/java/com/threerings/parlor/card/server/CardGameSender.java
+++ b/src/java/com/threerings/parlor/card/server/CardGameSender.java
@@ -21,13 +21,12 @@
 
 package com.threerings.parlor.card.server;
 
-import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.server.InvocationSender;
-
 import com.threerings.parlor.card.client.CardGameDecoder;
 import com.threerings.parlor.card.client.CardGameReceiver;
 import com.threerings.parlor.card.data.Card;
 import com.threerings.parlor.card.data.Hand;
+import com.threerings.presents.data.ClientObject;
+import com.threerings.presents.server.InvocationSender;
 
 /**
  * Used to issue notifications to a {@link CardGameReceiver} instance on a
diff --git a/src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java b/src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java
index a813e03e..c708f835 100644
--- a/src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java
+++ b/src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java
@@ -21,11 +21,12 @@
 
 package com.threerings.parlor.card.trick.data;
 
-import com.threerings.presents.client.Client;
-import com.threerings.presents.data.InvocationMarshaller;
+import javax.annotation.Generated;
 
 import com.threerings.parlor.card.data.Card;
 import com.threerings.parlor.card.trick.client.TrickCardGameService;
+import com.threerings.presents.client.Client;
+import com.threerings.presents.data.InvocationMarshaller;
 
 /**
  * Provides the implementation of the {@link TrickCardGameService} interface
@@ -34,6 +35,8 @@ import com.threerings.parlor.card.trick.client.TrickCardGameService;
  * interfaces that marshall the response arguments and deliver them back
  * to the requesting client.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from TrickCardGameService.java.")
 public class TrickCardGameMarshaller extends InvocationMarshaller
     implements TrickCardGameService
 {
diff --git a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java
index 7033b205..c5604aaf 100644
--- a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java
+++ b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java
@@ -21,16 +21,19 @@
 
 package com.threerings.parlor.card.trick.server;
 
+import javax.annotation.Generated;
+
+import com.threerings.parlor.card.data.Card;
+import com.threerings.parlor.card.trick.data.TrickCardGameMarshaller;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 
-import com.threerings.parlor.card.data.Card;
-import com.threerings.parlor.card.trick.data.TrickCardGameMarshaller;
-
 /**
  * Dispatches requests to the {@link TrickCardGameProvider}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from TrickCardGameService.java.")
 public class TrickCardGameDispatcher extends InvocationDispatcher<TrickCardGameMarshaller>
 {
     /**
diff --git a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java
index 8241616a..ebd61153 100644
--- a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java
+++ b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java
@@ -21,15 +21,18 @@
 
 package com.threerings.parlor.card.trick.server;
 
-import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.server.InvocationProvider;
+import javax.annotation.Generated;
 
 import com.threerings.parlor.card.data.Card;
 import com.threerings.parlor.card.trick.client.TrickCardGameService;
+import com.threerings.presents.data.ClientObject;
+import com.threerings.presents.server.InvocationProvider;
 
 /**
  * Defines the server-side of the {@link TrickCardGameService}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from TrickCardGameService.java.")
 public interface TrickCardGameProvider extends InvocationProvider
 {
     /**
diff --git a/src/java/com/threerings/parlor/client/ParlorDecoder.java b/src/java/com/threerings/parlor/client/ParlorDecoder.java
index 7304aaa1..9dcdf2c7 100644
--- a/src/java/com/threerings/parlor/client/ParlorDecoder.java
+++ b/src/java/com/threerings/parlor/client/ParlorDecoder.java
@@ -21,11 +21,9 @@
 
 package com.threerings.parlor.client;
 
-import com.threerings.util.Name;
-
-import com.threerings.presents.client.InvocationDecoder;
-
 import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.presents.client.InvocationDecoder;
+import com.threerings.util.Name;
 
 /**
  * Dispatches calls to a {@link ParlorReceiver} instance.
diff --git a/src/java/com/threerings/parlor/data/ParlorMarshaller.java b/src/java/com/threerings/parlor/data/ParlorMarshaller.java
index f9877694..c89299ef 100644
--- a/src/java/com/threerings/parlor/data/ParlorMarshaller.java
+++ b/src/java/com/threerings/parlor/data/ParlorMarshaller.java
@@ -21,15 +21,15 @@
 
 package com.threerings.parlor.data;
 
-import com.threerings.util.Name;
+import javax.annotation.Generated;
 
+import com.threerings.parlor.client.ParlorService;
+import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
-
-import com.threerings.parlor.client.ParlorService;
-import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.util.Name;
 
 /**
  * Provides the implementation of the {@link ParlorService} interface
@@ -38,6 +38,8 @@ import com.threerings.parlor.game.data.GameConfig;
  * interfaces that marshall the response arguments and deliver them back
  * to the requesting client.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from ParlorService.java.")
 public class ParlorMarshaller extends InvocationMarshaller
     implements ParlorService
 {
diff --git a/src/java/com/threerings/parlor/data/TableMarshaller.java b/src/java/com/threerings/parlor/data/TableMarshaller.java
index f237c5cd..ede9c182 100644
--- a/src/java/com/threerings/parlor/data/TableMarshaller.java
+++ b/src/java/com/threerings/parlor/data/TableMarshaller.java
@@ -21,14 +21,14 @@
 
 package com.threerings.parlor.data;
 
-import com.threerings.util.Name;
-
-import com.threerings.presents.client.Client;
-import com.threerings.presents.client.InvocationService;
-import com.threerings.presents.data.InvocationMarshaller;
+import javax.annotation.Generated;
 
 import com.threerings.parlor.client.TableService;
 import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.presents.client.Client;
+import com.threerings.presents.client.InvocationService;
+import com.threerings.presents.data.InvocationMarshaller;
+import com.threerings.util.Name;
 
 /**
  * Provides the implementation of the {@link TableService} interface
@@ -37,6 +37,8 @@ import com.threerings.parlor.game.data.GameConfig;
  * interfaces that marshall the response arguments and deliver them back
  * to the requesting client.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from TableService.java.")
 public class TableMarshaller extends InvocationMarshaller
     implements TableService
 {
diff --git a/src/java/com/threerings/parlor/game/data/GameObject.java b/src/java/com/threerings/parlor/game/data/GameObject.java
index f45e986a..049ebf7c 100644
--- a/src/java/com/threerings/parlor/game/data/GameObject.java
+++ b/src/java/com/threerings/parlor/game/data/GameObject.java
@@ -21,6 +21,7 @@
 
 package com.threerings.parlor.game.data;
 
+import javax.annotation.Generated;
 import com.samskivert.util.StringUtil;
 
 import com.threerings.util.Name;
@@ -39,24 +40,31 @@ public class GameObject extends PlaceObject
 {
     // AUTO-GENERATED: FIELDS START
     /** The field name of the <code>state</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String STATE = "state";
 
     /** The field name of the <code>isRated</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String IS_RATED = "isRated";
 
     /** The field name of the <code>isPrivate</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String IS_PRIVATE = "isPrivate";
 
     /** The field name of the <code>players</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String PLAYERS = "players";
 
     /** The field name of the <code>winners</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String WINNERS = "winners";
 
     /** The field name of the <code>sessionId</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String SESSION_ID = "sessionId";
 
     /** The field name of the <code>playerStatus</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String PLAYER_STATUS = "playerStatus";
     // AUTO-GENERATED: FIELDS END
 
@@ -256,6 +264,7 @@ public class GameObject extends PlaceObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setState (int value)
     {
         int ovalue = this.state;
@@ -272,6 +281,7 @@ public class GameObject extends PlaceObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setIsRated (boolean value)
     {
         boolean ovalue = this.isRated;
@@ -288,6 +298,7 @@ public class GameObject extends PlaceObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setIsPrivate (boolean value)
     {
         boolean ovalue = this.isPrivate;
@@ -304,6 +315,7 @@ public class GameObject extends PlaceObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setPlayers (Name[] value)
     {
         Name[] ovalue = this.players;
@@ -321,6 +333,7 @@ public class GameObject extends PlaceObject
      * will apply the value change when they received the attribute
      * changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setPlayersAt (Name value, int index)
     {
         Name ovalue = this.players[index];
@@ -337,6 +350,7 @@ public class GameObject extends PlaceObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setWinners (boolean[] value)
     {
         boolean[] ovalue = this.winners;
@@ -354,6 +368,7 @@ public class GameObject extends PlaceObject
      * will apply the value change when they received the attribute
      * changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setWinnersAt (boolean value, int index)
     {
         boolean ovalue = this.winners[index];
@@ -370,6 +385,7 @@ public class GameObject extends PlaceObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setSessionId (int value)
     {
         int ovalue = this.sessionId;
@@ -386,6 +402,7 @@ public class GameObject extends PlaceObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setPlayerStatus (int[] value)
     {
         int[] ovalue = this.playerStatus;
@@ -403,6 +420,7 @@ public class GameObject extends PlaceObject
      * will apply the value change when they received the attribute
      * changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setPlayerStatusAt (int value, int index)
     {
         int ovalue = this.playerStatus[index];
diff --git a/src/java/com/threerings/parlor/server/ParlorDispatcher.java b/src/java/com/threerings/parlor/server/ParlorDispatcher.java
index e8079265..1537a2a4 100644
--- a/src/java/com/threerings/parlor/server/ParlorDispatcher.java
+++ b/src/java/com/threerings/parlor/server/ParlorDispatcher.java
@@ -21,20 +21,22 @@
 
 package com.threerings.parlor.server;
 
-import com.threerings.util.Name;
-
-import com.threerings.presents.client.InvocationService;
-import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.server.InvocationDispatcher;
-import com.threerings.presents.server.InvocationException;
+import javax.annotation.Generated;
 
 import com.threerings.parlor.client.ParlorService;
 import com.threerings.parlor.data.ParlorMarshaller;
 import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.presents.client.InvocationService;
+import com.threerings.presents.data.ClientObject;
+import com.threerings.presents.server.InvocationDispatcher;
+import com.threerings.presents.server.InvocationException;
+import com.threerings.util.Name;
 
 /**
  * Dispatches requests to the {@link ParlorProvider}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from ParlorService.java.")
 public class ParlorDispatcher extends InvocationDispatcher<ParlorMarshaller>
 {
     /**
diff --git a/src/java/com/threerings/parlor/server/ParlorProvider.java b/src/java/com/threerings/parlor/server/ParlorProvider.java
index 47f857f2..bd9614cf 100644
--- a/src/java/com/threerings/parlor/server/ParlorProvider.java
+++ b/src/java/com/threerings/parlor/server/ParlorProvider.java
@@ -21,19 +21,21 @@
 
 package com.threerings.parlor.server;
 
-import com.threerings.util.Name;
+import javax.annotation.Generated;
 
+import com.threerings.parlor.client.ParlorService;
+import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
-
-import com.threerings.parlor.client.ParlorService;
-import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.util.Name;
 
 /**
  * Defines the server-side of the {@link ParlorService}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from ParlorService.java.")
 public interface ParlorProvider extends InvocationProvider
 {
     /**
diff --git a/src/java/com/threerings/parlor/server/ParlorSender.java b/src/java/com/threerings/parlor/server/ParlorSender.java
index eabed2f3..0baee464 100644
--- a/src/java/com/threerings/parlor/server/ParlorSender.java
+++ b/src/java/com/threerings/parlor/server/ParlorSender.java
@@ -21,14 +21,12 @@
 
 package com.threerings.parlor.server;
 
-import com.threerings.util.Name;
-
-import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.server.InvocationSender;
-
 import com.threerings.parlor.client.ParlorDecoder;
 import com.threerings.parlor.client.ParlorReceiver;
 import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.presents.data.ClientObject;
+import com.threerings.presents.server.InvocationSender;
+import com.threerings.util.Name;
 
 /**
  * Used to issue notifications to a {@link ParlorReceiver} instance on a
diff --git a/src/java/com/threerings/parlor/server/TableDispatcher.java b/src/java/com/threerings/parlor/server/TableDispatcher.java
index cdadf664..d3de0396 100644
--- a/src/java/com/threerings/parlor/server/TableDispatcher.java
+++ b/src/java/com/threerings/parlor/server/TableDispatcher.java
@@ -21,20 +21,22 @@
 
 package com.threerings.parlor.server;
 
-import com.threerings.util.Name;
-
-import com.threerings.presents.client.InvocationService;
-import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.server.InvocationDispatcher;
-import com.threerings.presents.server.InvocationException;
+import javax.annotation.Generated;
 
 import com.threerings.parlor.data.TableConfig;
 import com.threerings.parlor.data.TableMarshaller;
 import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.presents.client.InvocationService;
+import com.threerings.presents.data.ClientObject;
+import com.threerings.presents.server.InvocationDispatcher;
+import com.threerings.presents.server.InvocationException;
+import com.threerings.util.Name;
 
 /**
  * Dispatches requests to the {@link TableProvider}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from TableService.java.")
 public class TableDispatcher extends InvocationDispatcher<TableMarshaller>
 {
     /**
diff --git a/src/java/com/threerings/parlor/server/TableProvider.java b/src/java/com/threerings/parlor/server/TableProvider.java
index f145a5b7..a7c8dcf8 100644
--- a/src/java/com/threerings/parlor/server/TableProvider.java
+++ b/src/java/com/threerings/parlor/server/TableProvider.java
@@ -21,20 +21,22 @@
 
 package com.threerings.parlor.server;
 
-import com.threerings.util.Name;
-
-import com.threerings.presents.client.InvocationService;
-import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.server.InvocationException;
-import com.threerings.presents.server.InvocationProvider;
+import javax.annotation.Generated;
 
 import com.threerings.parlor.client.TableService;
 import com.threerings.parlor.data.TableConfig;
 import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.presents.client.InvocationService;
+import com.threerings.presents.data.ClientObject;
+import com.threerings.presents.server.InvocationException;
+import com.threerings.presents.server.InvocationProvider;
+import com.threerings.util.Name;
 
 /**
  * Defines the server-side of the {@link TableService}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from TableService.java.")
 public interface TableProvider extends InvocationProvider
 {
     /**
diff --git a/src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java b/src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java
index a3d92bcd..0c980dd2 100644
--- a/src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java
+++ b/src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java
@@ -21,12 +21,13 @@
 
 package com.threerings.parlor.tourney.data;
 
+import javax.annotation.Generated;
+
+import com.threerings.parlor.tourney.client.TourneyService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
 
-import com.threerings.parlor.tourney.client.TourneyService;
-
 /**
  * Provides the implementation of the {@link TourneyService} interface
  * that marshalls the arguments and delivers the request to the provider
@@ -34,6 +35,8 @@ import com.threerings.parlor.tourney.client.TourneyService;
  * interfaces that marshall the response arguments and deliver them back
  * to the requesting client.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from TourneyService.java.")
 public class TourneyMarshaller extends InvocationMarshaller
     implements TourneyService
 {
diff --git a/src/java/com/threerings/parlor/tourney/data/TourneyObject.java b/src/java/com/threerings/parlor/tourney/data/TourneyObject.java
index ae5ccacf..b6c687fa 100644
--- a/src/java/com/threerings/parlor/tourney/data/TourneyObject.java
+++ b/src/java/com/threerings/parlor/tourney/data/TourneyObject.java
@@ -21,6 +21,7 @@
 
 package com.threerings.parlor.tourney.data;
 
+import javax.annotation.Generated;
 import com.threerings.presents.dobj.DObject;
 import com.threerings.presents.dobj.DSet;
 
@@ -31,18 +32,23 @@ public class TourneyObject extends DObject
 {
     // AUTO-GENERATED: FIELDS START
     /** The field name of the <code>state</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String STATE = "state";
 
     /** The field name of the <code>config</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String CONFIG = "config";
 
     /** The field name of the <code>startsIn</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String STARTS_IN = "startsIn";
 
     /** The field name of the <code>tourneyService</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String TOURNEY_SERVICE = "tourneyService";
 
     /** The field name of the <code>participants</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String PARTICIPANTS = "participants";
     // AUTO-GENERATED: FIELDS END
 
@@ -85,6 +91,7 @@ public class TourneyObject extends DObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setState (int value)
     {
         int ovalue = this.state;
@@ -101,6 +108,7 @@ public class TourneyObject extends DObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setConfig (TourneyConfig value)
     {
         TourneyConfig ovalue = this.config;
@@ -117,6 +125,7 @@ public class TourneyObject extends DObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setStartsIn (int value)
     {
         int ovalue = this.startsIn;
@@ -133,6 +142,7 @@ public class TourneyObject extends DObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setTourneyService (TourneyMarshaller value)
     {
         TourneyMarshaller ovalue = this.tourneyService;
@@ -146,6 +156,7 @@ public class TourneyObject extends DObject
      * <code>participants</code> set. The set will not change until the event is
      * actually propagated through the system.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void addToParticipants (Participant elem)
     {
         requestEntryAdd(PARTICIPANTS, participants, elem);
@@ -156,6 +167,7 @@ public class TourneyObject extends DObject
      * the <code>participants</code> set. The set will not change until the
      * event is actually propagated through the system.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void removeFromParticipants (Comparable<?> key)
     {
         requestEntryRemove(PARTICIPANTS, participants, key);
@@ -166,6 +178,7 @@ public class TourneyObject extends DObject
      * <code>participants</code> set. The set will not change until the event is
      * actually propagated through the system.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void updateParticipants (Participant elem)
     {
         requestEntryUpdate(PARTICIPANTS, participants, elem);
@@ -181,6 +194,7 @@ public class TourneyObject extends DObject
      * change. Proxied copies of this object (on clients) will apply the
      * value change when they received the attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setParticipants (DSet<Participant> value)
     {
         requestAttributeChange(PARTICIPANTS, value, this.participants);
diff --git a/src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java b/src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java
index 459fee5a..6fb887fc 100644
--- a/src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java
+++ b/src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java
@@ -21,12 +21,13 @@
 
 package com.threerings.parlor.tourney.data;
 
+import javax.annotation.Generated;
+
+import com.threerings.parlor.tourney.client.TourniesService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
 
-import com.threerings.parlor.tourney.client.TourniesService;
-
 /**
  * Provides the implementation of the {@link TourniesService} interface
  * that marshalls the arguments and delivers the request to the provider
@@ -34,6 +35,8 @@ import com.threerings.parlor.tourney.client.TourniesService;
  * interfaces that marshall the response arguments and deliver them back
  * to the requesting client.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from TourniesService.java.")
 public class TourniesMarshaller extends InvocationMarshaller
     implements TourniesService
 {
diff --git a/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java b/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java
index d4b19056..c78e282e 100644
--- a/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java
+++ b/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java
@@ -21,16 +21,19 @@
 
 package com.threerings.parlor.tourney.server;
 
+import javax.annotation.Generated;
+
+import com.threerings.parlor.tourney.data.TourneyMarshaller;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 
-import com.threerings.parlor.tourney.data.TourneyMarshaller;
-
 /**
  * Dispatches requests to the {@link TourneyProvider}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from TourneyService.java.")
 public class TourneyDispatcher extends InvocationDispatcher<TourneyMarshaller>
 {
     /**
diff --git a/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java b/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java
index 62360f38..eb1ab82e 100644
--- a/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java
+++ b/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java
@@ -21,16 +21,19 @@
 
 package com.threerings.parlor.tourney.server;
 
+import javax.annotation.Generated;
+
+import com.threerings.parlor.tourney.client.TourneyService;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
 
-import com.threerings.parlor.tourney.client.TourneyService;
-
 /**
  * Defines the server-side of the {@link TourneyService}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from TourneyService.java.")
 public interface TourneyProvider extends InvocationProvider
 {
     /**
diff --git a/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java b/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java
index b6f72b04..8d6e4b2f 100644
--- a/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java
+++ b/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java
@@ -21,17 +21,20 @@
 
 package com.threerings.parlor.tourney.server;
 
+import javax.annotation.Generated;
+
+import com.threerings.parlor.tourney.data.TourneyConfig;
+import com.threerings.parlor.tourney.data.TourniesMarshaller;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 
-import com.threerings.parlor.tourney.data.TourneyConfig;
-import com.threerings.parlor.tourney.data.TourniesMarshaller;
-
 /**
  * Dispatches requests to the {@link TourniesProvider}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from TourniesService.java.")
 public class TourniesDispatcher extends InvocationDispatcher<TourniesMarshaller>
 {
     /**
diff --git a/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java b/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java
index 9b177d15..48ba71ff 100644
--- a/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java
+++ b/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java
@@ -21,17 +21,20 @@
 
 package com.threerings.parlor.tourney.server;
 
+import javax.annotation.Generated;
+
+import com.threerings.parlor.tourney.client.TourniesService;
+import com.threerings.parlor.tourney.data.TourneyConfig;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
 
-import com.threerings.parlor.tourney.client.TourniesService;
-import com.threerings.parlor.tourney.data.TourneyConfig;
-
 /**
  * Defines the server-side of the {@link TourniesService}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from TourniesService.java.")
 public interface TourniesProvider extends InvocationProvider
 {
     /**
diff --git a/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java b/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java
index 77f7f89f..ce42be23 100644
--- a/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java
+++ b/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java
@@ -21,9 +21,10 @@
 
 package com.threerings.puzzle.data;
 
+import javax.annotation.Generated;
+
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
-
 import com.threerings.puzzle.client.PuzzleGameService;
 
 /**
@@ -33,6 +34,8 @@ import com.threerings.puzzle.client.PuzzleGameService;
  * interfaces that marshall the response arguments and deliver them back
  * to the requesting client.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from PuzzleGameService.java.")
 public class PuzzleGameMarshaller extends InvocationMarshaller
     implements PuzzleGameService
 {
diff --git a/src/java/com/threerings/puzzle/data/PuzzleObject.java b/src/java/com/threerings/puzzle/data/PuzzleObject.java
index d83f6479..1f65497a 100644
--- a/src/java/com/threerings/puzzle/data/PuzzleObject.java
+++ b/src/java/com/threerings/puzzle/data/PuzzleObject.java
@@ -21,6 +21,7 @@
 
 package com.threerings.puzzle.data;
 
+import javax.annotation.Generated;
 import com.threerings.parlor.game.data.GameObject;
 
 /**
@@ -33,15 +34,19 @@ public class PuzzleObject extends GameObject
 {
     // AUTO-GENERATED: FIELDS START
     /** The field name of the <code>puzzleGameService</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String PUZZLE_GAME_SERVICE = "puzzleGameService";
 
     /** The field name of the <code>difficulty</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String DIFFICULTY = "difficulty";
 
     /** The field name of the <code>summaries</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String SUMMARIES = "summaries";
 
     /** The field name of the <code>seed</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String SEED = "seed";
     // AUTO-GENERATED: FIELDS END
 
@@ -67,6 +72,7 @@ public class PuzzleObject extends GameObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setPuzzleGameService (PuzzleGameMarshaller value)
     {
         PuzzleGameMarshaller ovalue = this.puzzleGameService;
@@ -83,6 +89,7 @@ public class PuzzleObject extends GameObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setDifficulty (int value)
     {
         int ovalue = this.difficulty;
@@ -99,6 +106,7 @@ public class PuzzleObject extends GameObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setSummaries (BoardSummary[] value)
     {
         BoardSummary[] ovalue = this.summaries;
@@ -116,6 +124,7 @@ public class PuzzleObject extends GameObject
      * will apply the value change when they received the attribute
      * changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setSummariesAt (BoardSummary value, int index)
     {
         BoardSummary ovalue = this.summaries[index];
@@ -132,6 +141,7 @@ public class PuzzleObject extends GameObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setSeed (long value)
     {
         long ovalue = this.seed;
diff --git a/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java b/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java
index 2206f9a0..43a06935 100644
--- a/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java
+++ b/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java
@@ -21,16 +21,19 @@
 
 package com.threerings.puzzle.server;
 
+import javax.annotation.Generated;
+
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
-
 import com.threerings.puzzle.data.Board;
 import com.threerings.puzzle.data.PuzzleGameMarshaller;
 
 /**
  * Dispatches requests to the {@link PuzzleGameProvider}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from PuzzleGameService.java.")
 public class PuzzleGameDispatcher extends InvocationDispatcher<PuzzleGameMarshaller>
 {
     /**
diff --git a/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java b/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java
index 50ded90d..ef7cd26e 100644
--- a/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java
+++ b/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java
@@ -21,15 +21,18 @@
 
 package com.threerings.puzzle.server;
 
+import javax.annotation.Generated;
+
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationProvider;
-
 import com.threerings.puzzle.client.PuzzleGameService;
 import com.threerings.puzzle.data.Board;
 
 /**
  * Defines the server-side of the {@link PuzzleGameService}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from PuzzleGameService.java.")
 public interface PuzzleGameProvider extends InvocationProvider
 {
     /**
diff --git a/src/java/com/threerings/stage/data/StageSceneMarshaller.java b/src/java/com/threerings/stage/data/StageSceneMarshaller.java
index 9def9954..2eb323bd 100644
--- a/src/java/com/threerings/stage/data/StageSceneMarshaller.java
+++ b/src/java/com/threerings/stage/data/StageSceneMarshaller.java
@@ -21,12 +21,12 @@
 
 package com.threerings.stage.data;
 
+import javax.annotation.Generated;
+
+import com.threerings.miso.data.ObjectInfo;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
-
-import com.threerings.miso.data.ObjectInfo;
-
 import com.threerings.stage.client.StageSceneService;
 
 /**
@@ -36,6 +36,8 @@ import com.threerings.stage.client.StageSceneService;
  * interfaces that marshall the response arguments and deliver them back
  * to the requesting client.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from StageSceneService.java.")
 public class StageSceneMarshaller extends InvocationMarshaller
     implements StageSceneService
 {
diff --git a/src/java/com/threerings/stage/data/StageSceneObject.java b/src/java/com/threerings/stage/data/StageSceneObject.java
index 9cad7c86..22a48cc3 100644
--- a/src/java/com/threerings/stage/data/StageSceneObject.java
+++ b/src/java/com/threerings/stage/data/StageSceneObject.java
@@ -21,6 +21,7 @@
 
 package com.threerings.stage.data;
 
+import javax.annotation.Generated;
 import com.threerings.whirled.spot.data.SpotSceneObject;
 
 /**
@@ -31,12 +32,15 @@ public class StageSceneObject extends SpotSceneObject
 {
     // AUTO-GENERATED: FIELDS START
     /** The field name of the <code>stageSceneService</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String STAGE_SCENE_SERVICE = "stageSceneService";
 
     /** The field name of the <code>lightLevel</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String LIGHT_LEVEL = "lightLevel";
 
     /** The field name of the <code>lightShade</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String LIGHT_SHADE = "lightShade";
     // AUTO-GENERATED: FIELDS END
 
@@ -58,6 +62,7 @@ public class StageSceneObject extends SpotSceneObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setStageSceneService (StageSceneMarshaller value)
     {
         StageSceneMarshaller ovalue = this.stageSceneService;
@@ -74,6 +79,7 @@ public class StageSceneObject extends SpotSceneObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setLightLevel (float value)
     {
         float ovalue = this.lightLevel;
@@ -90,6 +96,7 @@ public class StageSceneObject extends SpotSceneObject
      * clients) will apply the value change when they received the
      * attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setLightShade (int value)
     {
         int ovalue = this.lightShade;
diff --git a/src/java/com/threerings/stage/server/StageSceneDispatcher.java b/src/java/com/threerings/stage/server/StageSceneDispatcher.java
index 900f2aa4..5f1f279f 100644
--- a/src/java/com/threerings/stage/server/StageSceneDispatcher.java
+++ b/src/java/com/threerings/stage/server/StageSceneDispatcher.java
@@ -21,18 +21,20 @@
 
 package com.threerings.stage.server;
 
+import javax.annotation.Generated;
+
+import com.threerings.miso.data.ObjectInfo;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
-
-import com.threerings.miso.data.ObjectInfo;
-
 import com.threerings.stage.data.StageSceneMarshaller;
 
 /**
  * Dispatches requests to the {@link StageSceneProvider}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from StageSceneService.java.")
 public class StageSceneDispatcher extends InvocationDispatcher<StageSceneMarshaller>
 {
     /**
diff --git a/src/java/com/threerings/stage/server/StageSceneProvider.java b/src/java/com/threerings/stage/server/StageSceneProvider.java
index 49678c48..a6d155fe 100644
--- a/src/java/com/threerings/stage/server/StageSceneProvider.java
+++ b/src/java/com/threerings/stage/server/StageSceneProvider.java
@@ -21,18 +21,20 @@
 
 package com.threerings.stage.server;
 
+import javax.annotation.Generated;
+
+import com.threerings.miso.data.ObjectInfo;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
-
-import com.threerings.miso.data.ObjectInfo;
-
 import com.threerings.stage.client.StageSceneService;
 
 /**
  * Defines the server-side of the {@link StageSceneService}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from StageSceneService.java.")
 public interface StageSceneProvider extends InvocationProvider
 {
     /**
diff --git a/src/java/com/threerings/whirled/data/SceneMarshaller.java b/src/java/com/threerings/whirled/data/SceneMarshaller.java
index b9f5d765..533b150b 100644
--- a/src/java/com/threerings/whirled/data/SceneMarshaller.java
+++ b/src/java/com/threerings/whirled/data/SceneMarshaller.java
@@ -21,12 +21,12 @@
 
 package com.threerings.whirled.data;
 
+import javax.annotation.Generated;
+
+import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
-
-import com.threerings.crowd.data.PlaceConfig;
-
 import com.threerings.whirled.client.SceneService;
 
 /**
@@ -36,6 +36,8 @@ import com.threerings.whirled.client.SceneService;
  * interfaces that marshall the response arguments and deliver them back
  * to the requesting client.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from SceneService.java.")
 public class SceneMarshaller extends InvocationMarshaller
     implements SceneService
 {
diff --git a/src/java/com/threerings/whirled/data/SceneObject.java b/src/java/com/threerings/whirled/data/SceneObject.java
index 0bf8869b..6b627d46 100644
--- a/src/java/com/threerings/whirled/data/SceneObject.java
+++ b/src/java/com/threerings/whirled/data/SceneObject.java
@@ -21,6 +21,7 @@
 
 package com.threerings.whirled.data;
 
+import javax.annotation.Generated;
 import com.threerings.crowd.data.PlaceObject;
 
 public class SceneObject extends PlaceObject
diff --git a/src/java/com/threerings/whirled/server/SceneDispatcher.java b/src/java/com/threerings/whirled/server/SceneDispatcher.java
index a89b5096..4739e494 100644
--- a/src/java/com/threerings/whirled/server/SceneDispatcher.java
+++ b/src/java/com/threerings/whirled/server/SceneDispatcher.java
@@ -21,16 +21,19 @@
 
 package com.threerings.whirled.server;
 
+import javax.annotation.Generated;
+
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
-
 import com.threerings.whirled.client.SceneService;
 import com.threerings.whirled.data.SceneMarshaller;
 
 /**
  * Dispatches requests to the {@link SceneProvider}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from SceneService.java.")
 public class SceneDispatcher extends InvocationDispatcher<SceneMarshaller>
 {
     /**
diff --git a/src/java/com/threerings/whirled/server/SceneProvider.java b/src/java/com/threerings/whirled/server/SceneProvider.java
index 59fe88bb..beb7f0a9 100644
--- a/src/java/com/threerings/whirled/server/SceneProvider.java
+++ b/src/java/com/threerings/whirled/server/SceneProvider.java
@@ -21,15 +21,18 @@
 
 package com.threerings.whirled.server;
 
+import javax.annotation.Generated;
+
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
-
 import com.threerings.whirled.client.SceneService;
 
 /**
  * Defines the server-side of the {@link SceneService}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from SceneService.java.")
 public interface SceneProvider extends InvocationProvider
 {
     /**
diff --git a/src/java/com/threerings/whirled/server/SceneSender.java b/src/java/com/threerings/whirled/server/SceneSender.java
index 2ed663af..e62034de 100644
--- a/src/java/com/threerings/whirled/server/SceneSender.java
+++ b/src/java/com/threerings/whirled/server/SceneSender.java
@@ -23,7 +23,6 @@ package com.threerings.whirled.server;
 
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationSender;
-
 import com.threerings.whirled.client.SceneDecoder;
 import com.threerings.whirled.client.SceneReceiver;
 
diff --git a/src/java/com/threerings/whirled/spot/data/ClusterObject.java b/src/java/com/threerings/whirled/spot/data/ClusterObject.java
index 67005be7..e9d359b8 100644
--- a/src/java/com/threerings/whirled/spot/data/ClusterObject.java
+++ b/src/java/com/threerings/whirled/spot/data/ClusterObject.java
@@ -21,6 +21,7 @@
 
 package com.threerings.whirled.spot.data;
 
+import javax.annotation.Generated;
 import com.threerings.presents.dobj.DObject;
 import com.threerings.presents.dobj.OidList;
 
@@ -34,6 +35,7 @@ public class ClusterObject extends DObject
 {
     // AUTO-GENERATED: FIELDS START
     /** The field name of the <code>occupants</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String OCCUPANTS = "occupants";
     // AUTO-GENERATED: FIELDS END
 
@@ -56,6 +58,7 @@ public class ClusterObject extends DObject
      * oid list. The list will not change until the event is actually
      * propagated through the system.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void addToOccupants (int oid)
     {
         requestOidAdd(OCCUPANTS, oid);
@@ -66,6 +69,7 @@ public class ClusterObject extends DObject
      * <code>occupants</code> oid list. The list will not change until the
      * event is actually propagated through the system.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void removeFromOccupants (int oid)
     {
         requestOidRemove(OCCUPANTS, oid);
diff --git a/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java b/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java
index 369fa225..49a4d6d1 100644
--- a/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java
+++ b/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java
@@ -21,10 +21,11 @@
 
 package com.threerings.whirled.spot.data;
 
+import javax.annotation.Generated;
+
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
-
 import com.threerings.whirled.client.SceneService;
 import com.threerings.whirled.data.SceneMarshaller;
 import com.threerings.whirled.spot.client.SpotService;
@@ -36,6 +37,8 @@ import com.threerings.whirled.spot.client.SpotService;
  * interfaces that marshall the response arguments and deliver them back
  * to the requesting client.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from SpotService.java.")
 public class SpotMarshaller extends InvocationMarshaller
     implements SpotService
 {
diff --git a/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java b/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java
index fbf8f62a..f096c147 100644
--- a/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java
+++ b/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java
@@ -21,6 +21,7 @@
 
 package com.threerings.whirled.spot.data;
 
+import javax.annotation.Generated;
 import com.threerings.presents.dobj.DSet;
 
 import com.threerings.whirled.data.SceneObject;
@@ -32,9 +33,11 @@ public class SpotSceneObject extends SceneObject
 {
     // AUTO-GENERATED: FIELDS START
     /** The field name of the <code>occupantLocs</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String OCCUPANT_LOCS = "occupantLocs";
 
     /** The field name of the <code>clusters</code> field. */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public static final String CLUSTERS = "clusters";
     // AUTO-GENERATED: FIELDS END
 
@@ -51,6 +54,7 @@ public class SpotSceneObject extends SceneObject
      * <code>occupantLocs</code> set. The set will not change until the event is
      * actually propagated through the system.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void addToOccupantLocs (SceneLocation elem)
     {
         requestEntryAdd(OCCUPANT_LOCS, occupantLocs, elem);
@@ -61,6 +65,7 @@ public class SpotSceneObject extends SceneObject
      * the <code>occupantLocs</code> set. The set will not change until the
      * event is actually propagated through the system.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void removeFromOccupantLocs (Comparable<?> key)
     {
         requestEntryRemove(OCCUPANT_LOCS, occupantLocs, key);
@@ -71,6 +76,7 @@ public class SpotSceneObject extends SceneObject
      * <code>occupantLocs</code> set. The set will not change until the event is
      * actually propagated through the system.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void updateOccupantLocs (SceneLocation elem)
     {
         requestEntryUpdate(OCCUPANT_LOCS, occupantLocs, elem);
@@ -86,6 +92,7 @@ public class SpotSceneObject extends SceneObject
      * change. Proxied copies of this object (on clients) will apply the
      * value change when they received the attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setOccupantLocs (DSet<SceneLocation> value)
     {
         requestAttributeChange(OCCUPANT_LOCS, value, this.occupantLocs);
@@ -98,6 +105,7 @@ public class SpotSceneObject extends SceneObject
      * <code>clusters</code> set. The set will not change until the event is
      * actually propagated through the system.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void addToClusters (Cluster elem)
     {
         requestEntryAdd(CLUSTERS, clusters, elem);
@@ -108,6 +116,7 @@ public class SpotSceneObject extends SceneObject
      * the <code>clusters</code> set. The set will not change until the
      * event is actually propagated through the system.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void removeFromClusters (Comparable<?> key)
     {
         requestEntryRemove(CLUSTERS, clusters, key);
@@ -118,6 +127,7 @@ public class SpotSceneObject extends SceneObject
      * <code>clusters</code> set. The set will not change until the event is
      * actually propagated through the system.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void updateClusters (Cluster elem)
     {
         requestEntryUpdate(CLUSTERS, clusters, elem);
@@ -133,6 +143,7 @@ public class SpotSceneObject extends SceneObject
      * change. Proxied copies of this object (on clients) will apply the
      * value change when they received the attribute changed notification.
      */
+    @Generated(value={"com.threerings.presents.tools.GenDObjectTask"})
     public void setClusters (DSet<Cluster> value)
     {
         requestAttributeChange(CLUSTERS, value, this.clusters);
diff --git a/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java b/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java
index 4852183b..2d95bc3d 100644
--- a/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java
+++ b/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java
@@ -21,11 +21,12 @@
 
 package com.threerings.whirled.spot.server;
 
+import javax.annotation.Generated;
+
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
-
 import com.threerings.whirled.client.SceneService;
 import com.threerings.whirled.spot.data.Location;
 import com.threerings.whirled.spot.data.SpotMarshaller;
@@ -33,6 +34,8 @@ import com.threerings.whirled.spot.data.SpotMarshaller;
 /**
  * Dispatches requests to the {@link SpotProvider}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from SpotService.java.")
 public class SpotDispatcher extends InvocationDispatcher<SpotMarshaller>
 {
     /**
diff --git a/src/java/com/threerings/whirled/spot/server/SpotProvider.java b/src/java/com/threerings/whirled/spot/server/SpotProvider.java
index 6128d03d..aed35e27 100644
--- a/src/java/com/threerings/whirled/spot/server/SpotProvider.java
+++ b/src/java/com/threerings/whirled/spot/server/SpotProvider.java
@@ -21,11 +21,12 @@
 
 package com.threerings.whirled.spot.server;
 
+import javax.annotation.Generated;
+
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
-
 import com.threerings.whirled.client.SceneService;
 import com.threerings.whirled.spot.client.SpotService;
 import com.threerings.whirled.spot.data.Location;
@@ -33,6 +34,8 @@ import com.threerings.whirled.spot.data.Location;
 /**
  * Defines the server-side of the {@link SpotService}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from SpotService.java.")
 public interface SpotProvider extends InvocationProvider
 {
     /**
diff --git a/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java b/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
index ed14ba4f..830c9995 100644
--- a/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
+++ b/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
@@ -21,12 +21,12 @@
 
 package com.threerings.whirled.zone.data;
 
+import javax.annotation.Generated;
+
+import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
-
-import com.threerings.crowd.data.PlaceConfig;
-
 import com.threerings.whirled.data.SceneModel;
 import com.threerings.whirled.data.SceneUpdate;
 import com.threerings.whirled.zone.client.ZoneService;
@@ -38,6 +38,8 @@ import com.threerings.whirled.zone.client.ZoneService;
  * interfaces that marshall the response arguments and deliver them back
  * to the requesting client.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from ZoneService.java.")
 public class ZoneMarshaller extends InvocationMarshaller
     implements ZoneService
 {
diff --git a/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java b/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java
index 95f586d1..caecf245 100644
--- a/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java
+++ b/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java
@@ -21,16 +21,19 @@
 
 package com.threerings.whirled.zone.server;
 
+import javax.annotation.Generated;
+
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
-
 import com.threerings.whirled.zone.client.ZoneService;
 import com.threerings.whirled.zone.data.ZoneMarshaller;
 
 /**
  * Dispatches requests to the {@link ZoneProvider}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from ZoneService.java.")
 public class ZoneDispatcher extends InvocationDispatcher<ZoneMarshaller>
 {
     /**
diff --git a/src/java/com/threerings/whirled/zone/server/ZoneProvider.java b/src/java/com/threerings/whirled/zone/server/ZoneProvider.java
index b08b9287..b3cc5c5d 100644
--- a/src/java/com/threerings/whirled/zone/server/ZoneProvider.java
+++ b/src/java/com/threerings/whirled/zone/server/ZoneProvider.java
@@ -21,15 +21,18 @@
 
 package com.threerings.whirled.zone.server;
 
+import javax.annotation.Generated;
+
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
-
 import com.threerings.whirled.zone.client.ZoneService;
 
 /**
  * Defines the server-side of the {@link ZoneService}.
  */
+@Generated(value={"com.threerings.presents.tools.GenServiceTask"},
+           comments="Derived from ZoneService.java.")
 public interface ZoneProvider extends InvocationProvider
 {
     /**
diff --git a/src/java/com/threerings/whirled/zone/server/ZoneSender.java b/src/java/com/threerings/whirled/zone/server/ZoneSender.java
index 6f5af6fe..a529cee0 100644
--- a/src/java/com/threerings/whirled/zone/server/ZoneSender.java
+++ b/src/java/com/threerings/whirled/zone/server/ZoneSender.java
@@ -23,7 +23,6 @@ package com.threerings.whirled.zone.server;
 
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationSender;
-
 import com.threerings.whirled.zone.client.ZoneDecoder;
 import com.threerings.whirled.zone.client.ZoneReceiver;