Author: felixk Date: Fri Oct 7 13:52:14 2011 New Revision: 1180039 URL: http://svn.apache.org/viewvc?rev=1180039&view=rev Log: Some more javadocs updates/fixes
Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Response.java james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/SessionLog.java james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractCommandDispatcher.java james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractAsyncServer.java james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractChannelPipelineFactory.java james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyProtocolTransport.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/DNSService.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java (original) +++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java Fri Oct 7 13:52:14 2011 @@ -42,8 +42,8 @@ public abstract class AbstractProtocolTr // TODO: Should we limit the size ? private final LinkedList<Response> responses = new LinkedList<Response>(); - /* - * (non-Javadoc) + + /** * @see org.apache.james.protocols.api.ProtocolTransport#writeResponse(org.apache.james.protocols.api.Response, org.apache.james.protocols.api.ProtocolSession) */ public final void writeResponse(Response response, final ProtocolSession session) { Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java (original) +++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java Fri Oct 7 13:52:14 2011 @@ -57,32 +57,28 @@ public abstract class AbstractSession im } - /* - * (non-Javadoc) + /** * @see org.apache.james.protocols.api.ProtocolSession#getRemoteHost() */ public String getRemoteHost() { return socketAddress.getHostName(); } - /* - * (non-Javadoc) + /** * @see org.apache.james.protocols.api.ProtocolSession#getRemoteIPAddress() */ public String getRemoteIPAddress() { return socketAddress.getAddress().getHostAddress(); } - /* - * (non-Javadoc) + /** * @see org.apache.james.protocols.api.ProtocolSession#getUser() */ public String getUser() { return user; } - /* - * (non-Javadoc) + /** * @see org.apache.james.protocols.api.ProtocolSession#setUser(java.lang.String) */ public void setUser(String user) { @@ -96,16 +92,14 @@ public abstract class AbstractSession im return transport; } - /* - * (non-Javadoc) + /** * @see org.apache.james.protocols.api.ProtocolSession#isStartTLSSupported() */ public boolean isStartTLSSupported() { return transport.isStartTLSSupported(); } - /* - * (non-Javadoc) + /** * @see org.apache.james.protocols.api.ProtocolSession#isTLSStarted() */ public boolean isTLSStarted() { @@ -113,8 +107,7 @@ public abstract class AbstractSession im } - /* - * (non-Javadoc) + /** * @see org.apache.james.protocols.api.ProtocolSession#getLogger() */ public Logger getLogger() { @@ -125,8 +118,7 @@ public abstract class AbstractSession im } - /* - * (non-Javadoc) + /** * @see org.apache.james.protocols.api.ProtocolSession#getSessionID() */ public String getSessionID() { @@ -134,17 +126,14 @@ public abstract class AbstractSession im } - - /* - * (non-Javadoc) + /** * @see org.apache.james.protocols.api.ProtocolSession#getConnectionState() */ public Map<String, Object> getConnectionState() { return connectionState; } - /* - * (non-Javadoc) + /** * @see org.apache.james.protocols.api.ProtocolSession#getState() */ @SuppressWarnings("unchecked") Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java (original) +++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/BaseRequest.java Fri Oct 7 13:52:14 2011 @@ -34,17 +34,15 @@ public class BaseRequest implements Requ } - /* - * (non-Javadoc) - * @see org.apache.james.api.protocol.Request#getArgument() + /** + * @see org.apache.james.protocols.api.Request#getArgument() */ public String getArgument() { return argument; } - /* - * (non-Javadoc) - * @see org.apache.james.api.protocol.Request#getCommand() + /** + * @see org.apache.james.protocols.api.Request#getCommand() */ public String getCommand() { return command; Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java (original) +++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java Fri Oct 7 13:52:14 2011 @@ -28,7 +28,7 @@ public interface Protocol { /** * Return the {@link ProtocolHandlerChain} which is defined for the {@link Protocol} - * @return + * @return protocol handler chain */ ProtocolHandlerChain getProtocolChain(); Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Response.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Response.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Response.java (original) +++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Response.java Fri Oct 7 13:52:14 2011 @@ -52,7 +52,7 @@ public interface Response { /** * Return return-code - * @return + * @return the return code */ String getRetCode(); Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/SessionLog.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/SessionLog.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/SessionLog.java (original) +++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/SessionLog.java Fri Oct 7 13:52:14 2011 @@ -41,25 +41,22 @@ public class SessionLog implements Logge return "ID="+ id + " " + str; } - /* - * (non-Javadoc) + /** * @see org.slf4j.Logger#debug(java.lang.String) */ public void debug(String arg0) { logger.debug(getText(arg0)); } - /* - * (non-Javadoc) - * @see org.slf4j.Logger#debug(java.lang.String, java.lang.StringThrowable) + /** + * @see org.slf4j.Logger#debug(String, Throwable) */ public void debug(String arg0, Throwable arg1) { logger.debug(getText(arg0), arg1); } - /* - * (non-Javadoc) + /** * @see org.slf4j.Logger#error(java.lang.String) */ public void error(String arg0) { @@ -67,8 +64,7 @@ public class SessionLog implements Logge } - /* - * (non-Javadoc) + /** * @see org.slf4j.Logger#error(java.lang.String, java.lang.Throwable) */ public void error(String arg0, Throwable arg1) { @@ -76,8 +72,7 @@ public class SessionLog implements Logge } - /* - * (non-Javadoc) + /** * @see org.slf4j.Logger#info(java.lang.String) */ public void info(String arg0) { @@ -85,8 +80,7 @@ public class SessionLog implements Logge } - /* - * (non-Javadoc) + /** * @see org.slf4j.Logger#info(java.lang.String, java.lang.Throwable) */ public void info(String arg0, Throwable arg1) { @@ -94,56 +88,49 @@ public class SessionLog implements Logge } - /* - * (non-Javadoc) + /** * @see org.slf4j.Logger#isDebugEnabled() */ public boolean isDebugEnabled() { return logger.isDebugEnabled(); } - /* - * (non-Javadoc) + /** * @see org.slf4j.Logger#isErrorEnabled() */ public boolean isErrorEnabled() { return logger.isErrorEnabled(); } - /* - * (non-Javadoc) + /** * @see org.slf4j.Logger#isInfoEnabled() */ public boolean isInfoEnabled() { return logger.isInfoEnabled(); } - /* - * (non-Javadoc) + /** * @see org.slf4j.Logger#isTraceEnabled() */ public boolean isTraceEnabled() { return logger.isTraceEnabled(); } - /* - * (non-Javadoc) + /** * @see org.slf4j.Logger#isWarnEnabled() */ public boolean isWarnEnabled() { return logger.isWarnEnabled(); } - /* - * (non-Javadoc) + /** * @see org.slf4j.Logger#trace(java.lang.String) */ public void trace(String arg0) { logger.trace(getText(arg0)); } - /* - * (non-Javadoc) + /** * @see org.slf4j.Logger#trace(java.lang.String, java.lang.Throwable) */ public void trace(String arg0, Throwable arg1) { @@ -151,8 +138,7 @@ public class SessionLog implements Logge } - /* - * (non-Javadoc) + /** * @see org.slf4j.Logger#warn(java.lang.String) */ public void warn(String arg0) { @@ -160,8 +146,7 @@ public class SessionLog implements Logge } - /* - * (non-Javadoc) + /** * @see org.slf4j.Logger#warn(java.lang.String, java.lang.Throwable) */ public void warn(String arg0, Throwable arg1) { Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractCommandDispatcher.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractCommandDispatcher.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractCommandDispatcher.java (original) +++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractCommandDispatcher.java Fri Oct 7 13:52:14 2011 @@ -125,9 +125,8 @@ public abstract class AbstractCommandDis } - /* - * (non-Javadoc) - * @see org.apache.james.api.protocol.LineHandler#onLine(org.apache.james.api.protocol.ProtocolSession, byte[]) + /** + * @see org.apache.james.protocols.api.handler.LineHandler#onLine(ProtocolSession, byte[]) */ public Response onLine(final Session session, byte[] line) { String curCommandName = null; Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java (original) +++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java Fri Oct 7 13:52:14 2011 @@ -37,9 +37,8 @@ public abstract class AbstractProtocolHa */ protected abstract List<Object> getHandlers(); - /* - * (non-Javadoc) - * @see org.apache.james.protocols.api.ProtocolHandlerChain#getHandlers(java.lang.Class) + /** + * @see org.apache.james.protocols.api.handler.ProtocolHandlerChain#getHandlers(java.lang.Class) */ @SuppressWarnings("unchecked") public <T> LinkedList<T> getHandlers(Class<T> type) { Modified: james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractAsyncServer.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractAsyncServer.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractAsyncServer.java (original) +++ james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractAsyncServer.java Fri Oct 7 13:52:14 2011 @@ -179,7 +179,7 @@ public abstract class AbstractAsyncServe /** * Return the read/write timeout for the socket. - * @return + * @return the set timeout */ public synchronized int getTimeout() { return timeout; Modified: james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractChannelPipelineFactory.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractChannelPipelineFactory.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractChannelPipelineFactory.java (original) +++ james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractChannelPipelineFactory.java Fri Oct 7 13:52:14 2011 @@ -59,8 +59,7 @@ public abstract class AbstractChannelPip - /* - * (non-Javadoc) + /** * @see org.jboss.netty.channel.ChannelPipelineFactory#getPipeline() */ public ChannelPipeline getPipeline() throws Exception { Modified: james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java (original) +++ james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java Fri Oct 7 13:52:14 2011 @@ -193,7 +193,7 @@ public class BasicChannelUpstreamHandler /** * Cleanup the channel * - * @param channel + * @param ctx */ protected void cleanup(ChannelHandlerContext ctx) { ProtocolSession session = (ProtocolSession) ctx.getAttachment(); Modified: james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyProtocolTransport.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyProtocolTransport.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyProtocolTransport.java (original) +++ james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyProtocolTransport.java Fri Oct 7 13:52:14 2011 @@ -47,24 +47,21 @@ public class NettyProtocolTransport exte this.engine = engine; } - /* - * (non-Javadoc) + /** * @see org.apache.james.protocols.api.ProtocolTransport#getRemoteAddress() */ public InetSocketAddress getRemoteAddress() { return (InetSocketAddress) channel.getRemoteAddress(); } - /* - * (non-Javadoc) + /** * @see org.apache.james.protocols.api.ProtocolTransport#getId() */ public String getId() { return channel.getId() + ""; } - /* - * (non-Javadoc) + /** * @see org.apache.james.protocols.api.ProtocolTransport#isTLSStarted() */ public boolean isTLSStarted() { @@ -74,8 +71,7 @@ public class NettyProtocolTransport exte return false; } - /* - * (non-Javadoc) + /** * @see org.apache.james.protocols.api.ProtocolTransport#isStartTLSSupported() */ public boolean isStartTLSSupported() { @@ -83,8 +79,7 @@ public class NettyProtocolTransport exte } - /* - * (non-Javadoc) + /** * @see org.apache.james.protocols.api.ProtocolTransport#popLineHandler() */ public void popLineHandler() { @@ -94,8 +89,7 @@ public class NettyProtocolTransport exte } } - /* - * (non-Javadoc) + /** * @see org.apache.james.protocols.api.ProtocolTransport#pushLineHandler(org.apache.james.protocols.api.handler.LineHandler, org.apache.james.protocols.api.ProtocolSession) */ public <T extends ProtocolSession> void pushLineHandler(LineHandler<T> overrideCommandHandler, @@ -108,8 +102,7 @@ public class NettyProtocolTransport exte channel.getPipeline().addBefore("coreHandler", "lineHandler" + lineHandlerCount, new LineHandlerUpstreamHandler<T>(session, overrideCommandHandler)); } - /* - * (non-Javadoc) + /** * @see org.apache.james.protocols.api.ProtocolTransport#getPushedLineHandlerCount() */ public int getPushedLineHandlerCount() { Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/DNSService.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/DNSService.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/DNSService.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/DNSService.java Fri Oct 7 13:52:14 2011 @@ -97,11 +97,20 @@ public interface DNSService { InetAddress getByName(String host) throws UnknownHostException; /** - * @see org.xbill.DNS.Address#getHostName(InetAddress) + * Determines the hostname for an address + * @param addr + * the address record + * @return + * the hostname defined in the address record */ String getHostName(InetAddress addr); + /** + * get the local hosts {@link InetAddress} + * @return + * the localhosts inet address + * @throws UnknownHostException */ InetAddress getLocalHost() throws UnknownHostException; } Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/MailEnvelopeImpl.java Fri Oct 7 13:52:14 2011 @@ -41,9 +41,8 @@ public class MailEnvelopeImpl implements private ByteArrayOutputStream outputStream; - /* - * (non-Javadoc) - * @see org.apache.james.smtpserver.protocol.MailEnvelope#getSize() + /** + * @see org.apache.james.protocols.smtp.MailEnvelope#getSize() */ public int getSize() { if (outputStream == null) @@ -51,17 +50,15 @@ public class MailEnvelopeImpl implements return outputStream.size(); } - /* - * (non-Javadoc) - * @see org.apache.james.smtpserver.protocol.MailEnvelope#getRecipients() + /** + * @see org.apache.james.protocols.smtp.MailEnvelope#getRecipients() */ public List<MailAddress> getRecipients() { return recipients; } - /* - * (non-Javadoc) - * @see org.apache.james.smtpserver.protocol.MailEnvelope#getSender() + /** + * @see org.apache.james.protocols.smtp.MailEnvelope#getSender() */ public MailAddress getSender() { return sender; @@ -85,9 +82,8 @@ public class MailEnvelopeImpl implements this.sender = sender; } - /* - * (non-Javadoc) - * @see org.apache.james.smtpserver.protocol.MailEnvelope#getMessageOutputStream() + /** + * @see org.apache.james.protocols.smtp.MailEnvelope#getMessageOutputStream() */ public OutputStream getMessageOutputStream() { if (outputStream == null) { @@ -96,9 +92,8 @@ public class MailEnvelopeImpl implements return outputStream; } - /* - * (non-Javadoc) - * @see org.apache.james.smtpserver.protocol.MailEnvelope#getMessageInputStream() + /** + * @see org.apache.james.protocols.smtp.MailEnvelope#getMessageInputStream() */ public InputStream getMessageInputStream() { return new ByteArrayInputStream(outputStream.toByteArray()); Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java Fri Oct 7 13:52:14 2011 @@ -149,11 +149,9 @@ public class SMTPProtocolHandlerChain ex return hooks.indexOf(hook); } - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.protocols.api.AbstractProtocolHandlerChain#getHandlers() + * org.apache.james.protocols.api.handler.AbstractProtocolHandlerChain#getHandlers() */ @Override protected synchronized List<Object> getHandlers() { Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java Fri Oct 7 13:52:14 2011 @@ -79,8 +79,8 @@ public class SMTPResponse extends Abstra return null; } } - /* - * (non-Javadoc) + + /** * @see org.apache.james.protocols.api.Response#getLines() */ public List<CharSequence> getLines() { Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java Fri Oct 7 13:52:14 2011 @@ -116,7 +116,7 @@ public interface SMTPSession extends Pro /** * Return the size of the pushed {@link LineHandler} - * @return + * @return size of the pushed line handler */ int getPushedLineHandlerCount(); Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java Fri Oct 7 13:52:14 2011 @@ -76,7 +76,7 @@ public class SMTPSessionImpl extends Abs } /** - * @see org.apache.james.protocols.smtp.SMTPSession#pushLineHandler(org.apache.james.smtpserver.protocol.LineHandler) + * @see org.apache.james.protocols.smtp.SMTPSession#pushLineHandler(LineHandler) */ public void pushLineHandler(LineHandler<SMTPSession> overrideCommandHandler) { transport.pushLineHandler(overrideCommandHandler, this); Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java Fri Oct 7 13:52:14 2011 @@ -46,8 +46,8 @@ public abstract class AbstractHookableCm /** * Handle command processing * - * @see org.apache.james.smtpserver.protocol.CommandHandler#onCommand(org.apache.james.protocols.smtp.SMTPSession, - * java.lang.String, java.lang.String) + * @see org.apache.james.protocols.api.handler.CommandHandler + * #onCommand(org.apache.james.protocols.api.ProtocolSession, Request) */ public Response onCommand(SMTPSession session, Request request) { String command = request.getCommand(); @@ -193,7 +193,7 @@ public abstract class AbstractHookableCm * @param session * @param command * @param parameters - * @return + * @return smtp response if a syntax error was detected, otherwise <code>null</code> */ protected abstract SMTPResponse doFilterChecks(SMTPSession session, String command, String parameters); @@ -204,7 +204,7 @@ public abstract class AbstractHookableCm * @param session * @param command * @param parameters - * @return + * @return smtp response */ protected abstract SMTPResponse doCoreCmd(SMTPSession session, String command, String parameters); @@ -244,7 +244,7 @@ public abstract class AbstractHookableCm /** * Return a list which holds all hooks for the cmdHandler * - * @return + * @return list containing all hooks for the cmd handler */ protected List<Hook> getHooks() { return hooks; Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java Fri Oct 7 13:52:14 2011 @@ -45,9 +45,9 @@ public class DataCmdHandler implements C public static final class DataConsumerLineHandler implements LineHandler<SMTPSession> { - /* - * (non-Javadoc) - * @see org.apache.james.api.protocol.LineHandler#onLine(org.apache.james.api.protocol.ProtocolSession, byte[]) + /** + * @see org.apache.james.protocols.api.handler.LineHandler + * #onLine(org.apache.james.protocols.api.ProtocolSession, byte[]) */ public SMTPResponse onLine(SMTPSession session, byte[] line) { @@ -69,9 +69,9 @@ public class DataCmdHandler implements C this.next = next; } - /* - * (non-Javadoc) - * @see org.apache.james.api.protocol.LineHandler#onLine(org.apache.james.api.protocol.ProtocolSession, byte[]) + /** + * @see org.apache.james.protocols.api.handler.LineHandler + * #onLine(org.apache.james.protocols.api.ProtocolSession, byte[]) */ public Response onLine(SMTPSession session, byte[] line) { return filter.onLine(session, line, next); @@ -125,7 +125,7 @@ public class DataCmdHandler implements C /** - * @see org.apache.james.smtpserver.protocol.CommandHandler#getImplCommands() + * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() */ public Collection<String> getImplCommands() { Collection<String> implCommands = new ArrayList<String>(); Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java Fri Oct 7 13:52:14 2011 @@ -53,9 +53,8 @@ public class DataLineMessageHookHandler private List rHooks; - /* - * (non-Javadoc) - * @see org.apache.james.smtpserver.protocol.core.DataLineFilter#onLine(org.apache.james.smtpserver.protocol.SMTPSession, byte[], org.apache.james.api.protocol.LineHandler) + /** + * @see org.apache.james.protocols.smtp.core.DataLineFilter#onLine(SMTPSession, byte[], LineHandler) */ public Response onLine(final SMTPSession session, byte[] line, LineHandler<SMTPSession> next) { MailEnvelopeImpl env = (MailEnvelopeImpl) session.getState().get(DataCmdHandler.MAILENV); Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java Fri Oct 7 13:52:14 2011 @@ -53,7 +53,7 @@ public class ExpnCmdHandler implements C } /** - * @see org.apache.james.smtpserver.protocol.CommandHandler#getImplCommands() + * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() */ public Collection<String> getImplCommands() { Collection<String> implCommands = new ArrayList<String>(); Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HeloCmdHandler.java Fri Oct 7 13:52:14 2011 @@ -40,7 +40,7 @@ public class HeloCmdHandler extends Abst private final static String COMMAND_NAME = "HELO"; /** - * @see org.apache.james.smtpserver.protocol.CommandHandler#getImplCommands() + * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() */ public Collection<String> getImplCommands() { Collection<String> implCommands = new ArrayList<String>(); @@ -86,7 +86,7 @@ public class HeloCmdHandler extends Abst } /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#getHookInterface() + * {@inheritDoc} */ protected Class<HeloHook> getHookInterface() { return HeloHook.class; @@ -94,7 +94,7 @@ public class HeloCmdHandler extends Abst /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#callHook(java.lang.Object, org.apache.james.protocols.smtp.SMTPSession, java.lang.String) + * {@inheritDoc} */ protected HookResult callHook(HeloHook rawHook, SMTPSession session, String parameters) { return rawHook.doHelo(session, parameters); Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java Fri Oct 7 13:52:14 2011 @@ -51,7 +51,7 @@ public class HelpCmdHandler implements C } /** - * @see org.apache.james.smtpserver.protocol.CommandHandler#getImplCommands() + * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() */ public Collection<String> getImplCommands() { Collection<String> implCommands = new ArrayList<String>(); Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/MailCmdHandler.java Fri Oct 7 13:52:14 2011 @@ -49,13 +49,10 @@ public class MailCmdHandler extends Abst */ private Map<String, MailParametersHook> paramHooks; - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.smtpserver.protocol.core.AbstractHookableCmdHandler# - * onCommand(org.apache.james.smtpserver.protocol.SMTPSession, - * org.apache.james.api.protocol.Request) + * org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler + * #onCommand(SMTPSession, Request) */ public Response onCommand(SMTPSession session, Request request) { Response response = super.onCommand(session, request); @@ -92,7 +89,7 @@ public class MailCmdHandler extends Abst } /** - * @see org.apache.james.smtpserver.protocol.CommandHandler#getImplCommands() + * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() */ public Collection<String> getImplCommands() { Collection<String> implCommands = new ArrayList<String>(); @@ -261,7 +258,7 @@ public class MailCmdHandler extends Abst /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#callHook(java.lang.Object, org.apache.james.protocols.smtp.SMTPSession, java.lang.String) + * {@inheritDoc} */ protected HookResult callHook(MailHook rawHook, SMTPSession session, String parameters) { return rawHook.doMail(session,(MailAddress) session.getState().get(SMTPSession.SENDER)); Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java Fri Oct 7 13:52:14 2011 @@ -52,7 +52,7 @@ public class NoopCmdHandler implements C } /** - * @see org.apache.james.smtpserver.protocol.CommandHandler#getImplCommands() + * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() */ public Collection<String> getImplCommands() { Collection<String> implCommands = new ArrayList<String>(); Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/QuitCmdHandler.java Fri Oct 7 13:52:14 2011 @@ -70,7 +70,7 @@ public class QuitCmdHandler extends Abst } /** - * @see org.apache.james.smtpserver.protocol.CommandHandler#getImplCommands() + * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() */ public Collection<String> getImplCommands() { Collection<String> implCommands = new ArrayList<String>(); @@ -105,7 +105,7 @@ public class QuitCmdHandler extends Abst } /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#callHook(java.lang.Object, org.apache.james.protocols.smtp.SMTPSession, java.lang.String) + * {@inheritDoc} */ protected HookResult callHook(QuitHook rawHook, SMTPSession session, String parameters) { return rawHook.doQuit(session); Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java Fri Oct 7 13:52:14 2011 @@ -50,8 +50,10 @@ public class RcptCmdHandler extends Abst * * @param session * SMTP session object - * @param argument - * the argument passed in with the command by the SMTP client + * @param command + * command passed + * @param parameters + * parameters passed in with the command by the SMTP client */ @SuppressWarnings("unchecked") protected SMTPResponse doCoreCmd(SMTPSession session, String command, @@ -224,7 +226,7 @@ public class RcptCmdHandler extends Abst } /** - * @see org.apache.james.smtpserver.protocol.CommandHandler#getImplCommands() + * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() */ public Collection<String> getImplCommands() { Collection<String> implCommands = new ArrayList<String>(); @@ -241,8 +243,7 @@ public class RcptCmdHandler extends Abst } /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#callHook(java.lang.Object, - * org.apache.james.protocols.smtp.SMTPSession, java.lang.String) + * {@inheritDoc} */ protected HookResult callHook(RcptHook rawHook, SMTPSession session, String parameters) { Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java Fri Oct 7 13:52:14 2011 @@ -45,9 +45,8 @@ public class ReceivedDataLineFilter impl private final static String HEADERS_WRITTEN = "HEADERS_WRITTEN"; - /* - * (non-Javadoc) - * @see org.apache.james.smtpserver.protocol.core.DataLineFilter#onLine(org.apache.james.smtpserver.protocol.SMTPSession, byte[], org.apache.james.api.protocol.LineHandler) + /** + * @see org.apache.james.protocols.smtp.core.DataLineFilter#onLine(SMTPSession, byte[], LineHandler) */ public Response onLine(SMTPSession session, byte[] line, LineHandler<SMTPSession> next) { if (session.getState().containsKey(HEADERS_WRITTEN) == false) { Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java Fri Oct 7 13:52:14 2011 @@ -68,7 +68,7 @@ public class RsetCmdHandler implements C } /** - * @see org.apache.james.smtpserver.protocol.CommandHandler#getImplCommands() + * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() */ public Collection<String> getImplCommands() { Collection<String> implCommands = new ArrayList<String>(); Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/UnknownCmdHandler.java Fri Oct 7 13:52:14 2011 @@ -42,7 +42,7 @@ public class UnknownCmdHandler extends A public static final String UNKNOWN_COMMAND = "UNKNOWN"; /** - * @see org.apache.james.smtpserver.protocol.CommandHandler#getImplCommands() + * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() */ public Collection<String> getImplCommands() { Collection<String> implCommands = new ArrayList<String>(); Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java Fri Oct 7 13:52:14 2011 @@ -51,7 +51,7 @@ public class VrfyCmdHandler implements C } /** - * @see org.apache.james.smtpserver.protocol.CommandHandler#getImplCommands() + * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() */ public Collection<String> getImplCommands() { Collection<String> implCommands = new ArrayList<String>(); Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java Fri Oct 7 13:52:14 2011 @@ -40,7 +40,7 @@ public class WelcomeMessageHandler imple private final static RFC822DateFormat rfc822DateFormat = new RFC822DateFormat(); /** - * @see org.apache.james.smtpserver.protocol.ConnectHandler#onConnect(SMTPSession) + * @see org.apache.james.protocols.api.handler.ConnectHandler#onConnect(org.apache.james.protocols.api.ProtocolSession) */ public Response onConnect(SMTPSession session) { String smtpGreeting = session.getSMTPGreeting(); Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java Fri Oct 7 13:52:14 2011 @@ -440,7 +440,7 @@ public class AuthCmdHandler /** - * @see org.apache.james.smtpserver.protocol.CommandHandler#getImplCommands() + * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() */ public Collection<String> getImplCommands() { Collection<String> implCommands = new ArrayList<String>(); @@ -492,7 +492,7 @@ public class AuthCmdHandler /** * Return a list which holds all hooks for the cmdHandler * - * @return + * @return list containing all hooks for the cmd handler */ protected List<AuthHook> getHooks() { return hooks; Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java Fri Oct 7 13:52:14 2011 @@ -71,7 +71,7 @@ public class EhloCmdHandler extends Abst } /** - * @see org.apache.james.smtpserver.protocol.CommandHandler#getImplCommands() + * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() */ public Collection<String> getImplCommands() { Collection<String> implCommands = new ArrayList<String>(); @@ -158,7 +158,7 @@ public class EhloCmdHandler extends Abst } /** - * @see org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler#callHook(java.lang.Object, org.apache.james.protocols.smtp.SMTPSession, java.lang.String) + * {@inheritDoc} */ protected HookResult callHook(HeloHook rawHook, SMTPSession session, String parameters) { return rawHook.doHelo(session, parameters); @@ -166,8 +166,7 @@ public class EhloCmdHandler extends Abst - /* - * (non-Javadoc) + /** * @see org.apache.james.protocols.smtp.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.protocols.smtp.SMTPSession) */ public List<String> getImplementedEsmtpFeatures(SMTPSession session) { Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java Fri Oct 7 13:52:14 2011 @@ -133,9 +133,8 @@ public class MailSizeEsmtpExtension impl } - /* - * (non-Javadoc) - * @see org.apache.james.smtpserver.protocol.core.DataLineFilter#onLine(org.apache.james.smtpserver.protocol.SMTPSession, byte[], org.apache.james.api.protocol.LineHandler) + /** + * @see org.apache.james.protocols.smtp.core.DataLineFilter#onLine(SMTPSession, byte[], LineHandler) */ public Response onLine(SMTPSession session, byte[] line, LineHandler<SMTPSession> next) { Response response = null; @@ -176,7 +175,7 @@ public class MailSizeEsmtpExtension impl } /** - * @see org.apache.james.protocols.smtp.hook.MessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession, org.apache.james.protocols.smtp.MailEnvelopeImpl) + * @see org.apache.james.protocols.smtp.hook.MessageHook#onMessage(SMTPSession, MailEnvelope) */ public HookResult onMessage(SMTPSession session, MailEnvelope mail) { Boolean failed = (Boolean) session.getState().get(MESG_FAILED); Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java Fri Oct 7 13:52:14 2011 @@ -42,7 +42,7 @@ public class StartTlsCmdHandler implemen private final static String COMMAND_NAME = "STARTTLS"; /** - * @see org.apache.james.smtpserver.protocol.CommandHandler#getImplCommands() + * @see org.apache.james.protocols.api.handler.CommandHandler#getImplCommands() */ public Collection<String> getImplCommands() { Collection<String> commands = new ArrayList<String>(); Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java Fri Oct 7 13:52:14 2011 @@ -91,9 +91,6 @@ public class ResolvableEhloHeloHandler i } - /** - * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#check(org.apache.james.protocols.smtp.SMTPSession) - */ protected boolean check(SMTPSession session,MailAddress rcpt) { // not reject it if (session.getState().get(BAD_EHLO_HELO) == null) { Modified: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java?rev=1180039&r1=1180038&r2=1180039&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java (original) +++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java Fri Oct 7 13:52:14 2011 @@ -137,16 +137,14 @@ public class BaseFakeSMTPSession impleme throw new UnsupportedOperationException("Unimplemented Stub Method"); } - /* - * (non-Javadoc) + /** * @see org.apache.james.smtpserver.protocol.SMTPSession#pushLineHandler(org.apache.james.api.protocol.LineHandler) */ public void pushLineHandler(LineHandler<SMTPSession> overrideCommandHandler) { throw new UnsupportedOperationException("Unimplemented Stub Method"); } - /* - * (non-Javadoc) + /** * @see org.apache.james.api.protocol.LogEnabledSession#writeResponse(org.apache.james.api.protocol.Response) */ public void writeResponse(Response response) { --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org