You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by fe...@apache.org on 2011/10/07 11:23:28 UTC

svn commit: r1179977 - in /james/server/trunk: pop3server/src/main/java/org/apache/james/pop3server/ pop3server/src/main/java/org/apache/james/pop3server/core/ pop3server/src/main/java/org/apache/james/pop3server/jmx/ pop3server/src/main/java/org/apach...

Author: felixk
Date: Fri Oct  7 09:23:27 2011
New Revision: 1179977

URL: http://svn.apache.org/viewvc?rev=1179977&view=rev
Log:
Some more javadocs updates/fixes

Modified:
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3SessionImpl.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/NoopCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StatCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UidlCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UnknownCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UserCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
    james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
    james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java
    james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java
    james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java
    james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java
    james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java
    james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
    james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
    james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java
    james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java
    james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java
    james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java
    james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/ManageableMailQueue.java
    james/server/trunk/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
    james/server/trunk/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueueFactory.java

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java Fri Oct  7 09:23:27 2011
@@ -75,7 +75,7 @@ public interface POP3Session extends Pro
     /**
      * Sets a new mailbox content
      * 
-     * @param userMailbox
+     * @param mailbox
      *            mailbox
      */
     void setUserMailbox(MessageManager mailbox);

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3SessionImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3SessionImpl.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3SessionImpl.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3SessionImpl.java Fri Oct  7 09:23:27 2011
@@ -40,38 +40,29 @@ public class POP3SessionImpl extends Abs
         this.configData = configData;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.pop3server.POP3Session#getConfigurationData()
      */
     public POP3HandlerConfiguration getConfigurationData() {
         return configData;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.pop3server.POP3Session#getHandlerState()
      */
     public int getHandlerState() {
         return handlerState;
     }
 
-
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.pop3server.POP3Session#setHandlerState(int)
      */
     public void setHandlerState(int handlerState) {
         this.handlerState = handlerState;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.api.protocol.TLSSupportedSession#resetState()
+    /**
+     * @see org.apache.james.protocols.api.ProtocolSession#resetState()
      */
     public void resetState() {
         getState().clear();
@@ -79,21 +70,16 @@ public class POP3SessionImpl extends Abs
         setHandlerState(AUTHENTICATION_READY);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.pop3server.POP3Session#getUserMailbox()
      */
     public MessageManager getUserMailbox() {
         return mailbox;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.pop3server.POP3Session#setUserMailbox(org.apache.james
-     * .imap.mailbox.Mailbox)
+     * org.apache.james.pop3server.POP3Session#setUserMailbox(MessageManager)
      */
     public void setUserMailbox(MessageManager mailbox) {
         this.mailbox = mailbox;

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java Fri Oct  7 09:23:27 2011
@@ -38,12 +38,10 @@ public class CapaCmdHandler implements C
     public final static String COMMAND_NAME = "CAPA";
     private List<CapaCapability> caps;
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.protocols.api.CommandHandler#onCommand(org.apache.james
-     * .protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
+     * org.apache.james.protocols.api.handler.CommandHandler
+     * #onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
      */
     public Response onCommand(POP3Session session, Request request) {
         POP3Response response = new POP3Response(POP3Response.OK_RESPONSE, "Capability list follows");
@@ -59,7 +57,7 @@ public class CapaCmdHandler implements C
     }
 
     /**
-     * @see org.apache.james.protocols.api.handler.api.protocol.ExtensibleHandler#getMarkerInterfaces()
+     * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
      */
     @SuppressWarnings("unchecked")
     public List<Class<?>> getMarkerInterfaces() {
@@ -69,7 +67,7 @@ public class CapaCmdHandler implements C
     }
 
     /**
-     * @see org.apache.james.protocols.api.handler.api.protocol.ExtensibleHandler#wireExtensions(java.lang.Class,
+     * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class,
      *      java.util.List)
      */
     @SuppressWarnings("unchecked")
@@ -80,7 +78,7 @@ public class CapaCmdHandler implements C
     }
 
     /**
-     * @see org.apache.james.api.protocol.CommonCommandHandler#getImplCommands()
+     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
      */
     public Collection<String> getImplCommands() {
         List<String> commands = new ArrayList<String>();

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java Fri Oct  7 09:23:27 2011
@@ -74,10 +74,8 @@ public class CoreCmdHandlerLoader implem
         commands.add(COMMANDHANDLERRESULTLOGGER);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.protocols.api.HandlersPackage#getHandlers()
+    /**
+     * @see org.apache.james.protocols.api.handler.HandlersPackage#getHandlers()
      */
     public List<String> getHandlers() {
         return commands;

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java Fri Oct  7 09:23:27 2011
@@ -76,7 +76,7 @@ public class DeleCmdHandler implements C
     }
 
     /**
-     * @see org.apache.james.api.protocol.CommonCommandHandler#getImplCommands()
+     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
      */
     public Collection<String> getImplCommands() {
         List<String> commands = new ArrayList<String>();

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java Fri Oct  7 09:23:27 2011
@@ -39,8 +39,10 @@ public class ListCmdHandler implements C
      * of messages in the mailbox and its aggregate size, or optionally, the
      * number and size of a single message.
      * 
-     * @param argument
-     *            the first argument parsed by the parseCommand method
+     * @param session
+     *            the pop3 session
+     * @param request
+     *            the request to process
      */
 
     @SuppressWarnings("unchecked")
@@ -102,10 +104,8 @@ public class ListCmdHandler implements C
         return response;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.protocols.api.CommandHandler#getImplCommands()
+    /**
+     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
      */
     public Collection<String> getImplCommands() {
         List<String> commands = new ArrayList<String>();

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/NoopCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/NoopCmdHandler.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/NoopCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/NoopCmdHandler.java Fri Oct  7 09:23:27 2011
@@ -50,7 +50,7 @@ public class NoopCmdHandler implements C
     }
 
     /**
-     * @see org.apache.james.api.protocol.CommonCommandHandler#getImplCommands()
+     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
      */
     public Collection<String> getImplCommands() {
         List<String> commands = new ArrayList<String>();

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java Fri Oct  7 09:23:27 2011
@@ -45,21 +45,21 @@ public class POP3CommandDispatcherLineHa
     }
 
     /**
-     * @see org.apache.james.api.protocol.AbstractCommandDispatcher#getMandatoryCommands()
+     * @see org.apache.james.protocols.api.handler.AbstractCommandDispatcher#getMandatoryCommands()
      */
     protected List<String> getMandatoryCommands() {
         return Arrays.asList(mandatoryCommands);
     }
 
     /**
-     * @see org.apache.james.api.protocol.AbstractCommandDispatcher#getUnknownCommandHandler()
+     * @see org.apache.james.protocols.api.handler.AbstractCommandDispatcher#getUnknownCommandHandler()
      */
     protected CommandHandler<POP3Session> getUnknownCommandHandler() {
         return unknownHandler;
     }
 
     /**
-     * @see org.apache.james.api.protocol.AbstractCommandDispatcher#getUnknownCommandHandlerIdentifier()
+     * @see org.apache.james.protocols.api.handler.AbstractCommandDispatcher#getUnknownCommandHandlerIdentifier()
      */
     protected String getUnknownCommandHandlerIdentifier() {
         return UnknownCmdHandler.COMMAND_NAME;

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java Fri Oct  7 09:23:27 2011
@@ -103,7 +103,7 @@ public class PassCmdHandler extends Rset
     }
 
     /**
-     * @see org.apache.james.api.protocol.CommonCommandHandler#getImplCommands()
+     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
      */
     public Collection<String> getImplCommands() {
         List<String> commands = new ArrayList<String>();

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java Fri Oct  7 09:23:27 2011
@@ -88,7 +88,7 @@ public class QuitCmdHandler implements C
     }
 
     /**
-     * @see org.apache.james.api.protocol.CommonCommandHandler#getImplCommands()
+     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
      */
     public Collection<String> getImplCommands() {
         List<String> commands = new ArrayList<String>();

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java Fri Oct  7 09:23:27 2011
@@ -122,10 +122,8 @@ public class RetrCmdHandler implements C
     }
 
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.api.protocol.CommonCommandHandler#getImplCommands()
+    /**
+     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
      */
     public Collection<String> getImplCommands() {
         List<String> commands = new ArrayList<String>();

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java Fri Oct  7 09:23:27 2011
@@ -99,7 +99,7 @@ public class RsetCmdHandler implements C
     }
 
     /**
-     * @see org.apache.james.api.protocol.CommonCommandHandler#getImplCommands()
+     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
      */
     public Collection<String> getImplCommands() {
         List<String> commands = new ArrayList<String>();

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StatCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StatCmdHandler.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StatCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StatCmdHandler.java Fri Oct  7 09:23:27 2011
@@ -69,7 +69,7 @@ public class StatCmdHandler implements C
     }
 
     /**
-     * @see org.apache.james.api.protocol.CommonCommandHandler#getImplCommands()
+     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
      */
     public Collection<String> getImplCommands() {
         List<String> commands = new ArrayList<String>();

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java Fri Oct  7 09:23:27 2011
@@ -37,12 +37,8 @@ import org.apache.james.protocols.api.ha
 public class StlsCmdHandler implements CommandHandler<POP3Session>, CapaCapability {
     public final static String COMMAND_NAME = "STLS";
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james
-     * .api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+    /**
+     * @see CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, Request)
      */
     public Response onCommand(POP3Session session, Request request) {
         POP3Response response;
@@ -71,7 +67,7 @@ public class StlsCmdHandler implements C
     }
 
     /**
-     * @see org.apache.james.api.protocol.CommonCommandHandler#getImplCommands()
+     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
      */
     public Collection<String> getImplCommands() {
         List<String> commands = new ArrayList<String>();

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java Fri Oct  7 09:23:27 2011
@@ -160,7 +160,7 @@ public class TopCmdHandler extends RetrC
     }
 
     /**
-     * @see org.apache.james.api.protocol.CommonCommandHandler#getImplCommands()
+     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
      */
     public Collection<String> getImplCommands() {
         List<String> commands = new ArrayList<String>();

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UidlCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UidlCmdHandler.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UidlCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UidlCmdHandler.java Fri Oct  7 09:23:27 2011
@@ -112,9 +112,7 @@ public class UidlCmdHandler implements C
     }
 
     /**
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.api.protocol.CommonCommandHandler#getImplCommands()
+     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
      */
     public Collection<String> getImplCommands() {
         List<String> commands = new ArrayList<String>();

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UnknownCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UnknownCmdHandler.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UnknownCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UnknownCmdHandler.java Fri Oct  7 09:23:27 2011
@@ -47,7 +47,7 @@ public class UnknownCmdHandler implement
     }
 
     /**
-     * @see org.apache.james.api.protocol.CommonCommandHandler#getImplCommands()
+     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
      */
     public Collection<String> getImplCommands() {
         List<String> commands = new ArrayList<String>();

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UserCmdHandler.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UserCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UserCmdHandler.java Fri Oct  7 09:23:27 2011
@@ -63,7 +63,7 @@ public class UserCmdHandler implements C
     }
 
     /**
-     * @see org.apache.james.api.protocol.CommonCommandHandler#getImplCommands()
+     * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands()
      */
     public Collection<String> getImplCommands() {
         List<String> commands = new ArrayList<String>();

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java Fri Oct  7 09:23:27 2011
@@ -30,7 +30,8 @@ public class WelcomeMessageHandler imple
                                                                     // Constants.SOFTWARE_VERSION;
 
     /**
-     * @see org.apache.james.pop3server.ConnectHandler#onConnect(org.apache.james.pop3server.POP3Session)
+     * @see org.apache.james.protocols.api.handler.ConnectHandler
+     * #onConnect(org.apache.james.pop3server.POP3Session)
      */
     public Response onConnect(POP3Session session) {
         StringBuilder responseBuffer = new StringBuilder();

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java Fri Oct  7 09:23:27 2011
@@ -32,11 +32,9 @@ import org.apache.james.protocols.lib.jm
  */
 public class CommandHandlerResultJMXMonitor extends AbstractCommandHandlerResultJMXMonitor<POP3Response, POP3Session> implements LifecycleAwareProtocolHandler {
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.socket.AbstractCommandHandlerResultJMXMonitor#
-     * createCommandHandlerStats(org.apache.james.protocols.api.CommandHandler)
+    /**
+     * @see org.apache.james.protocols.lib.jmx.AbstractCommandHandlerResultJMXMonitor
+     * #createCommandHandlerStats(org.apache.james.protocols.api.CommandHandler)
      */
     protected AbstractCommandHandlerStats<POP3Response> createCommandHandlerStats(CommandHandler<POP3Session> handler) throws Exception {
         Collection<String> col = handler.getImplCommands();

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java Fri Oct  7 09:23:27 2011
@@ -24,11 +24,9 @@ import org.apache.james.protocols.lib.jm
 
 public class ConnectHandlerResultJMXMonitor extends AbstractConnectHandlerResultJMXMonitor<POP3Response, POP3Session> {
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.socket.AbstractConnectHandlerResultJMXMonitor#
-     * getDefaultJMXName()
+    /**
+     * @see org.apache.james.protocols.lib.jmx.AbstractConnectHandlerResultJMXMonitor
+     * #getDefaultJMXName()
      */
     protected String getDefaultJMXName() {
         return "pop3server";

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java Fri Oct  7 09:23:27 2011
@@ -33,10 +33,8 @@ public class JMXHandlersLoader implement
         handlers.add(LineHandlerResultJMXMonitor.class.getName());
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.protocols.api.HandlersPackage#getHandlers()
+    /**
+     * @see org.apache.james.protocols.api.handler.HandlersPackage#getHandlers()
      */
     public List<String> getHandlers() {
         return handlers;

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java Fri Oct  7 09:23:27 2011
@@ -24,12 +24,9 @@ import org.apache.james.protocols.lib.jm
 
 public class LineHandlerResultJMXMonitor extends AbstractLineHandlerResultJMXMonitor<POP3Response, POP3Session> {
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.socket.AbstractLineHandlerResultJMXMonitor#getDefaultJMXName
-     * ()
+     *  org.apache.james.protocols.lib.jmx.AbstractLineHandlerResultJMXMonitor#getDefaultJMXName()
      */
     protected String getDefaultJMXName() {
         return "pop3server";

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java Fri Oct  7 09:23:27 2011
@@ -37,12 +37,10 @@ public class POP3CommandHandlerStats ext
         super(POP3CommandHandlerStatsMBean.class, jmxPath, handlerName, commands);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.socket.AbstractCommandHandlerStats#incrementStats(org
-     * .apache.james.protocols.api.Response)
+     * org.apache.james.protocols.lib.jmx.AbstractCommandHandlerStats
+     * #increment(org.apache.james.protocols.api.Response)
      */
     protected void incrementStats(POP3Response response) {
         String code = response.getRetCode();
@@ -53,9 +51,7 @@ public class POP3CommandHandlerStats ext
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
      * org.apache.james.pop3server.jmx.POP3CommandHandlerStatsMBean#getError()
      */
@@ -63,9 +59,7 @@ public class POP3CommandHandlerStats ext
         return error.get();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.pop3server.jmx.POP3CommandHandlerStatsMBean#getOk()
      */
     public long getOk() {

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java Fri Oct  7 09:23:27 2011
@@ -46,12 +46,9 @@ public class POP3Server extends Abstract
     protected int getDefaultPort() {
         return 110;
     }
-    
-    
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.socket.ServerMBean#getServiceType()
+
+    /**
+     * @see POP3ServerMBean#getServiceType()
      */
     public String getServiceType() {
         return "POP3 Service";

Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java Fri Oct  7 09:23:27 2011
@@ -43,14 +43,12 @@ public abstract class AbstractCommandHan
     private Map<String, AbstractCommandHandlerStats<R>> cStats = new HashMap<String, AbstractCommandHandlerStats<R>>();
     private String jmxName;
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.protocols.api.CommanHandlerResultHandler#onResponse(
+     * org.apache.james.protocols.api.handler.ProtocolHandlerResultHandler#onResponse(
      * org.apache.james.protocols.api.ProtocolSession,
      * org.apache.james.protocols.api.Response, long,
-     * org.apache.james.protocols.api.CommandHandler)
+     * org.apache.james.protocols.api.handler.ProtocolHandler)
      */
     public Response onResponse(ProtocolSession session, R response, long executionTime, ProtocolHandler handler) {
         if (handler instanceof CommandHandler) {
@@ -63,11 +61,9 @@ public abstract class AbstractCommandHan
         return response;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.protocols.api.ExtensibleHandler#getMarkerInterfaces()
+     * org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
      */
     public List<Class<?>> getMarkerInterfaces() {
         List<Class<?>> marker = new ArrayList<Class<?>>();
@@ -75,12 +71,9 @@ public abstract class AbstractCommandHan
         return marker;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.protocols.api.ExtensibleHandler#wireExtensions(java.
-     * lang.Class, java.util.List)
+     * org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException {

Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java (original)
+++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java Fri Oct  7 09:23:27 2011
@@ -78,28 +78,22 @@ public abstract class AbstractCommandHan
      */
     protected abstract void incrementStats(R response);
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.smtpserver.CommandHandlerStatsMBean#getAll()
+    /**
+     * @see org.apache.james.protocols.lib.jmx.CommandHandlerStatsMBean#getAll()
      */
     public long getAll() {
         return all.get();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.smtpserver.CommandHandlerStatsMBean#getName()
+    /**
+     * @see org.apache.james.protocols.lib.jmx.CommandHandlerStatsMBean#getName()
      */
     public String getName() {
         return handlerName;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.lifecycle.Disposable#dispose()
+    /**
+     * @see org.apache.james.lifecycle.api.Disposable#dispose()
      */
     public void dispose() {
         try {
@@ -109,19 +103,15 @@ public abstract class AbstractCommandHan
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.smtpserver.CommandHandlerStatsMBean#getCommands()
+    /**
+     * @see org.apache.james.protocols.lib.jmx.CommandHandlerStatsMBean#getCommands()
      */
     public String[] getCommands() {
         return commands;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.socket.HandlerStatsMBean#getDisconnect()
+    /**
+     * @see org.apache.james.protocols.lib.jmx.CommandHandlerStatsMBean#getDisconnect()
      */
     public long getDisconnect() {
         return disconnect.get();

Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java Fri Oct  7 09:23:27 2011
@@ -60,13 +60,11 @@ public abstract class AbstractConnectHan
 
 
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.protocols.api.LineHandlerResultHandler#onResponse(org
-     * .apache.james.protocols.api.ProtocolSession, boolean, long,
-     * org.apache.james.protocols.api.LineHandler)
+     * org.apache.james.protocols.api.handler.ProtocolHandlerResultHandler
+     * #onResponse(org.apache.james.protocols.api.ProtocolSession, long,
+     * org.apache.james.protocols.api.handler.ProtocolHandler)
      */
     public Response onResponse(ProtocolSession session, Response response, long executionTime, ProtocolHandler handler) {
         if (handler instanceof ConnectHandler) {
@@ -75,11 +73,9 @@ public abstract class AbstractConnectHan
         return response;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.protocols.api.ExtensibleHandler#getMarkerInterfaces()
+     * org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
      */
     public List<Class<?>> getMarkerInterfaces() {
         List<Class<?>> marker = new ArrayList<Class<?>>();
@@ -88,12 +84,9 @@ public abstract class AbstractConnectHan
         return marker;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.protocols.api.ExtensibleHandler#wireExtensions(java.
-     * lang.Class, java.util.List)
+     * org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException {

Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java Fri Oct  7 09:23:27 2011
@@ -45,13 +45,11 @@ public abstract class AbstractLineHandle
     private Map<String, LineHandlerStats> lStats = new HashMap<String, LineHandlerStats>();
     private String jmxName;
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.protocols.api.LineHandlerResultHandler#onResponse(org
-     * .apache.james.protocols.api.ProtocolSession, boolean, long,
-     * org.apache.james.protocols.api.LineHandler)
+     * org.apache.james.protocols.api.handler.ProtocolHandlerResultHandler
+     * #onResponse(org.apache.james.protocols.api.ProtocolSession, longlong,
+     * org.apache.james.protocols.api.handler.ProtocolHandler)
      */
     public Response onResponse(ProtocolSession session, Response response, long executionTime, ProtocolHandler handler) {
         if (handler instanceof LineHandler) {
@@ -60,11 +58,9 @@ public abstract class AbstractLineHandle
         return response;
     }
 
-	/*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.protocols.api.ExtensibleHandler#getMarkerInterfaces()
+     * org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
      */
     public List<Class<?>> getMarkerInterfaces() {
         List<Class<?>> marker = new ArrayList<Class<?>>();
@@ -72,12 +68,9 @@ public abstract class AbstractLineHandle
         return marker;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.protocols.api.ExtensibleHandler#wireExtensions(java.
-     * lang.Class, java.util.List)
+     * org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException {

Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java (original)
+++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java Fri Oct  7 09:23:27 2011
@@ -54,7 +54,7 @@ public class ConnectHandlerStats extends
     /**
      * Increment the stats
      * 
-     * @param result
+     * @param response
      */
     public void increment(Response response) {
         all.incrementAndGet();
@@ -63,38 +63,29 @@ public class ConnectHandlerStats extends
         }
     }
 
-    /*
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.socket.HandlerStatsMBean#getAll()
+    /**
+     * @see org.apache.james.protocols.lib.jmx.HandlerStatsMBean#getAll()
      */
     public long getAll() {
         return all.get();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.socket.HandlerStatsMBean#getName()
+    /**
+     * @see org.apache.james.protocols.lib.jmx.HandlerStatsMBean#getName()
      */
     public String getName() {
         return handlerName;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.socket.HandlerStatsMBean#getDisconnect()
+    /**
+     * @see org.apache.james.protocols.lib.jmx.HandlerStatsMBean#getDisconnect()
      */
     public long getDisconnect() {
         return disconnect.get();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.lifecycle.Disposable#dispose()
+    /**
+     * @see org.apache.james.lifecycle.api.Disposable#dispose()
      */
     public void dispose() {
         try {

Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java (original)
+++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java Fri Oct  7 09:23:27 2011
@@ -56,7 +56,7 @@ public class LineHandlerStats extends St
     /**
      * Increment the stats
      * 
-     * @param result
+     * @param response
      */
     public void increment(Response response) {
         all.incrementAndGet();
@@ -65,37 +65,29 @@ public class LineHandlerStats extends St
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.socket.HandlerStatsMBean#getAll()
+    /**
+     * @see org.apache.james.protocols.lib.jmx.HandlerStatsMBean#getAll()
      */
     public long getAll() {
         return all.get();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.socket.HandlerStatsMBean#getName()
+    /**
+     * @see org.apache.james.protocols.lib.jmx.HandlerStatsMBean#getName()
      */
     public String getName() {
         return handlerName;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.socket.HandlerStatsMBean#getDisconnect()
+    /**
+     * @see org.apache.james.protocols.lib.jmx.HandlerStatsMBean#getDisconnect()
      */
     public long getDisconnect() {
         return disconnect.get();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.lifecycle.Disposable#dispose()
+    /**
+     * @see org.apache.james.lifecycle.api.Disposable#dispose()
      */
     public void dispose() {
         try {

Modified: james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java (original)
+++ james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java Fri Oct  7 09:23:27 2011
@@ -114,21 +114,17 @@ public abstract class AbstractConfigurab
         this.fileSystem = filesystem;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.lifecycle.LogEnabled#setLog(org.slf4j.Logger)
+    /**
+     * @see org.apache.james.lifecycle.api.LogEnabled#setLog(org.slf4j.Logger)
      */
     public final void setLog(Logger logger) {
         this.logger = logger;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.lifecycle.Configurable#configure(org.apache.commons.
-     * configuration.HierarchicalConfiguration)
+     * org.apache.james.lifecycle.api.Configurable
+     * #configure(org.apache.commons.configuration.HierarchicalConfiguration)
      */
     public final void configure(HierarchicalConfiguration config) throws ConfigurationException {
 
@@ -419,7 +415,7 @@ public abstract class AbstractConfigurab
     /**
      * Return the socket type. The Socket type can be secure or plain
      * 
-     * @return
+     * @return the socket type ('plain' or 'secure')
      */
     public String getSocketType() {
         if (isSSLSocket()) {
@@ -428,20 +424,16 @@ public abstract class AbstractConfigurab
         return "plain";
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.socket.ServerMBean#getStartTLSSupported()
+    /**
+     * @see org.apache.james.protocols.lib.jmx.ServerMBean#getStartTLSSupported()
      */
     public boolean getStartTLSSupported() {
         return isStartTLSSupported();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.socket.ServerMBean#getMaximumConcurrentConnections()
+     * org.apache.james.protocols.lib.jmx.ServerMBean#getMaximumConcurrentConnections()
      */
     public int getMaximumConcurrentConnections() {
         return connectionLimit;
@@ -469,19 +461,15 @@ public abstract class AbstractConfigurab
         return enabledCipherSuites;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.socket.ServerMBean#isStarted()
+    /**
+     * @see org.apache.james.protocols.lib.jmx.ServerMBean#isStarted()
      */
     public boolean isStarted() {
         return isBound();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.socket.ServerMBean#start()
+    /**
+     * @see org.apache.james.protocols.lib.jmx.ServerMBean#start()
      */
     public boolean start() {
         try {
@@ -493,29 +481,23 @@ public abstract class AbstractConfigurab
         return true;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.socket.ServerMBean#stop()
+    /**
+     * @see org.apache.james.protocols.lib.jmx.ServerMBean#stop()
      */
     public boolean stop() {
         unbind();
         return true;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.server.jmx.ServerMBean#getHandledConnections()
+    /**
+     * @see org.apache.james.protocols.lib.jmx.ServerMBean#getHandledConnections()
      */
     public long getHandledConnections() {
         return countHandler.getConnectionsTillStartup();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.james.socket.ServerMBean#getCurrentConnections()
+    /**
+     * @see org.apache.james.protocols.lib.jmx.ServerMBean#getCurrentConnections()
      */
     public int getCurrentConnections() {
         return countHandler.getCurrentConnectionCount();
@@ -525,9 +507,7 @@ public abstract class AbstractConfigurab
         return countHandler;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.protocols.lib.jmx.ServerMBean#getBoundAddresses()
      */
     public String[] getBoundAddresses() {

Modified: james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java (original)
+++ james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java Fri Oct  7 09:23:27 2011
@@ -93,7 +93,7 @@ public class ActiveMQMailQueue extends J
      * 
      * @throws NotCompliantMBeanException
      * 
-     * @see #ActiveMQMailQueue(ConnectionFactory, String, boolean, Log)
+     * @see #ActiveMQMailQueue(ConnectionFactory, String, boolean, Logger)
      */
     public ActiveMQMailQueue(final ConnectionFactory connectionFactory, final String queuename, final Logger logger) {
         this(connectionFactory, queuename, true, logger);
@@ -113,12 +113,9 @@ public class ActiveMQMailQueue extends J
         this.useBlob = useBlob;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.james.queue.jms.JMSMailQueue#populateMailMimeMessage(javax
-     * .jms.Message, org.apache.mailet.Mail)
+     * org.apache.james.queue.jms.JMSMailQueue#populateMailMimeMessage(javax.jms.Message, org.apache.mailet.Mail)
      */
     protected void populateMailMimeMessage(Message message, Mail mail) throws MessagingException, JMSException {
         if (message instanceof BlobMessage) {
@@ -144,12 +141,8 @@ public class ActiveMQMailQueue extends J
     }
 
     
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.james.queue.jms.JMSMailQueue#createMessage(javax.jms.Session,
-     * org.apache.mailet.Mail, long)
+    /**
+     * Produce the mail to the JMS Queue
      */
     protected void produceMail(Session session, Map<String, Object> props, int msgPrio, Mail mail) throws JMSException, MessagingException, IOException {
         MessageProducer producer = null;

Modified: james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java (original)
+++ james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java Fri Oct  7 09:23:27 2011
@@ -49,9 +49,7 @@ public class ActiveMQMailQueueItem exten
         this.logger = logger;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.queue.jms.JMSMailQueueItem#done(boolean)
      */
     public void done(boolean success) throws MailQueueException {

Modified: james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java (original)
+++ james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java Fri Oct  7 09:23:27 2011
@@ -52,23 +52,19 @@ public class FileSystemBlobStrategy impl
         this.splitCount = splitCount;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.activemq.blob.BlobUploadStrategy#uploadFile(org.apache.activemq
-     * .command.ActiveMQBlobMessage, java.io.File)
+     * org.apache.activemq.blob.BlobUploadStrategy#uploadFile(org.apache.activemq.command.ActiveMQBlobMessage,
+     * java.io.File)
      */
     public URL uploadFile(ActiveMQBlobMessage message, File file) throws JMSException, IOException {
         return uploadStream(message, new FileInputStream(file));
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.activemq.blob.BlobUploadStrategy#uploadStream(org.apache.activemq
-     * .command.ActiveMQBlobMessage, java.io.InputStream)
+     * org.apache.activemq.blob.BlobUploadStrategy#uploadStream(org.apache.activemq.command.ActiveMQBlobMessage,
+     * java.io.InputStream)
      */
     public URL uploadStream(ActiveMQBlobMessage message, InputStream in) throws JMSException, IOException {
         FileOutputStream out = null;
@@ -102,12 +98,9 @@ public class FileSystemBlobStrategy impl
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see
-     * org.apache.activemq.blob.BlobDownloadStrategy#deleteFile(org.apache.activemq
-     * .command.ActiveMQBlobMessage)
+     * org.apache.activemq.blob.BlobDownloadStrategy#deleteFile(org.apache.activemq.command.ActiveMQBlobMessage)
      */
     public void deleteFile(ActiveMQBlobMessage message) throws IOException, JMSException {
         File f = getFile(message);
@@ -119,7 +112,7 @@ public class FileSystemBlobStrategy impl
     }
 
     /**
-     * Returns a {@link SharedFileInputStream} for the give {@link BlobMessage}
+     * Returns a {@link FileInputStream} for the give {@link BlobMessage}
      */
     public InputStream getInputStream(ActiveMQBlobMessage message) throws IOException, JMSException {
         File f = getFile(message);

Modified: james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java (original)
+++ james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java Fri Oct  7 09:23:27 2011
@@ -39,9 +39,7 @@ public class MimeMessageBlobMessageSourc
         this.sourceId = message.getJMSMessageID();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.core.MimeMessageSource#getInputStream()
      */
     public InputStream getInputStream() throws IOException {
@@ -52,9 +50,7 @@ public class MimeMessageBlobMessageSourc
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
+    /**
      * @see org.apache.james.core.MimeMessageSource#getSourceId()
      */
     public String getSourceId() {

Modified: james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java (original)
+++ james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java Fri Oct  7 09:23:27 2011
@@ -83,11 +83,10 @@ public interface MailQueue {
 
     /**
      * Dequeue the next ready-to-process Mail of the queue. This method will
-     * block until a Mail is ready and then process the {@link DequeueOperation}
-     * . Implementations should take care todo some kind of transactions to not
+     * block until a Mail is ready and then process the operation.
+     * Implementations should take care todo some kind of transactions to not
      * loose any mail on error
      * 
-     * @param dequeueOperation
      * @throws MailQueueException
      */
     MailQueueItem deQueue() throws MailQueueException;

Modified: james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/ManageableMailQueue.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/ManageableMailQueue.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/ManageableMailQueue.java (original)
+++ james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/ManageableMailQueue.java Fri Oct  7 09:23:27 2011
@@ -87,7 +87,7 @@ public interface ManageableMailQueue ext
     }
 
     /**
-     * Represent a View over a queue {@link MailQueueItem}
+     * Represent a View over a queue {@link MailQueue.MailQueueItem}
      */
     public interface MailQueueItemView {
 

Modified: james/server/trunk/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java (original)
+++ james/server/trunk/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueue.java Fri Oct  7 09:23:27 2011
@@ -369,9 +369,7 @@ public class FileMailQueue implements Ma
         }
         
 
-        /*
-         * (non-Javadoc)
-         * 
+        /**
          * @see org.apache.james.core.MimeMessageSource#disposeSource()
          */
         public void dispose() {
@@ -458,10 +456,7 @@ public class FileMailQueue implements Ma
     /**
      * TODO: implement me
      * 
-     * @param type
-     * @param value
-     * @return
-     * @throws MailQueueException
+     * @see ManageableMailQueue#remove(org.apache.james.queue.api.ManageableMailQueue.Type, String)
      */
     @Override
     public long remove(Type type, String value) throws MailQueueException {

Modified: james/server/trunk/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueueFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueueFactory.java?rev=1179977&r1=1179976&r2=1179977&view=diff
==============================================================================
--- james/server/trunk/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueueFactory.java (original)
+++ james/server/trunk/queue-file/src/main/java/org/apache/james/queue/file/FileMailQueueFactory.java Fri Oct  7 09:23:27 2011
@@ -59,8 +59,7 @@ public class FileMailQueueFactory implem
         this.sync = sync;
     }
     
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.queue.api.MailQueueFactory#getQueue(java.lang.String)
      */
     public MailQueue getQueue(String name) {
@@ -78,8 +77,7 @@ public class FileMailQueueFactory implem
         return queue;
     }
 
-    /*
-     * (non-Javadoc)
+    /**
      * @see org.apache.james.lifecycle.api.LogEnabled#setLog(org.slf4j.Logger)
      */
     public void setLog(Logger log) {



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org