You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/03/10 22:00:35 UTC

[18/30] activemq-6 git commit: ACTIVEMQ6-87 Strip @author tags

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java
index f82437b..ebddb2b 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java
@@ -23,8 +23,6 @@ import org.apache.activemq.api.core.SimpleString;
 
 /**
  * A remote Grouping handler configuration
- *
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
  */
 public final class GroupingHandlerConfiguration implements Serializable
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java
index 9dc7325..31915d8 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/LocalGroupingHandler.java
@@ -43,8 +43,6 @@ import org.apache.activemq.utils.TypedProperties;
 
 /**
  * A Local Grouping handler. All the Remote handlers will talk with us
- *
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
  */
 public final class LocalGroupingHandler extends GroupHandlingAbstract
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Proposal.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Proposal.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Proposal.java
index 0d1dc2b..c01d0d6 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Proposal.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Proposal.java
@@ -20,8 +20,6 @@ import org.apache.activemq.api.core.SimpleString;
 
 /**
  * A proposal to select a group id
- *
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
  */
 public class Proposal
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java
index 135b303..d52d033 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/RemoteGroupingHandler.java
@@ -43,8 +43,6 @@ import org.apache.activemq.utils.TypedProperties;
  * <p/>
  * This will use management notifications to communicate with the node that has the Local Grouping
  * handler to make proposals.
- *
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
  */
 public final class RemoteGroupingHandler extends GroupHandlingAbstract
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Response.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Response.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Response.java
index cb3babe..402a2db 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Response.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/Response.java
@@ -20,8 +20,6 @@ import org.apache.activemq.api.core.SimpleString;
 
 /**
  * A response to a proposal
- *
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
  */
 public class Response
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java
index 437c491..eff2634 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AIOFileLockNodeManager.java
@@ -31,8 +31,6 @@ import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
  * on Linux.
  * <p/>
  * https://bugzilla.redhat.com/show_bug.cgi?id=678585
- *
- * @author clebertsuconic
  */
 public final class AIOFileLockNodeManager extends FileLockNodeManager
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ActiveMQServerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ActiveMQServerImpl.java
index 4d3f847..a56e085 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ActiveMQServerImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ActiveMQServerImpl.java
@@ -133,10 +133,6 @@ import org.apache.activemq.utils.VersionLoader;
 
 /**
  * The ActiveMQ server implementation
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- * @author <a href="mailto:ataylor@redhat.com>Andy Taylor</a>
- * @author <a href="mailto:mtaylor@redhat.com>Martyn Taylor</a>
  */
 public class ActiveMQServerImpl implements ActiveMQServer
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForReplication.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForReplication.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForReplication.java
index 2c5a96b..a00c925 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForReplication.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForReplication.java
@@ -34,8 +34,6 @@ import org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum;
 /**
  * This implementation looks for any available live node, once tried with no success it is marked as
  * tried and the next available is used.
- *
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
  */
 public class AnyLiveNodeLocatorForReplication extends LiveNodeLocator
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForScaleDown.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForScaleDown.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForScaleDown.java
index e597584..f7f804a 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForScaleDown.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AnyLiveNodeLocatorForScaleDown.java
@@ -34,8 +34,6 @@ import org.apache.activemq.core.server.LiveNodeLocator;
 /**
  * This implementation looks for any available live node, once tried with no success it is marked as
  * tried and the next available is used.
- *
- * @author Justin Bertram
  */
 public class AnyLiveNodeLocatorForScaleDown extends LiveNodeLocator
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AutoCreatedQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AutoCreatedQueueManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AutoCreatedQueueManagerImpl.java
index 05cc9cf..3592bb9 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AutoCreatedQueueManagerImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/AutoCreatedQueueManagerImpl.java
@@ -23,10 +23,6 @@ import org.apache.activemq.core.server.AutoCreatedQueueManager;
 import org.apache.activemq.core.server.Queue;
 import org.apache.activemq.utils.ReferenceCounterUtil;
 
-/**
- * @author Justin Bertram
- */
-
 public class AutoCreatedQueueManagerImpl implements AutoCreatedQueueManager
 {
    private final SimpleString queueName;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ConnectorsService.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ConnectorsService.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ConnectorsService.java
index dd593bf..b51c896 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ConnectorsService.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ConnectorsService.java
@@ -40,8 +40,6 @@ import org.apache.activemq.utils.ConfigurationHelper;
  * <p/>
  * It may also listen to a queue, and forward them (e.g. messages arriving at the queue are picked
  * and tweeted to some Twitter account).
- *
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> Created Jun 29, 2010
  */
 public final class ConnectorsService implements ActiveMQComponent
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/DivertImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/DivertImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/DivertImpl.java
index 43800de..c0068f3 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/DivertImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/DivertImpl.java
@@ -28,12 +28,6 @@ import org.apache.activemq.core.server.cluster.Transformer;
 
 /**
  * A DivertImpl simply diverts a message to a different forwardAddress
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- *
- * Created 19 Dec 2008 10:57:49
- *
- *
  */
 public class DivertImpl implements Divert
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/FileLockNodeManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/FileLockNodeManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/FileLockNodeManager.java
index 4d427cf..d4f7e64 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/FileLockNodeManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/FileLockNodeManager.java
@@ -26,11 +26,6 @@ import org.apache.activemq.core.server.ActiveMQServerLogger;
 import org.apache.activemq.core.server.NodeManager;
 import org.apache.activemq.utils.UUID;
 
-/**
- * @author <a href="mailto:andy.taylor@jboss.com">Andy Taylor</a>
- *         Date: Oct 13, 2010
- *         Time: 2:44:02 PM
- */
 public class FileLockNodeManager extends NodeManager
 {
    private static final int LIVE_LOCK_POS = 1;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/InVMNodeManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/InVMNodeManager.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/InVMNodeManager.java
index d2944b1..d699712 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/InVMNodeManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/InVMNodeManager.java
@@ -35,9 +35,6 @@ import org.apache.activemq.utils.UUIDGenerator;
  * We use the {@link org.apache.activemq.core.server.impl.InVMNodeManager} instead of {@link org.apache.activemq.core.server.impl.FileLockNodeManager} when
  * multiple servers are run inside the same VM and File Locks can not be shared in the
  * same VM (it would cause a shared lock violation).
- *
- * @author <a href="mailto:andy.taylor@jboss.com">Andy Taylor</a> Date: Oct 13, 2010 Time: 3:55:47
- *         PM
  */
 public final class InVMNodeManager extends NodeManager
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LastValueQueue.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LastValueQueue.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LastValueQueue.java
index c796d2d..a210be3 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LastValueQueue.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/LastValueQueue.java
@@ -41,8 +41,6 @@ import org.apache.activemq.core.settings.impl.AddressSettings;
  * <p>
  * This is useful for example, for stock prices, where you're only interested in the latest value
  * for a particular stock
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> rewrite
  */
 public class LastValueQueue extends QueueImpl
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/MessageReferenceImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/MessageReferenceImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/MessageReferenceImpl.java
index 247eb31..e0d445a 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/MessageReferenceImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/MessageReferenceImpl.java
@@ -25,8 +25,6 @@ import org.apache.activemq.utils.MemorySize;
 
 /**
  * Implementation of a MessageReference
- *
- * @author <a href="mailto:tim.fox@jboss.com>Tim Fox</a>
  */
 public class MessageReferenceImpl implements MessageReference
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java
index bce4202..d169f97 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForReplication.java
@@ -31,7 +31,6 @@ import org.apache.activemq.core.server.cluster.qourum.SharedNothingBackupQuorum;
 /**
  * NamedLiveNodeLocatorForReplication looks for a live server in the cluster with a specific backupGroupName
  *
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
  * @see org.apache.activemq.core.server.cluster.ha.HAPolicy#getGroupName()
  */
 public class NamedLiveNodeLocatorForReplication extends LiveNodeLocator

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java
index e6927a9..6c3fc08 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/NamedLiveNodeLocatorForScaleDown.java
@@ -34,7 +34,6 @@ import org.apache.activemq.core.server.LiveNodeLocator;
 /**
  * NamedLiveNodeLocatorForScaleDown looks for a live server in the cluster with a specific scaleDownGroupName
  *
- * @author Justin Bertram
  * @see org.apache.activemq.core.config.Configuration#getScaleDownGroupName()
  */
 public class NamedLiveNodeLocatorForScaleDown extends LiveNodeLocator

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueFactoryImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueFactoryImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueFactoryImpl.java
index 104ce4f..996c2b1 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueFactoryImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueFactoryImpl.java
@@ -32,10 +32,6 @@ import org.apache.activemq.utils.ExecutorFactory;
 /**
  *
  * A QueueFactoryImpl
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- * @author <a href="ataylor@redhat.com">Andy Taylor</a>
- *
  */
 public class QueueFactoryImpl implements QueueFactory
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java
index 5fa884b..b0e4289 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/QueueImpl.java
@@ -92,11 +92,6 @@ import org.apache.activemq.utils.TypedProperties;
  * Implementation of a Queue
  * <p/>
  * Completely non blocking between adding to queue and delivering to consumers.
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- * @author <a href="ataylor@redhat.com">Andy Taylor</a>
- * @author <a href="jmesnil@redhat.com">Jeff Mesnil</a>
- * @author <a href="clebert.suconic@jboss.com">Clebert Suconic</a>
  */
 public class QueueImpl implements Queue
 {
@@ -3058,8 +3053,6 @@ public class QueueImpl implements Queue
 
    /**
     * This will determine the actions that could be done while iterate the queue through iterQueue
-    *
-    * @author clebertsuconic
     */
    abstract class QueueIterateAction
    {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RoutingContextImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RoutingContextImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RoutingContextImpl.java
index 932d6f0..8ef4ee5 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RoutingContextImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/RoutingContextImpl.java
@@ -29,7 +29,6 @@ import org.apache.activemq.core.transaction.Transaction;
 
 /**
  * A RoutingContextImpl
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
  */
 public final class RoutingContextImpl implements RoutingContext
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerImpl.java
index a4be74f..6cf3e87 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerImpl.java
@@ -36,12 +36,6 @@ import org.apache.activemq.core.server.ScheduledDeliveryHandler;
 
 /**
  * Handles scheduling deliveries to a queue at the correct time.
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- * @author <a href="ataylor@redhat.com">Andy Taylor</a>
- * @author <a href="jmesnil@redhat.com">Jeff Mesnil</a>
- * @author <a href="clebert.suconic@jboss.com">Clebert Suconic</a>
- * @author Tom Monk - provided patching on using TreeSet
  */
 public class ScheduledDeliveryHandlerImpl implements ScheduledDeliveryHandler
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java
index aa12993..160c244 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerConsumerImpl.java
@@ -61,11 +61,6 @@ import org.apache.activemq.utils.TypedProperties;
 
 /**
  * Concrete implementation of a ClientConsumer.
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
- * @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a>
- * @version <tt>$Revision: 3783 $</tt> $Id: ServerConsumerImpl.java 3783 2008-02-25 12:15:14Z timfox $
  */
 public class ServerConsumerImpl implements ServerConsumer, ReadyListener
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerInfo.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerInfo.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerInfo.java
index d8350d8..6b4752c 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerInfo.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerInfo.java
@@ -28,10 +28,6 @@ import org.apache.activemq.utils.SizeFormatterUtil;
 
 /**
  * A ServerInfo
- *
- * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
- *
- *
  */
 public class ServerInfo
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerMessageImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerMessageImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerMessageImpl.java
index 5002655..763935a 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerMessageImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerMessageImpl.java
@@ -32,10 +32,6 @@ import org.apache.activemq.utils.TypedProperties;
 
 /**
  * A ServerMessageImpl
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- * @author <a href="mailto:ataylor@redhat.com">Andy Taylor</a>
- * @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a>
  */
 public class ServerMessageImpl extends MessageImpl implements ServerMessage
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java
index 3790795..4cfc022 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServerSessionImpl.java
@@ -86,11 +86,6 @@ import org.apache.activemq.utils.json.JSONObject;
 
 /**
  * Server side Session implementation
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- * @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a>
- * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
- * @author <a href="mailto:andy.taylor@jboss.org>Andy Taylor</a>
  */
 public class ServerSessionImpl implements ServerSession, FailureListener
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServiceRegistry.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServiceRegistry.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServiceRegistry.java
index 017b79b..e0bffe4 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServiceRegistry.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/ServiceRegistry.java
@@ -28,10 +28,6 @@ import org.apache.activemq.api.core.Pair;
 import org.apache.activemq.core.config.ConnectorServiceConfiguration;
 import org.apache.activemq.core.server.ConnectorServiceFactory;
 
-/**
- * @author <a href="mailto:mtaylor@redhat.com">Martyn Taylor</a>
- */
-
 public class ServiceRegistry
 {
    private ExecutorService executorService;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java
index 13cb80a..81d47a5 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/TransientQueueManagerImpl.java
@@ -23,10 +23,6 @@ import org.apache.activemq.core.server.ActiveMQServerLogger;
 import org.apache.activemq.core.server.TransientQueueManager;
 import org.apache.activemq.utils.ReferenceCounterUtil;
 
-/**
- * @author Clebert Suconic
- */
-
 public class TransientQueueManagerImpl implements TransientQueueManager
 {
    private final SimpleString queueName;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/management/ManagementService.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/management/ManagementService.java b/activemq-server/src/main/java/org/apache/activemq/core/server/management/ManagementService.java
index 8866284..96929e7 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/management/ManagementService.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/management/ManagementService.java
@@ -50,11 +50,6 @@ import org.apache.activemq.core.settings.impl.AddressSettings;
 import org.apache.activemq.core.transaction.ResourceManager;
 import org.apache.activemq.spi.core.remoting.Acceptor;
 
-/**
- * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
- *
- *
- */
 public interface ManagementService extends NotificationService, ActiveMQComponent
 {
    // Configuration

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/server/management/impl/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/management/impl/ManagementServiceImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/management/impl/ManagementServiceImpl.java
index 0fbcdf4..bef361c 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/management/impl/ManagementServiceImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/management/impl/ManagementServiceImpl.java
@@ -84,11 +84,6 @@ import org.apache.activemq.core.transaction.ResourceManager;
 import org.apache.activemq.spi.core.remoting.Acceptor;
 import org.apache.activemq.utils.TypedProperties;
 
-/*
- * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
- * @author <a href="mailto:fox@redhat.com">Tim Fox</a>
- *
- */
 public class ManagementServiceImpl implements ManagementService
 {
    // Constants -----------------------------------------------------

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepository.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepository.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepository.java
index 81fa2c9..57805c0 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepository.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepository.java
@@ -20,8 +20,6 @@ import java.util.List;
 
 /**
  * allows objects to be mapped against a regex pattern and held in order in a list
- *
- * @author <a href="ataylor@redhat.com">Andy Taylor</a>
  */
 public interface HierarchicalRepository<T>
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepositoryChangeListener.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepositoryChangeListener.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepositoryChangeListener.java
index f7d6b0a..0d9cad9 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepositoryChangeListener.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/settings/HierarchicalRepositoryChangeListener.java
@@ -16,9 +16,6 @@
  */
 package org.apache.activemq.core.settings;
 
-/**
- * @author <a href="ataylor@redhat.com">Andy Taylor</a>
- */
 public interface HierarchicalRepositoryChangeListener
 {
    void onChange();

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/settings/Mergeable.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/Mergeable.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/Mergeable.java
index 66ff6a8..a73b378 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/settings/Mergeable.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/settings/Mergeable.java
@@ -18,8 +18,6 @@ package org.apache.activemq.core.settings;
 
 /**
  * Used when merging objects together.
- *
- * @author <a href="ataylor@redhat.com">Andy Taylor</a>
  */
 public interface Mergeable<T>
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java
index 5a8689b..8bbcbd7 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/AddressSettings.java
@@ -26,9 +26,6 @@ import org.apache.activemq.utils.BufferHelper;
 
 /**
  * Configuration settings that are applied on the address level
- *
- * @author <a href="ataylor@redhat.com">Andy Taylor</a>
- * @author <a href="tim.fox@jboss.com">Tim Fox</a>
  */
 public class AddressSettings implements Mergeable<AddressSettings>, Serializable, EncodingSupport
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepository.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepository.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepository.java
index c9010a6..ee7f8be 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepository.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/HierarchicalObjectRepository.java
@@ -37,9 +37,6 @@ import org.apache.activemq.core.settings.Mergeable;
 
 /**
  * allows objects to be mapped against a regex pattern and held in order in a list
- *
- * @author <a href="ataylor@redhat.com">Andy Taylor</a>
- * @author <a href="tim.fox@jboss.com">Tim Fox</a>
  */
 public class HierarchicalObjectRepository<T> implements HierarchicalRepository<T>
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/SlowConsumerPolicy.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/SlowConsumerPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/SlowConsumerPolicy.java
index 2e7ba51..8724ee7 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/SlowConsumerPolicy.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/settings/impl/SlowConsumerPolicy.java
@@ -18,9 +18,6 @@ package org.apache.activemq.core.settings.impl;
 
 /**
  * A SlowConsumerPolicy
- *
- * @author Justin Bertram
- *
  */
 public enum SlowConsumerPolicy
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/transaction/ResourceManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/ResourceManager.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/ResourceManager.java
index 6a2e85b..88d1875 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/ResourceManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/ResourceManager.java
@@ -24,11 +24,7 @@ import javax.transaction.xa.Xid;
 import org.apache.activemq.core.server.ActiveMQComponent;
 
 /**
- *
  * A ResourceManager
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- *
  */
 public interface ResourceManager extends ActiveMQComponent
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java
index 3111aeb..ee3a084 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/Transaction.java
@@ -26,9 +26,6 @@ import org.apache.activemq.core.server.impl.RefsOperation;
 
 /**
  * A ActiveMQ internal transaction
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- * @author <a href="mailto:andy.taylor@jboss.org>Andy Taylor</a>
  */
 public interface Transaction
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionDetail.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionDetail.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionDetail.java
index de62ec6..9752b54 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionDetail.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionDetail.java
@@ -31,8 +31,6 @@ import org.apache.activemq.utils.json.JSONObject;
 
 /**
  * A TransactionDetail
- *
- * @author <a href="tm.igarashi@gmail.com">Tomohisa Igarashi</a>
  */
 public abstract class TransactionDetail
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperation.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperation.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperation.java
index e2bf9ac..b9e1b90 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperation.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperation.java
@@ -23,9 +23,6 @@ import org.apache.activemq.core.server.MessageReference;
 /**
  *
  * A TransactionOperation
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- *
  */
 public interface TransactionOperation
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperationAbstract.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperationAbstract.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperationAbstract.java
index 043c3a9..3ab77e7 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperationAbstract.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionOperationAbstract.java
@@ -23,10 +23,6 @@ import org.apache.activemq.core.server.MessageReference;
 
 /**
  * Just a helper, when you don't want to implement all the methods on a transaction operation.
- *
- * @author clebertsuconic
- *
- *
  */
 public abstract class TransactionOperationAbstract implements TransactionOperation
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionPropertyIndexes.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionPropertyIndexes.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionPropertyIndexes.java
index d521276..a4836e8 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionPropertyIndexes.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/TransactionPropertyIndexes.java
@@ -18,12 +18,6 @@ package org.apache.activemq.core.transaction;
 
 /**
  * A TransactionPropertyIndexes
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- *
- * Created 2 Jan 2009 19:48:07
- *
- *
  */
 public class TransactionPropertyIndexes
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/BindingsTransactionImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/BindingsTransactionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/BindingsTransactionImpl.java
index 9c64d19..e9dc686 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/BindingsTransactionImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/BindingsTransactionImpl.java
@@ -22,8 +22,6 @@ import org.apache.activemq.core.server.impl.RefsOperation;
 
 /**
  * A BindingsTransactionImpl
- *
- * @author clebertsuconic
  */
 public class BindingsTransactionImpl extends TransactionImpl
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/CoreTransactionDetail.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/CoreTransactionDetail.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/CoreTransactionDetail.java
index 7b27d21..77d65c0 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/CoreTransactionDetail.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/CoreTransactionDetail.java
@@ -27,10 +27,6 @@ import org.apache.activemq.core.transaction.TransactionDetail;
 
 /**
  * A CoreTransactionDetail
- *
- * @author <a href="tm.igarashi@gmail.com">Tomohisa Igarashi</a>
- *
- *
  */
 public class CoreTransactionDetail extends TransactionDetail
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/ResourceManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/ResourceManagerImpl.java
index d9c764d..b8471b4 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/ResourceManagerImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/ResourceManagerImpl.java
@@ -37,9 +37,6 @@ import org.apache.activemq.core.transaction.Transaction;
 
 /**
  * A ResourceManagerImpl
- *
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
  */
 public class ResourceManagerImpl implements ResourceManager
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java
index 9ed2202..11a86f2 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/transaction/impl/TransactionImpl.java
@@ -33,9 +33,6 @@ import org.apache.activemq.core.transaction.TransactionOperation;
 
 /**
  * A TransactionImpl
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- * @author <a href="mailto:andy.taylor@jboss.org>Andy Taylor</a>
  */
 public class TransactionImpl implements Transaction
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/spi/core/naming/BindingRegistry.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/naming/BindingRegistry.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/naming/BindingRegistry.java
index 5fee359..93a54ad 100644
--- a/activemq-server/src/main/java/org/apache/activemq/spi/core/naming/BindingRegistry.java
+++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/naming/BindingRegistry.java
@@ -18,9 +18,6 @@ package org.apache.activemq.spi.core.naming;
 
 /**
  * Abstract interface for a registry to store endpoints like connection factories into.
- *
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
  */
 public interface BindingRegistry
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/MessageConverter.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/MessageConverter.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/MessageConverter.java
index 9437c95..2fa478c 100644
--- a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/MessageConverter.java
+++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/MessageConverter.java
@@ -18,9 +18,6 @@ package org.apache.activemq.spi.core.protocol;
 
 import org.apache.activemq.core.server.ServerMessage;
 
-/**
- * @author Clebert Suconic
- */
 // TODO: use this interface properly on OpenWire
 public interface MessageConverter
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java
index 814e5ca..7357824 100644
--- a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManager.java
@@ -24,8 +24,6 @@ import org.apache.activemq.spi.core.remoting.Connection;
 
 /**
  * A ProtocolManager
- *
- * @author Tim Fox
  */
 public interface ProtocolManager
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManagerFactory.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManagerFactory.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManagerFactory.java
index a271ab7..510465c 100644
--- a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManagerFactory.java
+++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/ProtocolManagerFactory.java
@@ -23,10 +23,6 @@ import org.apache.activemq.core.server.ActiveMQServer;
 
 /**
  * A ProtocolManagerFactory
- *
- * @author tim
- *
- *
  */
 public interface ProtocolManagerFactory
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/SessionCallback.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/SessionCallback.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/SessionCallback.java
index 97472d9..4c6fb8a 100644
--- a/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/SessionCallback.java
+++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/protocol/SessionCallback.java
@@ -23,10 +23,6 @@ import org.apache.activemq.spi.core.remoting.ReadyListener;
 
 /**
  * A SessionCallback
- *
- * @author Tim Fox
- *
- *
  */
 public interface SessionCallback
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/Acceptor.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/Acceptor.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/Acceptor.java
index beb1d8c..94bbdab 100644
--- a/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/Acceptor.java
+++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/Acceptor.java
@@ -26,8 +26,6 @@ import org.apache.activemq.core.server.management.NotificationService;
 /**
  * An Acceptor is used by the RemotingService to allow clients to connect. It should take care of
  * dispatching client requests to the RemotingService's Dispatcher.
- * @author <a href="ataylor@redhat.com">Andy Taylor</a>
- * @author <a href="tim.fox@jboss.com">Tim Fox</a>
  */
 public interface Acceptor extends ActiveMQComponent
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/AcceptorFactory.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/AcceptorFactory.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/AcceptorFactory.java
index 2d92323..51b1c85 100644
--- a/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/AcceptorFactory.java
+++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/AcceptorFactory.java
@@ -27,10 +27,6 @@ import org.apache.activemq.spi.core.protocol.ProtocolManager;
  * A factory for creating acceptors.
  * <p/>
  * An Acceptor is an endpoint that a {@link org.apache.activemq.spi.core.remoting.Connector} will connect to and is used by the remoting service.
- *
- * @author <a href="ataylor@redhat.com">Andy Taylor</a>
- * @author <a href="tim.fox@jboss.com">Tim Fox</a>
- * @author <a href="jmesnil@redhat.com">Jeff Mesnil</a>
  */
 public interface AcceptorFactory
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/ServerConnectionLifeCycleListener.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/ServerConnectionLifeCycleListener.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/ServerConnectionLifeCycleListener.java
index db465c3..72ba062 100644
--- a/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/ServerConnectionLifeCycleListener.java
+++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/remoting/ServerConnectionLifeCycleListener.java
@@ -16,10 +16,6 @@
  */
 package org.apache.activemq.spi.core.remoting;
 
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- *         10/11/12
- */
 public interface ServerConnectionLifeCycleListener extends ConnectionLifeCycleListener
 {
       /**

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManager.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManager.java
index e1b2b1a..1d37c1b 100644
--- a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManager.java
@@ -24,7 +24,6 @@ import org.apache.activemq.core.security.Role;
 /**
  * Use to validate whether a user has is valid to connect to the server and perform certain
  * functions
- * @author <a href="ataylor@redhat.com">Andy Taylor</a>
  */
 public interface ActiveMQSecurityManager
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManagerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManagerImpl.java
index b63e775..2bc34f7 100644
--- a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManagerImpl.java
+++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/ActiveMQSecurityManagerImpl.java
@@ -27,8 +27,6 @@ import org.apache.activemq.core.security.User;
 /**
  * A basic implementation of the ActiveMQSecurityManager. This can be used within an appserver and be deployed by
  * BasicUserCredentialsDeployer or used standalone or embedded.
- *
- * @author <a href="ataylor@redhat.com">Andy Taylor</a>
  */
 public class ActiveMQSecurityManagerImpl implements ActiveMQSecurityManager
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.java b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.java
index 81d73df..99cc329 100644
--- a/activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/spi/core/security/JAASSecurityManager.java
@@ -37,10 +37,6 @@ import org.apache.activemq.core.server.ActiveMQServerLogger;
  *
  * The {@link Subject} returned by the login context is expecting to have a {@link Group} with the <code>Roles</code> name
  * containing a set of {@link Principal} for each role of the user.
- *
- * @author <a href="ataylor@redhat.com">Andy Taylor</a>
- * @author <a href="tim.fox@jboss.com">Tim Fox</a>
- * @author <a href="jmesnil@redhat.com">Jeff Mesnil</a>
  */
 public class JAASSecurityManager implements ActiveMQSecurityManager
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/uri/AcceptorTransportConfigurationParser.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/uri/AcceptorTransportConfigurationParser.java b/activemq-server/src/main/java/org/apache/activemq/uri/AcceptorTransportConfigurationParser.java
index 15d32e9..47ef366 100644
--- a/activemq-server/src/main/java/org/apache/activemq/uri/AcceptorTransportConfigurationParser.java
+++ b/activemq-server/src/main/java/org/apache/activemq/uri/AcceptorTransportConfigurationParser.java
@@ -22,9 +22,6 @@ import org.apache.activemq.utils.uri.URIFactory;
 
 import java.util.List;
 
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
 public class AcceptorTransportConfigurationParser extends URIFactory<List<TransportConfiguration>, String>
 {
    public AcceptorTransportConfigurationParser()

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/uri/InVMAcceptorTransportConfigurationSchema.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/uri/InVMAcceptorTransportConfigurationSchema.java b/activemq-server/src/main/java/org/apache/activemq/uri/InVMAcceptorTransportConfigurationSchema.java
index 51ce145..a1bc3d6 100644
--- a/activemq-server/src/main/java/org/apache/activemq/uri/InVMAcceptorTransportConfigurationSchema.java
+++ b/activemq-server/src/main/java/org/apache/activemq/uri/InVMAcceptorTransportConfigurationSchema.java
@@ -18,9 +18,6 @@ package org.apache.activemq.uri;
 
 import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
 
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
 public class InVMAcceptorTransportConfigurationSchema extends InVMTransportConfigurationSchema
 {
    protected String getFactoryName()

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/uri/TCPAcceptorTransportConfigurationSchema.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/uri/TCPAcceptorTransportConfigurationSchema.java b/activemq-server/src/main/java/org/apache/activemq/uri/TCPAcceptorTransportConfigurationSchema.java
index 73b25b1..d48f33b 100644
--- a/activemq-server/src/main/java/org/apache/activemq/uri/TCPAcceptorTransportConfigurationSchema.java
+++ b/activemq-server/src/main/java/org/apache/activemq/uri/TCPAcceptorTransportConfigurationSchema.java
@@ -21,9 +21,6 @@ import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
 import java.net.URI;
 import java.util.Set;
 
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
 public class TCPAcceptorTransportConfigurationSchema extends TCPTransportConfigurationSchema
 {
    public TCPAcceptorTransportConfigurationSchema(Set<String> allowableProperties)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/main/java/org/apache/activemq/utils/XMLConfigurationUtil.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/utils/XMLConfigurationUtil.java b/activemq-server/src/main/java/org/apache/activemq/utils/XMLConfigurationUtil.java
index 5c9de37..a34586d 100644
--- a/activemq-server/src/main/java/org/apache/activemq/utils/XMLConfigurationUtil.java
+++ b/activemq-server/src/main/java/org/apache/activemq/utils/XMLConfigurationUtil.java
@@ -23,7 +23,6 @@ import org.w3c.dom.NodeList;
 
 /**
  * A XMLConfigurationUtil
- * @author jmesnil
  */
 public class XMLConfigurationUtil
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java
index 60914cd..cb321af 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java
@@ -36,11 +36,7 @@ import org.apache.activemq.tests.util.RandomUtil;
 import org.apache.activemq.tests.util.UnitTestCase;
 
 /**
- *
  * A ConfigurationImplTest
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- *
  */
 public class ConfigurationImplTest extends UnitTestCase
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java
index f064396..a7aa701 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java
@@ -29,12 +29,7 @@ import org.apache.activemq.core.config.Configuration;
 import org.apache.activemq.core.journal.impl.JournalConstants;
 
 /**
- *
  * A DefaultsFileConfigurationTest
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- * @author <a href="jmesnil@redhat.com">Jeff Mesnil</a>
- *
  */
 public class DefaultsFileConfigurationTest extends ConfigurationImplTest
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
index b82ddab..1b6cb18 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
@@ -31,8 +31,6 @@ import org.junit.Test;
 
 /**
  * A FileConfigurationParserTest
- *
- * @author <a href="mailto:hgao@redhat.com">Howard Gao</a>
  */
 public class FileConfigurationParserTest extends UnitTestCase
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java
index 3f55a55..2375fc1 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationTest.java
@@ -36,10 +36,6 @@ import org.apache.activemq.core.settings.impl.SlowConsumerPolicy;
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- * @author <a href="ataylor@redhat.com">Andy Taylor</a>
- * @author <a href="tim.fox@jboss.com">Tim Fox</a>
- */
 public class FileConfigurationTest extends ConfigurationImplTest
 {
    @Override

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ValidatorsTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ValidatorsTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ValidatorsTest.java
index 7186212..0e98993 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ValidatorsTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ValidatorsTest.java
@@ -24,9 +24,6 @@ import org.junit.Assert;
 import org.apache.activemq.core.server.JournalType;
 import org.apache.activemq.tests.util.RandomUtil;
 
-/**
- * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
- */
 public class ValidatorsTest extends Assert
 {
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
index da72479..b3d2107 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/WrongRoleFileConfigurationParserTest.java
@@ -29,8 +29,6 @@ import org.junit.Test;
 /**
  * When running this test from an IDE add this to the test command line so that the AssertionLoggerHandler works properly:
  * -Djava.util.logging.manager=org.jboss.logmanager.LogManager  -Dlogging.configuration=file:<path_to_source>/tests/config/logging.properties
- *
- * @author <a href="mailto:hgao@redhat.com">Howard Gao</a>
  */
 public class WrongRoleFileConfigurationParserTest extends UnitTestCase
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java b/activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java
index fc89524..658f865 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/filter/impl/FilterTest.java
@@ -30,9 +30,6 @@ import org.junit.Test;
 
 /**
  * Tests the compliance with the ActiveMQ Filter syntax.
- *
- * @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
  */
 public class FilterTest extends SilentTestCase
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/core/list/PriorityLinkedListTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/list/PriorityLinkedListTest.java b/activemq-server/src/test/java/org/apache/activemq/core/list/PriorityLinkedListTest.java
index 4fa6f3a..2c329cc 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/list/PriorityLinkedListTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/list/PriorityLinkedListTest.java
@@ -26,9 +26,6 @@ import org.junit.Assert;
 import org.apache.activemq.utils.LinkedListIterator;
 import org.apache.activemq.utils.PriorityLinkedListImpl;
 
-/**
- * @author <a href="tim.fox@jboss.com>Tim Fox</a>
- */
 public final class PriorityLinkedListTest extends Assert
 {
    protected Wibble a;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/core/message/impl/MessagePropertyTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/message/impl/MessagePropertyTest.java b/activemq-server/src/test/java/org/apache/activemq/core/message/impl/MessagePropertyTest.java
index 4e2cec8..1ecb5c9 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/message/impl/MessagePropertyTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/message/impl/MessagePropertyTest.java
@@ -28,9 +28,6 @@ import org.apache.activemq.tests.util.ServiceTestBase;
 import org.junit.Before;
 import org.junit.Test;
 
-/**
- * @author Francisco Borges
- */
 public class MessagePropertyTest extends ServiceTestBase
 {
    private ActiveMQServer server;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/core/security/RoleTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/security/RoleTest.java b/activemq-server/src/test/java/org/apache/activemq/core/security/RoleTest.java
index 60211b3..0eaf5ae 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/security/RoleTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/security/RoleTest.java
@@ -26,10 +26,6 @@ import static org.apache.activemq.core.security.CheckType.DELETE_DURABLE_QUEUE;
 import static org.apache.activemq.core.security.CheckType.DELETE_NON_DURABLE_QUEUE;
 import static org.apache.activemq.core.security.CheckType.SEND;
 
-
-/**
- * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
- */
 public class RoleTest extends Assert
 {
    // Constants -----------------------------------------------------

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/core/server/group/impl/ClusteredResetMockTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/server/group/impl/ClusteredResetMockTest.java b/activemq-server/src/test/java/org/apache/activemq/core/server/group/impl/ClusteredResetMockTest.java
index df51823..5b5afeb 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/server/group/impl/ClusteredResetMockTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/server/group/impl/ClusteredResetMockTest.java
@@ -64,8 +64,6 @@ import org.junit.Test;
  * this is testing the case for resending notifications from RemotingGroupHandler
  * There is a small window where you could receive notifications wrongly
  * this test will make sure the component would play well with that notification
- *
- * @author Clebert Suconic
  */
 public class ClusteredResetMockTest extends UnitTestCase
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java b/activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java
index 7b85924..8c6d1d2 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/server/impl/ScheduledDeliveryHandlerTest.java
@@ -55,10 +55,6 @@ import org.apache.activemq.utils.UUID;
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- * @author Clebert Suconic
- */
-
 public class ScheduledDeliveryHandlerTest extends Assert
 {
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/core/settings/AddressSettingsTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/settings/AddressSettingsTest.java b/activemq-server/src/test/java/org/apache/activemq/core/settings/AddressSettingsTest.java
index 4232420..d8d225e 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/settings/AddressSettingsTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/settings/AddressSettingsTest.java
@@ -23,9 +23,6 @@ import org.apache.activemq.tests.util.UnitTestCase;
 import org.junit.Assert;
 import org.junit.Test;
 
-/**
- * @author <a href="ataylor@redhat.com">Andy Taylor</a>
- */
 public class AddressSettingsTest extends UnitTestCase
 {
    @Test

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/core/settings/RepositoryTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/settings/RepositoryTest.java b/activemq-server/src/test/java/org/apache/activemq/core/settings/RepositoryTest.java
index c168c50..5d77739 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/settings/RepositoryTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/settings/RepositoryTest.java
@@ -27,9 +27,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-/**
- * @author <a href="ataylor@redhat.com">Andy Taylor</a>
- */
 public class RepositoryTest extends UnitTestCase
 {
    HierarchicalRepository<HashSet<Role>> securityRepository;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java b/activemq-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java
index 4927404..3bc5c60 100644
--- a/activemq-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/core/version/impl/VersionImplTest.java
@@ -26,11 +26,6 @@ import java.io.ObjectOutputStream;
 import org.junit.Assert;
 
 
-/**
- * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
- *
- *
- */
 public class VersionImplTest extends Assert
 {
    // Constants -----------------------------------------------------

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java
index 4e42b84..1194b15 100644
--- a/activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java
+++ b/activemq-server/src/test/java/org/apache/activemq/tests/util/ServiceTestBase.java
@@ -79,8 +79,6 @@ import org.junit.Before;
 
 /**
  * Base class with basic utilities on starting up a basic server
- *
- * @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a>
  */
 public abstract class ServiceTestBase extends UnitTestCase
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/tests/util/SimpleStringTest.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/SimpleStringTest.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/SimpleStringTest.java
index 00ab6cf..1655c3d 100644
--- a/activemq-server/src/test/java/org/apache/activemq/tests/util/SimpleStringTest.java
+++ b/activemq-server/src/test/java/org/apache/activemq/tests/util/SimpleStringTest.java
@@ -27,11 +27,7 @@ import org.apache.activemq.api.core.SimpleString;
 import org.apache.activemq.utils.DataConstants;
 
 /**
- *
  * A SimpleStringTest
- *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- *
  */
 public class SimpleStringTest extends Assert
 {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/tests/util/SingleServerTestBase.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/SingleServerTestBase.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/SingleServerTestBase.java
index bf026ac..cbf2702 100644
--- a/activemq-server/src/test/java/org/apache/activemq/tests/util/SingleServerTestBase.java
+++ b/activemq-server/src/test/java/org/apache/activemq/tests/util/SingleServerTestBase.java
@@ -28,9 +28,7 @@ import org.junit.Before;
 /**
  * Any test based on a single server can extend this class.
  * This is useful for quick writing tests with starting a server, locator, factory... etc
- * @author Clebert Suconic
  */
-
 public abstract class SingleServerTestBase extends ServiceTestBase
 {
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java b/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java
index 6fd3286..795a09e 100644
--- a/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java
+++ b/activemq-server/src/test/java/org/apache/activemq/tests/util/UnitTestCase.java
@@ -119,8 +119,6 @@ import org.junit.rules.TestName;
  * <p/>
  * See {@code org.apache.activemq.tests.util.ServiceTestBase} for a test case with server set-up.
  *
- * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- * @author <a href="mailto:csuconic@redhat.com">Clebert</a>
  * @see ServiceTestBase
  */
 public abstract class UnitTestCase extends CoreUnitTestCase

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/ActiveMQServiceExtensionLogger.java
----------------------------------------------------------------------
diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/ActiveMQServiceExtensionLogger.java b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/ActiveMQServiceExtensionLogger.java
index 4e1d320..76915e7 100644
--- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/ActiveMQServiceExtensionLogger.java
+++ b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/ActiveMQServiceExtensionLogger.java
@@ -24,8 +24,6 @@ import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageLogger;
 
 /**
- * @author mtaylor
- *
  * Logger Code 34
  *
  * each message id must be 6 digits long starting with 20, the 3rd digit donates the level so

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/ServiceUtils.java
----------------------------------------------------------------------
diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/ServiceUtils.java b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/ServiceUtils.java
index 79b7aaa..bd05652 100644
--- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/ServiceUtils.java
+++ b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/ServiceUtils.java
@@ -27,10 +27,6 @@ import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapper;
 import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapperFactory;
 import org.apache.activemq.service.extensions.xa.ActiveMQXAResourceWrapperFactoryImpl;
 
-/**
- * @author <a href="mailto:mtaylor@redhat.com">Martyn Taylor</a>
- */
-
 public class ServiceUtils
 {
    private static ActiveMQXAResourceWrapperFactory activeMQXAResourceWrapperFactory;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/transactions/TransactionManagerLocator.java
----------------------------------------------------------------------
diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/transactions/TransactionManagerLocator.java b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/transactions/TransactionManagerLocator.java
index d0d249b..e65be6f 100644
--- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/transactions/TransactionManagerLocator.java
+++ b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/transactions/TransactionManagerLocator.java
@@ -18,9 +18,6 @@ package org.apache.activemq.service.extensions.transactions;
 
 import javax.transaction.TransactionManager;
 
-/**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- */
 public interface TransactionManagerLocator
 {
    TransactionManager getTransactionManager();

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapper.java
----------------------------------------------------------------------
diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapper.java b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapper.java
index 4759677..a61eea8 100644
--- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapper.java
+++ b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapper.java
@@ -18,10 +18,6 @@ package org.apache.activemq.service.extensions.xa;
 
 import javax.transaction.xa.XAResource;
 
-/**
- * @author <a href="mailto:mtaylor@redhat.com">Martyn Taylor</a>
- */
-
 public interface ActiveMQXAResourceWrapper extends XAResource
 {
    // List of supported properties

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperFactory.java
----------------------------------------------------------------------
diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperFactory.java b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperFactory.java
index 736d537..a88c99a 100644
--- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperFactory.java
+++ b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperFactory.java
@@ -19,10 +19,6 @@ package org.apache.activemq.service.extensions.xa;
 import javax.transaction.xa.XAResource;
 import java.util.Map;
 
-/**
- * @author <a href="mailto:mtaylor@redhat.com">Martyn Taylor</a>
- */
-
 public interface ActiveMQXAResourceWrapperFactory
 {
    ActiveMQXAResourceWrapper wrap(XAResource xaResource, Map<String, Object> properties);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperFactoryImpl.java
----------------------------------------------------------------------
diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperFactoryImpl.java b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperFactoryImpl.java
index 02c3283..1bd0e39 100644
--- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperFactoryImpl.java
+++ b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperFactoryImpl.java
@@ -19,10 +19,6 @@ package org.apache.activemq.service.extensions.xa;
 import javax.transaction.xa.XAResource;
 import java.util.Map;
 
-/**
- * @author <a href="mailto:mtaylor@redhat.com">Martyn Taylor</a>
- */
-
 public class ActiveMQXAResourceWrapperFactoryImpl implements ActiveMQXAResourceWrapperFactory
 {
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java
----------------------------------------------------------------------
diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java
index 91e26c8..93531e9 100644
--- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java
+++ b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java
@@ -21,10 +21,6 @@ import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 import java.util.Map;
 
-/**
- * @author <a href="mailto:mtaylor@redhat.com">Martyn Taylor</a>
- */
-
 public class ActiveMQXAResourceWrapperImpl implements ActiveMQXAResourceWrapper
 {
    private final XAResource xaResource;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQRegistry.java
----------------------------------------------------------------------
diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQRegistry.java b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQRegistry.java
index bb81b23..8507765 100644
--- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQRegistry.java
+++ b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQRegistry.java
@@ -17,10 +17,6 @@
 
 package org.apache.activemq.service.extensions.xa.recovery;
 
-/**
- * @author mtaylor
- */
-
 public interface ActiveMQRegistry
 {
    void register(final XARecoveryConfig resourceConfig);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQRegistryImpl.java
----------------------------------------------------------------------
diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQRegistryImpl.java b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQRegistryImpl.java
index 2dd787b..870ca0c 100644
--- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQRegistryImpl.java
+++ b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQRegistryImpl.java
@@ -17,10 +17,6 @@
 
 package org.apache.activemq.service.extensions.xa.recovery;
 
-/**
- * @author mtaylor
- */
-
 public class ActiveMQRegistryImpl implements ActiveMQRegistry
 {
    private static ActiveMQRegistryImpl instance;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/88ed03e2/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java
----------------------------------------------------------------------
diff --git a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java
index 140504a..9ae511f 100644
--- a/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java
+++ b/activemq-service-extensions/src/main/java/org/apache/activemq/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java
@@ -26,9 +26,6 @@ import org.jboss.logging.annotations.MessageLogger;
 import org.w3c.dom.Node;
 
 /**
- * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
- * @author <a href="mailto:mtaylor@redhat.com">Martyn Taylor</a>
- *
  * Logger Code 12
  *
  * each message id must be 6 digits long starting with 12, the 3rd digit donates the level so