Author: felixk Date: Fri Oct 7 12:25:07 2011 New Revision: 1180021 URL: http://svn.apache.org/viewvc?rev=1180021&view=rev Log: Some more javadocs updates/fixes
Modified: james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueItem.java james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java james/server/trunk/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java james/server/trunk/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java james/server/trunk/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java james/server/trunk/util/src/main/java/org/apache/james/util/concurrent/NamedThreadFactory.java Modified: james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java (original) +++ james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java Fri Oct 7 12:25:07 2011 @@ -82,10 +82,9 @@ public class JMSMailQueue implements Man /** * <p> - * Execute the given {@link DequeueOperation} when a mail is ready to - * process. As JMS does not support delay scheduling out-of-the box, we use - * a messageselector to check if a mail is ready. For this a - * {@link MessageConsumer#receive(long) is used with a timeout of 10 + * Dequeues a mail when it is ready to process. As JMS does not support delay scheduling out-of-the box, + * we use a messageselector to check if a mail is ready. For this a + * {@link MessageConsumer#receive(long)} is used with a timeout of 10 * seconds. * </p> * <p> @@ -174,10 +173,8 @@ public class JMSMailQueue implements Man } - /* - * (non-Javadoc) - * - * @see org.apache.james.queue.MailQueue#enQueue(org.apache.mailet.Mail, + /** + * @see org.apache.james.queue.api.MailQueue#enQueue(org.apache.mailet.Mail, * long, java.util.concurrent.TimeUnit) */ public void enQueue(Mail mail, long delay, TimeUnit unit) throws MailQueueException { @@ -233,10 +230,8 @@ public class JMSMailQueue implements Man } } - /* - * (non-Javadoc) - * - * @see org.apache.james.queue.MailQueue#enQueue(org.apache.mailet.Mail) + /** + * @see org.apache.james.queue.api.MailQueue#enQueue(org.apache.mailet.Mail) */ public void enQueue(Mail mail) throws MailQueueException { enQueue(mail, NO_DELAY, TimeUnit.MILLISECONDS); @@ -289,7 +284,6 @@ public class JMSMailQueue implements Man /** * Get JMS Message properties with values * - * @param message * @param mail * @param delayInMillis * @throws JMSException @@ -352,10 +346,10 @@ public class JMSMailQueue implements Man /** * Create the complete Mail from the JMS Message. So the created - * {@link Mail} is completly populated + * {@link Mail} is completely populated * * @param message - * @return + * @return the complete mail * @throws MessagingException * @throws JMSException */ @@ -472,7 +466,7 @@ public class JMSMailQueue implements Man } /** - * Create a {@link MailQueueItem} for the given parameters + * Create a {@link org.apache.james.queue.api.MailQueue.MailQueueItem} for the given parameters * * @param connection * @param session @@ -491,9 +485,7 @@ public class JMSMailQueue implements Man return JAMES_NEXT_DELIVERY + " <= " + System.currentTimeMillis() + " OR " + FORCE_DELIVERY + " = true"; } - /* - * (non-Javadoc) - * + /** * @see org.apache.james.queue.api.ManageableMailQueue#getSize() */ @SuppressWarnings("unchecked") @@ -544,9 +536,7 @@ public class JMSMailQueue implements Man } } - /* - * (non-Javadoc) - * + /** * @see org.apache.james.queue.api.ManageableMailQueue#flush() */ public long flush() throws MailQueueException { @@ -626,9 +616,7 @@ public class JMSMailQueue implements Man } } - /* - * (non-Javadoc) - * + /** * @see org.apache.james.queue.api.MailQueueManagementMBean#clear() */ public long clear() throws MailQueueException { @@ -735,12 +723,10 @@ public class JMSMailQueue implements Man return copy; } - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.queue.api.ManageableMailQueue#remove(org.apache.james - * .queue.api.ManageableMailQueue.Type, java.lang.String) + * org.apache.james.queue.api.ManageableMailQueue#remove(org.apache.james.queue.api.ManageableMailQueue.Type, + * java.lang.String) */ public long remove(Type type, String value) throws MailQueueException { switch (type) { @@ -756,9 +742,7 @@ public class JMSMailQueue implements Man return -1; } - /* - * (non-Javadoc) - * + /** * @see org.apache.james.queue.api.ManageableMailQueue#browse() */ @SuppressWarnings("unchecked") @@ -789,9 +773,7 @@ public class JMSMailQueue implements Man throw new UnsupportedOperationException("Read-only"); } - /* - * (non-Javadoc) - * + /** * @see java.util.Iterator#next() */ public MailQueueItemView next() { @@ -802,23 +784,17 @@ public class JMSMailQueue implements Man final long nextDelivery = m.getLongProperty(JAMES_NEXT_DELIVERY); return new MailQueueItemView() { - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.queue.api.ManageableMailQueue - * .MailQueueItemView#getNextDelivery() + * org.apache.james.queue.api.ManageableMailQueue.MailQueueItemView#getNextDelivery() */ public long getNextDelivery() { return nextDelivery; } - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.queue.api.ManageableMailQueue - * .MailQueueItemView#getMail() + * org.apache.james.queue.api.ManageableMailQueue.MailQueueItemView#getMail() */ public Mail getMail() { return mail; @@ -835,21 +811,16 @@ public class JMSMailQueue implements Man } - /* - * (non-Javadoc) - * + /** * @see java.util.Iterator#hasNext() */ public boolean hasNext() { return messages.hasMoreElements(); } - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.queue.api.ManageableMailQueue.MailQueueIterator - * #close() + * org.apache.james.queue.api.ManageableMailQueue.MailQueueIterator#close() */ public void close() { Modified: james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java (original) +++ james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueFactory.java Fri Oct 7 12:25:07 2011 @@ -37,9 +37,7 @@ public class JMSMailQueueFactory extends this.connectionFactory = connectionFactory; } - /* - * (non-Javadoc) - * + /** * @see * org.apache.james.queue.library.AbstractMailQueueFactory#createMailQueue * (java.lang.String) Modified: james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueItem.java URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueItem.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueItem.java (original) +++ james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueueItem.java Fri Oct 7 12:25:07 2011 @@ -45,10 +45,8 @@ public class JMSMailQueueItem implements this.consumer = consumer; } - /* - * (non-Javadoc) - * - * @see org.apache.james.queue.MailQueue.MailQueueItem#done(boolean) + /** + * @see org.apache.james.queue.api.MailQueue.MailQueueItem#done(boolean) */ public void done(boolean success) throws MailQueueException { try { @@ -88,10 +86,8 @@ public class JMSMailQueueItem implements } } - /* - * (non-Javadoc) - * - * @see org.apache.james.queue.MailQueue.MailQueueItem#getMail() + /** + * @see org.apache.james.queue.api.MailQueue.MailQueueItem#getMail() */ public Mail getMail() { return mail; Modified: james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java (original) +++ james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/MimeMessageObjectMessageSource.java Fri Oct 7 12:25:07 2011 @@ -53,28 +53,22 @@ public class MimeMessageObjectMessageSou return content.length; } - /* - * (non-Javadoc) - * + /** * @see org.apache.james.core.MimeMessageSource#getInputStream() */ public InputStream getInputStream() throws IOException { return in.newStream(0, -1); } - /* - * (non-Javadoc) - * + /** * @see org.apache.james.core.MimeMessageSource#getSourceId() */ public String getSourceId() { return id; } - /* - * (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/queue-jms/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java (original) +++ james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java Fri Oct 7 12:25:07 2011 @@ -73,13 +73,9 @@ public abstract class AbstractMailQueueF } - /* - * - * (non-Javadoc) - * + /** * @see - * org.apache.james.queue.activemq.MailQueueFactory#getQueue(java.lang.String - * ) + * org.apache.james.queue.api.MailQueueFactory#getQueue(java.lang.String) */ public synchronized final MailQueue getQueue(String name) { MailQueue queue = queues.get(name); @@ -133,10 +129,8 @@ public abstract class AbstractMailQueueF } - /* - * (non-Javadoc) - * - * @see org.apache.james.lifecycle.LogEnabled#setLog(org.slf4j.Logger) + /** + * @see org.apache.james.lifecycle.api.LogEnabled#setLog(org.slf4j.Logger) */ public void setLog(Logger log) { this.log = log; Modified: james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java (original) +++ james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/library/MailQueueManagement.java Fri Oct 7 12:25:07 2011 @@ -56,9 +56,7 @@ public class MailQueueManagement extends } - /* - * (non-Javadoc) - * + /** * @see org.apache.james.queue.api.MailQueueManagementMBean#clear() */ public long clear() throws Exception { @@ -69,9 +67,7 @@ public class MailQueueManagement extends } } - /* - * (non-Javadoc) - * + /** * @see org.apache.james.queue.api.MailQueueManagementMBean#flush() */ public long flush() throws Exception { @@ -82,9 +78,7 @@ public class MailQueueManagement extends } } - /* - * (non-Javadoc) - * + /** * @see org.apache.james.queue.api.MailQueueManagementMBean#getSize() */ public long getSize() throws Exception { @@ -95,12 +89,9 @@ public class MailQueueManagement extends } } - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.queue.api.MailQueueManagementMBean#removeWithName(java - * .lang.String) + * org.apache.james.queue.api.MailQueueManagementMBean#removeWithName(java.lang.String) */ public long removeWithName(String name) throws Exception { try { @@ -110,9 +101,7 @@ public class MailQueueManagement extends } } - /* - * (non-Javadoc) - * + /** * @see * org.apache.james.queue.api.MailQueueManagementMBean#removeWithRecipient * (java.lang.String) @@ -125,12 +114,9 @@ public class MailQueueManagement extends } } - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.queue.api.MailQueueManagementMBean#removeWithSender( - * java.lang.String) + * org.apache.james.queue.api.MailQueueManagementMBean#removeWithSender(java.lang.String) */ public long removeWithSender(String address) throws Exception { try { @@ -140,9 +126,7 @@ public class MailQueueManagement extends } } - /* - * (non-Javadoc) - * + /** * @see org.apache.james.queue.api.MailQueueManagementMBean#browse() */ @SuppressWarnings("unchecked") Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java Fri Oct 7 12:25:07 2011 @@ -112,10 +112,8 @@ public class CoreCmdHandlerLoader implem commands.add(HOOKRESULTLOGGER); } - /* - * (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/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/DataLineJamesMessageHookHandler.java Fri Oct 7 12:25:07 2011 @@ -63,13 +63,9 @@ public class DataLineJamesMessageHookHan private List<MessageHook> mHandlers; - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.smtpserver.protocol.core.DataLineFilter#onLine(org.apache - * .james.smtpserver.protocol.SMTPSession, byte[], - * org.apache.james.api.protocol.LineHandler) + * org.apache.james.protocols.smtp.core.DataLineFilter#onLine(SMTPSession, byte[], LineHandler) */ public Response onLine(SMTPSession session, byte[] line, LineHandler<SMTPSession> next) { MimeMessageInputStreamSource mmiss = (MimeMessageInputStreamSource) session.getState().get(SMTPConstants.DATA_MIMEMESSAGE_STREAMSOURCE); @@ -207,7 +203,7 @@ public class DataLineJamesMessageHookHan } /** - * @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) */ public void wireExtensions(Class interfaceName, List extension) throws WiringException { @@ -225,7 +221,7 @@ public class DataLineJamesMessageHookHan } /** - * @see org.apache.james.protocols.api.handler.api.protocol.ExtensibleHandler#getMarkerInterfaces() + * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces() */ public List<Class<?>> getMarkerInterfaces() { List<Class<?>> classes = new LinkedList<Class<?>>(); @@ -255,9 +251,7 @@ public class DataLineJamesMessageHookHan } } - /* - * (non-Javadoc) - * + /** * @see * org.apache.james.protocols.smtp.MailEnvelope#getMessageOutputStream() */ @@ -273,8 +267,6 @@ public class DataLineJamesMessageHookHan } /** - * (non-Javadoc) - * * @see org.apache.james.protocols.smtp.MailEnvelope#getSender() */ public MailAddress getSender() { Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/MailPriorityHandler.java Fri Oct 7 12:25:07 2011 @@ -45,12 +45,10 @@ public class MailPriorityHandler impleme private Map<String, Integer> prioMap = new HashMap<String, Integer>(); - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.smtpserver.JamesMessageHook#onMessage(org.apache.james - * .protocols.smtp.SMTPSession, org.apache.mailet.Mail) + * org.apache.james.smtpserver.JamesMessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession, + * org.apache.mailet.Mail) */ @SuppressWarnings("unchecked") public HookResult onMessage(SMTPSession session, Mail mail) { Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java Fri Oct 7 12:25:07 2011 @@ -60,7 +60,7 @@ public class POP3BeforeSMTPHandler imple } /** - * @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) { Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java Fri Oct 7 12:25:07 2011 @@ -69,11 +69,8 @@ public class SenderAuthIdentifyVerificat } } - /* - * (non-Javadoc) - * - * @see org.apache.james.protocols.smtp.core. - * AbstractSenderAuthIdentifyVerificationRcptHook#useVirtualHosting() + /** + * @see org.apache.james.protocols.smtp.core.AbstractSenderAuthIdentifyVerificationRcptHook#useVirtualHosting() */ protected boolean useVirtualHosting() { try { Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java Fri Oct 7 12:25:07 2011 @@ -119,8 +119,8 @@ public class JDBCGreylistHandler extends /** * Set the datasources. * - * @param datasources - * The datasources + * @param datasource + * The datasource */ @Resource(name = "datasource") public void setDataSource(DataSource datasource) { @@ -214,8 +214,6 @@ public class JDBCGreylistHandler extends } /** - * (non-Javadoc) - * * @see org.apache.james.protocols.smtp.core.fastfail.AbstractGreylistHandler#insertTriplet(java.lang.String, * java.lang.String, java.lang.String, int, long) */ @@ -403,7 +401,7 @@ public class JDBCGreylistHandler extends } /** - * @see org.apache.james.lifecycle.api.LogEnabled#setLog(org.apache.commons.logging.Log) + * @see org.apache.james.lifecycle.api.LogEnabled#setLog(Logger) */ public void setLog(Logger log) { this.serviceLog = log; Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptHandler.java Fri Oct 7 12:25:07 2011 @@ -73,7 +73,7 @@ public class ValidRcptHandler extends Ab /** * Sets the virtual user table store. * - * @param tableStore + * @param vut * the tableStore to set */ @Resource(name = "recipientrewritetable") @@ -132,9 +132,7 @@ public class ValidRcptHandler extends Ab } } - /* - * (non-Javadoc) - * + /** * @see * org.apache.james.protocols.smtp.core.fastfail.AbstractValidRcptHandler * #isLocalDomain(org.apache.james.protocols.smtp.SMTPSession, Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java Fri Oct 7 12:25:07 2011 @@ -68,7 +68,7 @@ public class ValidRcptMX implements Life * Sets the service log.<br> * Where available, a context sensitive log should be used. * - * @param Log + * @param log * not null */ public void setLog(Logger log) { Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/CommandHandlerResultJMXMonitor.java Fri Oct 7 12:25:07 2011 @@ -27,15 +27,13 @@ import org.apache.james.protocols.smtp.S import org.apache.james.protocols.smtp.SMTPSession; /** - * Expose JMX statistics for {@link CommandHandler} + * Expose JMX statistics for {@link org.apache.james.protocols.api.handler.CommandHandler} */ public class CommandHandlerResultJMXMonitor extends AbstractCommandHandlerResultJMXMonitor<SMTPResponse, SMTPSession> { - /* - * (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.handler.CommandHandler) */ protected AbstractCommandHandlerStats<SMTPResponse> createCommandHandlerStats(CommandHandler<SMTPSession> handler) throws Exception { Collection<String> col = handler.getImplCommands(); Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/ConnectHandlerResultJMXMonitor.java Fri Oct 7 12:25:07 2011 @@ -24,11 +24,8 @@ import org.apache.james.protocols.smtp.S public class ConnectHandlerResultJMXMonitor extends AbstractConnectHandlerResultJMXMonitor<Response, SMTPSession> { - /* - * (non-Javadoc) - * - * @see org.apache.james.socket.AbstractConnectHandlerResultJMXMonitor# - * getDefaultJMXName() + /** + * @see org.apache.james.protocols.lib.jmx.AbstractConnectHandlerResultJMXMonitor#getDefaultJMXName() */ protected String getDefaultJMXName() { return "smtpserver"; Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookResultJMXMonitor.java Fri Oct 7 12:25:07 2011 @@ -43,12 +43,10 @@ public class HookResultJMXMonitor implem private Map<String, HookStats> hookStats = new HashMap<String, HookStats>(); private String jmxPath; - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.protocols.smtp.hook.HookResultHook#onHookResult(org. - * apache.james.protocols.smtp.SMTPSession, + * org.apache.james.protocols.smtp.hook.HookResultHook + * #onHookResult(org.apache.james.protocols.smtp.SMTPSession, * org.apache.james.protocols.smtp.hook.HookResult, long, * org.apache.james.protocols.smtp.hook.Hook) */ @@ -61,11 +59,9 @@ public class HookResultJMXMonitor implem return result; } - /* - * (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<?>>(); @@ -73,12 +69,9 @@ public class HookResultJMXMonitor implem 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) */ public void wireExtensions(Class<?> interfaceName, List<?> extension) throws WiringException { if (interfaceName.equals(Hook.class)) { Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java Fri Oct 7 12:25:07 2011 @@ -73,46 +73,36 @@ public class HookStats extends StandardM all.incrementAndGet(); } - /* - * (non-Javadoc) - * - * @see org.apache.james.smtpserver.HookStatsMBean#getOk() + /** + * @see org.apache.james.smtpserver.jmx.HookStatsMBean#getOk() */ public long getOk() { return ok.get(); } - /* - * (non-Javadoc) - * - * @see org.apache.james.smtpserver.HookStatsMBean#getDeclined() + /** + * @see org.apache.james.smtpserver.jmx.HookStatsMBean#getDeclined() */ public long getDeclined() { return declined.get(); } - /* - * (non-Javadoc) - * - * @see org.apache.james.smtpserver.HookStatsMBean#getDeny() + /** + * @see org.apache.james.smtpserver.jmx.HookStatsMBean#getDeny() */ public long getDeny() { return deny.get(); } - /* - * (non-Javadoc) - * - * @see org.apache.james.smtpserver.HookStatsMBean#getDenysoft() + /** + * @see org.apache.james.smtpserver.jmx.HookStatsMBean#getDenysoft() */ public long getDenysoft() { return denysoft.get(); } - /* - * (non-Javadoc) - * - * @see org.apache.james.lifecycle.Disposable#dispose() + /** + * @see org.apache.james.lifecycle.api.Disposable#dispose() */ public void dispose() { try { @@ -122,19 +112,15 @@ public class HookStats extends StandardM } } - /* - * (non-Javadoc) - * - * @see org.apache.james.smtpserver.HookStatsMBean#getName() + /** + * @see org.apache.james.smtpserver.jmx.HookStatsMBean#getName() */ public String getName() { return hookname; } - /* - * (non-Javadoc) - * - * @see org.apache.james.smtpserver.HookStatsMBean#getAll() + /** + * @see org.apache.james.smtpserver.jmx.HookStatsMBean#getAll() */ public long getAll() { return all.get(); Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/JMXHandlersLoader.java Fri Oct 7 12:25:07 2011 @@ -34,10 +34,8 @@ public class JMXHandlersLoader implement handlers.add(HookResultJMXMonitor.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/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/LineHandlerResultJMXMonitor.java Fri Oct 7 12:25:07 2011 @@ -24,12 +24,9 @@ import org.apache.james.protocols.smtp.S public class LineHandlerResultJMXMonitor extends AbstractLineHandlerResultJMXMonitor<SMTPResponse, SMTPSession> { - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.socket.AbstractLineHandlerResultJMXMonitor#getDefaultJMXName - * () + * org.apache.james.protocols.lib.jmx.AbstractLineHandlerResultJMXMonitor#getDefaultJMXName() */ protected String getDefaultJMXName() { return "smtpserver"; Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/SMTPCommandHandlerStats.java Fri Oct 7 12:25:07 2011 @@ -43,41 +43,32 @@ public class SMTPCommandHandlerStats ext super(SMTPCommandHandlerStatsMBean.class, jmxPath, handlerName, commands); } - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.smtpserver.CommandHandlerStatsMBean#getTemporaryError() + * org.apache.james.smtpserver.jmx.SMTPCommandHandlerStatsMBean#getTemporaryError() */ public long getTemporaryError() { return temp.get(); } - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.smtpserver.CommandHandlerStatsMBean#getPermantError() + * org.apache.james.smtpserver.jmx.SMTPCommandHandlerStatsMBean#getPermantError() */ public long getPermantError() { return perm.get(); } - /* - * (non-Javadoc) - * - * @see org.apache.james.smtpserver.CommandHandlerStatsMBean#getOk() + /** + * @see org.apache.james.smtpserver.jmx.SMTPCommandHandlerStatsMBean#getOk() */ public long getOk() { return ok.get(); } - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.socket.AbstractCommandHandlerStats#incrementStats(org - * .apache.james.protocols.api.Response) + * org.apache.james.protocols.lib.jmx.AbstractCommandHandlerStats#incrementStats(org.apache.james.protocols.api.Response) */ protected void incrementStats(SMTPResponse response) { try { Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java Fri Oct 7 12:25:07 2011 @@ -48,7 +48,7 @@ public class SMTPChannelUpstreamHandler /** * Cleanup temporary files * - * @param channel + * @param ctx */ protected void cleanup(ChannelHandlerContext ctx) { // Make sure we dispose everything on exit on session close Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java Fri Oct 7 12:25:07 2011 @@ -187,16 +187,17 @@ public class SMTPServer extends Abstract } /** - * @see org.apache.james.socket.AbstractConfigurableAsyncServer.AbstractAsyncServer#getDefaultPort() + * Return the default port which will get used for this server if non is + * specify in the configuration + * + * @return port */ protected int getDefaultPort() { return 25; } - /* - * (non-Javadoc) - * - * @see org.apache.james.socket.ServerMBean#getServiceType() + /** + * @see org.apache.james.smtpserver.netty.SMTPServerMBean#getServiceType() */ public String getServiceType() { return "SMTP Service"; @@ -229,7 +230,7 @@ public class SMTPServer extends Abstract } /** - * @see org.apache.james.protocols.smtp.SMTPConfiguration#isAuthSupported(String) + * @see org.apache.james.protocols.smtp.SMTPConfiguration#isRelayingAllowed(String) */ public boolean isRelayingAllowed(String remoteIP) { boolean relayingAllowed = false; @@ -292,81 +293,60 @@ public class SMTPServer extends Abstract } - /* - * (non-Javadoc) - * - * @see org.apache.james.smtpserver.SMTPServerMBean#getMaximalMessageSize() + /** + * @see org.apache.james.smtpserver.netty.SMTPServerMBean#getMaximalMessageSize() */ public long getMaximalMessageSize() { return maxMessageSize; } - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.smtpserver.SMTPServerMBean#getAddressBracketsEnforcement - * () + * org.apache.james.smtpserver.netty.SMTPServerMBean#getAddressBracketsEnforcement() */ public boolean getAddressBracketsEnforcement() { return addressBracketsEnforcement; } - /* - * (non-Javadoc) - * - * @see org.apache.james.smtpserver.SMTPServerMBean#getHeloEhloEnforcement() + /** + * @see org.apache.james.smtpserver.netty.SMTPServerMBean#getHeloEhloEnforcement() */ public boolean getHeloEhloEnforcement() { return heloEhloEnforcement; } - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer# - * getDefaultJMXName() + * org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer#getDefaultJMXName() */ protected String getDefaultJMXName() { return "smtpserver"; } - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.smtpserver.netty.SMTPServerMBean#setMaximalMessageSize - * (long) + * org.apache.james.smtpserver.netty.SMTPServerMBean#setMaximalMessageSize(long) */ public void setMaximalMessageSize(long maxSize) { this.maxMessageSize = maxSize; } - /* - * (non-Javadoc) - * - * @see org.apache.james.smtpserver.netty.SMTPServerMBean# - * setAddressBracketsEnforcement(boolean) + /** + * @see org.apache.james.smtpserver.netty.SMTPServerMBean#setAddressBracketsEnforcement(boolean) */ public void setAddressBracketsEnforcement(boolean enforceAddressBrackets) { this.addressBracketsEnforcement = enforceAddressBrackets; } - /* - * (non-Javadoc) - * + /** * @see - * org.apache.james.smtpserver.netty.SMTPServerMBean#setHeloEhloEnforcement - * (boolean) + * org.apache.james.smtpserver.netty.SMTPServerMBean#setHeloEhloEnforcement(boolean) */ public void setHeloEhloEnforcement(boolean enforceHeloEHlo) { this.heloEhloEnforcement = enforceHeloEHlo; } - /* - * (non-Javadoc) - * + /** * @see org.apache.james.smtpserver.netty.SMTPServerMBean#getHeloName() */ public String getHeloName() { Modified: james/server/trunk/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java URL: http://svn.apache.org/viewvc/james/server/trunk/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java (original) +++ james/server/trunk/util/src/main/java/org/apache/james/util/bayesian/JDBCBayesianAnalyzer.java Fri Oct 7 12:25:07 2011 @@ -355,7 +355,7 @@ abstract public class JDBCBayesianAnalyz * * @param conn * The connection for accessing the database - * @param file + * @param sqlFile * The sqlResources.xml file * @throws Exception * If any error occurs Modified: james/server/trunk/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java URL: http://svn.apache.org/viewvc/james/server/trunk/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java (original) +++ james/server/trunk/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledScheduledThreadPoolExecutor.java Fri Oct 7 12:25:07 2011 @@ -117,58 +117,42 @@ public class JMXEnabledScheduledThreadPo return super.shutdownNow(); } - /* - * (non-Javadoc) - * - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean# - * getTotalTasks() + /** + * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getTotalTasks() */ public synchronized int getTotalTasks() { return totalTasks; } - /* - * (non-Javadoc) - * - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean# - * getAverageTaskTime() + /** + * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getAverageTaskTime() */ public synchronized double getAverageTaskTime() { return (totalTasks == 0) ? 0 : totalTime / totalTasks; } - /* - * (non-Javadoc) - * - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean# - * getActiveThreads() + /** + * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getActiveThreads() */ public int getActiveThreads() { return getPoolSize(); } - /* - * (non-Javadoc) - * - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean# - * getActiveTasks() + /** + * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getActiveTasks() */ public int getActiveTasks() { return getActiveCount(); } - /* - * (non-Javadoc) - * - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean# - * getQueuedTasks() + /** + * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getQueuedTasks() */ public int getQueuedTasks() { return getQueue().size(); } - /* - * (non-Javadoc) + /** * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getMaximalThreads() */ public int getMaximalThreads() { Modified: james/server/trunk/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java URL: http://svn.apache.org/viewvc/james/server/trunk/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java (original) +++ james/server/trunk/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java Fri Oct 7 12:25:07 2011 @@ -111,58 +111,42 @@ public class JMXEnabledThreadPoolExecuto return super.shutdownNow(); } - /* - * (non-Javadoc) - * - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean# - * getTotalTasks() + /** + * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getTotalTasks() */ public synchronized int getTotalTasks() { return totalTasks; } - /* - * (non-Javadoc) - * - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean# - * getAverageTaskTime() + /** + * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getAverageTaskTime() */ public synchronized double getAverageTaskTime() { return (totalTasks == 0) ? 0 : totalTime / totalTasks; } - /* - * (non-Javadoc) - * - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean# - * getActiveThreads() + /** + * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getActiveThreads() */ public int getActiveThreads() { return getPoolSize(); } - /* - * (non-Javadoc) - * - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean# - * getActiveTasks() + /** + * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getActiveTasks() */ public int getActiveTasks() { return getActiveCount(); } - /* - * (non-Javadoc) - * - * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean# - * getQueuedTasks() + /** + * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getQueuedTasks() */ public int getQueuedTasks() { return getQueue().size(); } - /* - * (non-Javadoc) + /** * @see org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutorMBean#getMaximalThreads() */ public int getMaximalThreads() { Modified: james/server/trunk/util/src/main/java/org/apache/james/util/concurrent/NamedThreadFactory.java URL: http://svn.apache.org/viewvc/james/server/trunk/util/src/main/java/org/apache/james/util/concurrent/NamedThreadFactory.java?rev=1180021&r1=1180020&r2=1180021&view=diff ============================================================================== --- james/server/trunk/util/src/main/java/org/apache/james/util/concurrent/NamedThreadFactory.java (original) +++ james/server/trunk/util/src/main/java/org/apache/james/util/concurrent/NamedThreadFactory.java Fri Oct 7 12:25:07 2011 @@ -42,9 +42,7 @@ public class NamedThreadFactory implemen this(name, Thread.NORM_PRIORITY); } - /* - * (non-Javadoc) - * + /** * @see java.util.concurrent.ThreadFactory#newThread(java.lang.Runnable) */ public Thread newThread(Runnable r) { --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org