From c16fcebc2194048e59dc92636e99f32de6921c54 Mon Sep 17 00:00:00 2001
From: Roland <rk@rkuhn.info>
Date: Tue, 13 Dec 2011 17:53:59 +0100
Subject: [PATCH] fix docs generation

---
 akka-actor/src/main/scala/akka/routing/Routing.scala      | 8 ++++++++
 akka-actor/src/main/scala/akka/routing/package.scala      | 6 +-----
 akka-remote/src/main/java/akka/remote/RemoteProtocol.java | 8 ++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/akka-actor/src/main/scala/akka/routing/Routing.scala b/akka-actor/src/main/scala/akka/routing/Routing.scala
index 5fb34d3de3..7df6a388cb 100644
--- a/akka-actor/src/main/scala/akka/routing/Routing.scala
+++ b/akka-actor/src/main/scala/akka/routing/Routing.scala
@@ -150,6 +150,14 @@ trait Router extends Actor {
  */
 case class Broadcast(message: Any)
 
+/**
+ * For every message sent to a router, its route determines a set of destinations,
+ * where for each recipient a different sender may be specified; typically the
+ * sender should match the sender of the original request, but e.g. the scatter-
+ * gather router needs to receive the replies with an AskActorRef instead.
+ */
+case class Destination(sender: ActorRef, recipient: ActorRef)
+
 /**
  * Routing configuration that indicates no routing.
  * Oxymoron style.
diff --git a/akka-actor/src/main/scala/akka/routing/package.scala b/akka-actor/src/main/scala/akka/routing/package.scala
index 64b19f194c..1f2e343a33 100644
--- a/akka-actor/src/main/scala/akka/routing/package.scala
+++ b/akka-actor/src/main/scala/akka/routing/package.scala
@@ -4,12 +4,8 @@
 
 package akka
 
-import akka.actor.ActorRef
-
 package object routing {
 
-  case class Destination(sender: ActorRef, recipient: ActorRef)
-
-  type Route = PartialFunction[(ActorRef, Any), Iterable[Destination]]
+  type Route = PartialFunction[(akka.actor.ActorRef, Any), Iterable[Destination]]
 
 }
\ No newline at end of file
diff --git a/akka-remote/src/main/java/akka/remote/RemoteProtocol.java b/akka-remote/src/main/java/akka/remote/RemoteProtocol.java
index 0fab0a33f3..e7e8c15def 100644
--- a/akka-remote/src/main/java/akka/remote/RemoteProtocol.java
+++ b/akka-remote/src/main/java/akka/remote/RemoteProtocol.java
@@ -4498,7 +4498,7 @@ public final class RemoteProtocol {
         maybeForceBuilderInitialization();
       }
       
-      private Builder(BuilderParent parent) {
+      private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -5022,7 +5022,7 @@ public final class RemoteProtocol {
         maybeForceBuilderInitialization();
       }
       
-      private Builder(BuilderParent parent) {
+      private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -5579,7 +5579,7 @@ public final class RemoteProtocol {
         maybeForceBuilderInitialization();
       }
       
-      private Builder(BuilderParent parent) {
+      private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }
@@ -6261,7 +6261,7 @@ public final class RemoteProtocol {
         maybeForceBuilderInitialization();
       }
       
-      private Builder(BuilderParent parent) {
+      private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
         maybeForceBuilderInitialization();
       }