You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by fe...@apache.org on 2011/10/07 07:51:32 UTC
svn commit: r1179938 [1/2] - in /james/server/trunk:
lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/
lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/
lmtpserver/src/main/java/org/apache/james/...
Author: felixk
Date: Fri Oct 7 05:51:31 2011
New Revision: 1179938
URL: http://svn.apache.org/viewvc?rev=1179938&view=rev
Log:
Some more javadocs updates/fixes
Modified:
james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifecycleBeanPostProcessor.java
james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProvider.java
james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProvider.java
james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java
james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/OioLMTPServer.java
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirStoreUtil.java
james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailSpoolerMBean.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/DisposeProcessor.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateEquals.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateNotEquals.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherMatch.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTableMailet.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTable.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
james/server/trunk/mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.java
Modified: james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifecycleBeanPostProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifecycleBeanPostProcessor.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifecycleBeanPostProcessor.java (original)
+++ james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifecycleBeanPostProcessor.java Fri Oct 7 05:51:31 2011
@@ -43,11 +43,9 @@ public abstract class AbstractLifecycleB
this.factory = (ListableBeanFactory) factory;
}
- /*
- * (non-Javadoc)
- *
- * @see org.springframework.beans.factory.config.BeanPostProcessor#
- * postProcessBeforeInitialization(java.lang.Object, java.lang.String)
+ /**
+ * @see org.springframework.beans.factory.config.BeanPostProcessor
+ * #postProcessBeforeInitialization(java.lang.Object, java.lang.String)
*/
@SuppressWarnings("unchecked")
public final Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
@@ -67,11 +65,9 @@ public abstract class AbstractLifecycleB
return bean;
}
- /*
- * (non-Javadoc)
- *
- * @see org.springframework.beans.factory.config.BeanPostProcessor#
- * postProcessAfterInitialization(java.lang.Object, java.lang.String)
+ /**
+ * @see org.springframework.beans.factory.config.BeanPostProcessor
+ * #postProcessAfterInitialization(java.lang.Object, java.lang.String)
*/
@SuppressWarnings("unchecked")
public final Object postProcessAfterInitialization(Object bean, String name) throws BeansException {
@@ -118,8 +114,6 @@ public abstract class AbstractLifecycleB
* the actual bean
* @param beanname
* then name of the bean
- * @param componentName
- * the component name
* @throws Exception
*/
protected abstract void executeLifecycleMethodAfterInit(T bean, String beanname) throws Exception;
@@ -131,9 +125,7 @@ public abstract class AbstractLifecycleB
this.order = order;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.springframework.core.Ordered#getOrder()
*/
public int getOrder() {
Modified: james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProvider.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProvider.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProvider.java (original)
+++ james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProvider.java Fri Oct 7 05:51:31 2011
@@ -29,7 +29,7 @@ public interface ConfigurationProvider {
/**
* Register a {@link HierarchicalConfiguration} for a bean name.<br>
* It is not mandatory to use the registerConfiguration to have the
- * configuration available as the {@link getConfiguration} method may load
+ * configuration available as the {@link #getConfiguration(String)} method may load
* it based on conventions (naming,...).
*
* @param beanName
@@ -44,7 +44,7 @@ public interface ConfigurationProvider {
* Load and return the configuration for the bean with the given name. The
* configuration may already be loaded from a previous method invocation or
* from a previous configuration registration via the
- * {@link registerConfiguation}.<br>
+ * {@link #registerConfiguration(String, HierarchicalConfiguration)}.<br>
* This method may implement convention based configuration loading based on
* naming,...
*
Modified: james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java (original)
+++ james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurationProviderImpl.java Fri Oct 7 05:51:31 2011
@@ -64,12 +64,8 @@ public class ConfigurationProviderImpl i
this.configurationMappings = configurationMappings;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.container.spring.provider.configuration.
- * ConfigurationProvider#registerConfiguration(java.lang.String,
- * org.apache.commons.configuration.HierarchicalConfiguration)
+ /**
+ * @see ConfigurationProvider#registerConfiguration(String, HierarchicalConfiguration)
*/
public void registerConfiguration(String beanName, HierarchicalConfiguration conf) {
configurations.put(beanName, conf);
@@ -92,11 +88,8 @@ public class ConfigurationProviderImpl i
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.container.spring.provider.configuration.
- * ConfigurationProvider#getConfiguration(java.lang.String)
+ /**
+ * @see ConfigurationProvider#getConfiguration(java.lang.String)
*/
public HierarchicalConfiguration getConfiguration(String name) throws ConfigurationException {
@@ -145,12 +138,9 @@ public class ConfigurationProviderImpl i
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.springframework.context.ResourceLoaderAware#setResourceLoader(org
- * .springframework.core.io.ResourceLoader)
+ * org.springframework.context.ResourceLoaderAware#setResourceLoader(org.springframework.core.io.ResourceLoader)
*/
public void setResourceLoader(ResourceLoader loader) {
this.loader = loader;
Modified: james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProvider.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProvider.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProvider.java (original)
+++ james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProvider.java Fri Oct 7 05:51:31 2011
@@ -28,7 +28,7 @@ public interface LogProvider {
/**
* Return the Log for the bean with the given name
*
- * @param name
+ * @param beanName
* @return log
*/
Logger getLog(String beanName);
Modified: james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java (original)
+++ james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogProviderImpl.java Fri Oct 7 05:51:31 2011
@@ -54,9 +54,7 @@ public class LogProviderImpl implements
this.logs = logs;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
* org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
*/
@@ -71,46 +69,32 @@ public class LogProviderImpl implements
}
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.container.spring.lifecycle.LogProvider#getLog(java.lang
- * .String)
+ * org.apache.james.container.spring.lifecycle.LogProvider#getLog(java.lang.String)
*/
public Logger getLog(String name) {
logMap.putIfAbsent(name, createLog(PREFIX + name));
return logMap.get(name);
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.container.spring.lifecycle.LogProvider#registerLog(java
- * .lang.String, org.slf4j.Logger)
+ * org.apache.james.container.spring.lifecycle.LogProvider#registerLog(java.lang.String, org.slf4j.Logger)
*/
public void registerLog(String beanName, Logger log) {
logMap.put(beanName, log);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.james.container.spring.provider.log.LogProviderManagementMBean
- * #getSupportedLogLevels()
+ /**
+ * @see LogProviderManagementMBean#getSupportedLogLevels()
*/
public List<String> getSupportedLogLevels() {
return Arrays.asList("DEBUG", "INFO", "WARN", "ERROR", "OFF");
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.james.container.spring.provider.log.LogProviderManagementMBean
- * #getLogLevels()
+ /**
+ * @see LogProviderManagementMBean#getLogLevels()
*/
public Map<String, String> getLogLevels() {
TreeMap<String, String> levels = new TreeMap<String, String>();
@@ -125,12 +109,8 @@ public class LogProviderImpl implements
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.james.container.spring.provider.log.LogProviderManagementMBean
- * #getLogLevel(java.lang.String)
+ /**
+ * @see LogProviderManagementMBean#getLogLevel(java.lang.String)
*/
public String getLogLevel(String component) {
Logger log = logMap.get(component);
@@ -145,12 +125,8 @@ public class LogProviderImpl implements
return level.toString();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.james.container.spring.provider.log.LogProviderManagementMBean
- * #setLogLevel(java.lang.String, java.lang.String)
+ /**
+ * @see LogProviderManagementMBean#setLogLevel(String, String)
*/
public void setLogLevel(String component, String loglevel) {
if (getSupportedLogLevels().contains(loglevel) == false) {
Modified: james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java (original)
+++ james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/AbstractOSGIAnnotationBeanPostProcessor.java Fri Oct 7 05:51:31 2011
@@ -128,9 +128,7 @@ public abstract class AbstractOSGIAnnota
}
}
-
- /*
- * (non-Javadoc)
+ /**
* @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader)
*/
public void setBeanClassLoader(ClassLoader classLoader) {
@@ -280,16 +278,14 @@ public abstract class AbstractOSGIAnnota
return setter != null ? AnnotationUtils.getAnnotation(setter, getAnnotation()) : null;
}
- /*
- * (non-Javadoc)
+ /**
* @see org.springframework.osgi.context.BundleContextAware#setBundleContext(org.osgi.framework.BundleContext)
*/
public void setBundleContext(BundleContext context) {
this.bundleContext = context;
}
- /*
- * (non-Javadoc)
+ /**
* @see org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory)
*/
public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
Modified: james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java (original)
+++ james/server/trunk/lifecycle-spring/src/main/java/org/apache/james/container/spring/lifecycle/osgi/OSGIResourceAnnotationBeanPostProcessor.java Fri Oct 7 05:51:31 2011
@@ -24,9 +24,7 @@ import org.springframework.osgi.service.
public class OSGIResourceAnnotationBeanPostProcessor extends AbstractOSGIAnnotationBeanPostProcessor<Resource>{
-
- /*
- * (non-Javadoc)
+ /**
* @see org.apache.james.container.spring.lifecycle.osgi.AbstractOSGIAnnotationBeanPostProcessor#getAnnotation()
*/
protected Class<Resource> getAnnotation() {
Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java (original)
+++ james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java Fri Oct 7 05:51:31 2011
@@ -99,10 +99,8 @@ public class CoreCmdHandlerLoader implem
commands.add(HOOKRESULTLOGGER);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.protocols.api.HandlersPackage#getHandlers()
+ /**
+ * @see HandlersPackage#getHandlers()
*/
public List<String> getHandlers() {
return commands;
Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java (original)
+++ james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/jmx/JMXHandlersLoader.java Fri Oct 7 05:51:31 2011
@@ -33,10 +33,8 @@ public class JMXHandlersLoader implement
handlers.add(LineHandlerResultJMXMonitor.class.getName());
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.protocols.api.HandlersPackage#getHandlers()
+ /**
+ * @see HandlersPackage#getHandlers()
*/
public List<String> getHandlers() {
return handlers;
Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java (original)
+++ james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java Fri Oct 7 05:51:31 2011
@@ -43,21 +43,16 @@ public class LMTPServer extends Abstract
private String lmtpGreeting;
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer#
- * getDefaultPort()
+ * org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer#getDefaultPort()
*/
public int getDefaultPort() {
return 24;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.socket.ServerMBean#getServiceType()
+ /**
+ * @see org.apache.james.protocols.lib.jmx.ServerMBean#getServiceType()
*/
public String getServiceType() {
return "LMTP Service";
@@ -113,40 +108,30 @@ public class LMTPServer extends Abstract
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.smtpserver.SMTPServerMBean#getMaximalMessageSize()
+ /**
+ * @see LMTPServerMBean#getMaximalMessageSize()
*/
public long getMaximalMessageSize() {
return lmtpConfig.getMaxMessageSize();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer#
- * getDefaultJMXName()
+ * org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer#getDefaultJMXName()
*/
protected String getDefaultJMXName() {
return "lmtpserver";
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.smtpserver.netty.SMTPServerMBean#setMaximalMessageSize
- * (long)
+ * org.apache.james.smtpserver.netty.SMTPServerMBean#setMaximalMessageSize(long)
*/
public void setMaximalMessageSize(long maxSize) {
maxMessageSize = maxSize;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.james.lmtpserver.netty.LMTPServerMBean#getHeloName()
*/
public String getHeloName() {
Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/OioLMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/OioLMTPServer.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/OioLMTPServer.java (original)
+++ james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/OioLMTPServer.java Fri Oct 7 05:51:31 2011
@@ -24,7 +24,7 @@ import org.jboss.netty.handler.execution
/**
* LMTPServer which use old IO and not NIO. If you want to use NIO you should
- * use {@link LMTPerver}
+ * use {@link LMTPServer}
*/
public class OioLMTPServer extends LMTPServer {
Modified: james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java (original)
+++ james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java Fri Oct 7 05:51:31 2011
@@ -52,11 +52,8 @@ public class MailboxManagerManagement ex
super(MailboxManagerManagementMBean.class);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.adapter.mailbox.MailboxManagerManagementMBean#
- * deleteMailboxes(java.lang.String)
+ /**
+ * @see org.apache.james.adapter.mailbox.MailboxManagerManagementMBean#deleteMailboxes(java.lang.String)
*/
public boolean deleteMailboxes(String username) {
MailboxSession session = null;
@@ -83,18 +80,14 @@ public class MailboxManagerManagement ex
return false;
}
- /*
- * (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;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
* org.apache.james.adapter.mailbox.MailboxManagerManagementMBean#listMailboxes
* (java.lang.String)
Modified: james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirStoreUtil.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirStoreUtil.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirStoreUtil.java (original)
+++ james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/maildir/MaildirStoreUtil.java Fri Oct 7 05:51:31 2011
@@ -35,7 +35,6 @@ public class MaildirStoreUtil {
* Return a {@link MaildirStore} instance
*
* @param fs
- * @param mailServer
* @param rootURL
* @param locker
* @return store
Modified: james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java (original)
+++ james/server/trunk/mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java Fri Oct 7 05:51:31 2011
@@ -41,9 +41,7 @@ public class UserRepositoryAuthenticator
this.repos = repos;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
* org.apache.james.mailbox.store.Authenticator#isAuthentic(java.lang.String
* , java.lang.CharSequence)
Modified: james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailSpoolerMBean.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailSpoolerMBean.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailSpoolerMBean.java (original)
+++ james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/jmx/MailSpoolerMBean.java Fri Oct 7 05:51:31 2011
@@ -32,7 +32,7 @@ public interface MailSpoolerMBean {
/**
*
- * @return
+ * @return current spool count
*/
int getCurrentSpoolCount();
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java Fri Oct 7 05:51:31 2011
@@ -87,12 +87,9 @@ public class JamesMailSpooler implements
this.mailProcessor = mailProcessor;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.lifecycle.Configurable#configure(org.apache.commons.
- * configuration.HierarchicalConfiguration)
+ * org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
*/
public void configure(HierarchicalConfiguration config) throws ConfigurationException {
numDequeueThreads = config.getInt("dequeueThreads", 2);
@@ -101,7 +98,7 @@ public class JamesMailSpooler implements
}
/**
- * Initialises the spool manager.
+ * Initializes the spool manager.
*/
@PostConstruct
public void init() throws Exception {
@@ -205,7 +202,7 @@ public class JamesMailSpooler implements
* This implementation shuts down the LinearProcessors managed by this
* JamesSpoolManager
*
- * @see org.apache.james.lifecycle.api.avalon.framework.activity.Disposable#dispose()
+ * @see org.apache.james.lifecycle.api.Disposable#dispose()
*/
@PreDestroy
public void dispose() {
@@ -226,31 +223,24 @@ public class JamesMailSpooler implements
logger.info(getClass().getName() + " thread shutdown completed.");
}
- /*
- * (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.logger = log;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.api.MailSpoolerMBean#getThreadCount()
+ * org.apache.james.mailetcontainer.api.jmx.MailSpoolerMBean#getThreadCount()
*/
public int getThreadCount() {
return numThreads;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.api.MailSpoolerMBean#getCurrentSpoolCount
- * ()
+ * org.apache.james.mailetcontainer.api.jmx.MailSpoolerMBean#getCurrentSpoolCount()
*/
public int getCurrentSpoolCount() {
return processingActive.get();
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java Fri Oct 7 05:51:31 2011
@@ -311,7 +311,7 @@ public class JamesMailetContext implemen
* sorted by MX priority. If no host is found for domainName, the Iterator
* returned will be empty and the first call to hasNext() will return false.
*
- * @see org.apache.james.dnsservice.api.DNSService#getSMTPHostAddresses(String)
+ * @see org.apache.james.dnsservice.api.DNSService#getHostName(java.net.InetAddress)
* @since Mailet API v2.2.0a16-unstable
* @param domainName
* - the domain for which to find mail servers
@@ -326,18 +326,14 @@ public class JamesMailetContext implemen
return Collections.unmodifiableCollection(new ArrayList<HostAddress>(0)).iterator();
}
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.mailet.MailetContext#getServerInfo()
*/
public String getServerInfo() {
return "Apache JAMES";
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.mailet.MailetContext#isLocalServer(java.lang.String)
*/
public boolean isLocalServer(String name) {
@@ -349,18 +345,14 @@ public class JamesMailetContext implemen
}
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.mailet.MailetContext#log(java.lang.String)
*/
public void log(String arg0) {
log.info(arg0);
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.mailet.MailetContext#log(java.lang.String,
* java.lang.Throwable)
*/
@@ -393,9 +385,7 @@ public class JamesMailetContext implemen
sendMail(sender, recipients, message);
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
* org.apache.mailet.MailetContext#sendMail(org.apache.mailet.MailAddress,
* java.util.Collection, javax.mail.internet.MimeMessage)
@@ -405,20 +395,16 @@ public class JamesMailetContext implemen
sendMail(sender, recipients, message, Mail.DEFAULT);
}
- /*
+ /**
* TODO: Should we use the MailProcessorList or the MailQueue here ?
*
- * (non-Javadoc)
- *
* @see org.apache.mailet.MailetContext#sendMail(org.apache.mailet.Mail)
*/
public void sendMail(Mail mail) throws MessagingException {
processorList.service(mail);
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
* org.apache.mailet.MailetContext#sendMail(org.apache.mailet.MailAddress,
* java.util.Collection, javax.mail.internet.MimeMessage, java.lang.String)
@@ -454,17 +440,15 @@ public class JamesMailetContext implemen
throw new UnsupportedOperationException("Was removed");
}
- /*
- * (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;
}
- /*
- *
+ /**
+ * @see org.apache.james.lifecycle.api.Configurable#configure(HierarchicalConfiguration)
*/
public void configure(HierarchicalConfiguration config) throws ConfigurationException {
try {
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelCompositeProcessor.java Fri Oct 7 05:51:31 2011
@@ -73,31 +73,23 @@ public class CamelCompositeProcessor ext
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.camel.CamelContextAware#getCamelContext()
*/
public CamelContext getCamelContext() {
return camelContext;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.camel.CamelContextAware#setCamelContext(org.apache.camel.
- * CamelContext)
+ /**
+ * @see org.apache.camel.CamelContextAware#setCamelContext(org.apache.camel.CamelContext)
*/
public void setCamelContext(CamelContext camelContext) {
this.camelContext = camelContext;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.mailetcontainer.lib.AbstractCompositeMailProcessor#
- * createMailProcessor(java.lang.String,
- * org.apache.commons.configuration.HierarchicalConfiguration)
+ /**
+ * @see org.apache.james.mailetcontainer.lib.AbstractStateCompositeProcessor
+ * #createMailProcessor(java.lang.String, org.apache.commons.configuration.HierarchicalConfiguration)
*/
protected MailProcessor createMailProcessor(String name, HierarchicalConfiguration config) throws Exception {
CamelMailetProcessor processor = new CamelMailetProcessor();
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelMailetProcessor.java Fri Oct 7 05:51:31 2011
@@ -42,7 +42,7 @@ import org.apache.mailet.Matcher;
import org.slf4j.Logger;
/**
- * {@link AbstractStateMailetProcessor} implementation which use Camel DSL for
+ * {@link org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor} implementation which use Camel DSL for
* the {@link Matcher} / {@link Mailet} routing
*/
public class CamelMailetProcessor extends AbstractStateMailetProcessor implements CamelContextAware {
@@ -53,12 +53,9 @@ public class CamelMailetProcessor extend
private final UseLatestAggregationStrategy aggr = new UseLatestAggregationStrategy();
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.api.MailProcessor#service(org.apache
- * .mailet.Mail)
+ * org.apache.james.mailetcontainer.api.MailProcessor#service(org.apache.mailet.Mail)
*/
public void service(Mail mail) throws MessagingException {
try {
@@ -69,20 +66,15 @@ public class CamelMailetProcessor extend
}
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.camel.CamelContextAware#getCamelContext()
*/
public CamelContext getCamelContext() {
return context;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.camel.CamelContextAware#setCamelContext(org.apache.camel.
- * CamelContext)
+ /**
+ * @see org.apache.camel.CamelContextAware#setCamelContext(org.apache.camel.CamelContext)
*/
public void setCamelContext(CamelContext context) {
this.context = context;
@@ -93,7 +85,6 @@ public class CamelMailetProcessor extend
*
* This will return a "direct" endpoint.
*
- * @param processorName
* @return endPoint
*/
protected String getEndpoint() {
@@ -110,11 +101,9 @@ public class CamelMailetProcessor extend
super.init();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.lib.AbstractMailetContainer#setupRouting
+ * org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor#setupRouting
* (java.util.List)
*/
protected void setupRouting(List<MatcherMailetPair> pairs) throws MessagingException {
@@ -128,7 +117,6 @@ public class CamelMailetProcessor extend
/**
* {@link RouteBuilder} which construct the Matcher and Mailet routing use
* Camel DSL
- *
*/
private final class MailetContainerRouteBuilder extends RouteBuilder {
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/DisposeProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/DisposeProcessor.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/DisposeProcessor.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/DisposeProcessor.java Fri Oct 7 05:51:31 2011
@@ -29,9 +29,7 @@ import org.apache.mailet.Mail;
*/
public class DisposeProcessor implements Processor {
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.camel.Processor#process(org.apache.camel.Exchange)
*/
public void process(Exchange arg0) throws Exception {
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateEquals.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateEquals.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateEquals.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateEquals.java Fri Oct 7 05:51:31 2011
@@ -33,9 +33,7 @@ public class MailStateEquals implements
this.state = state;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.camel.Predicate#matches(org.apache.camel.Exchange)
*/
public boolean matches(Exchange ex) {
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateNotEquals.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateNotEquals.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateNotEquals.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MailStateNotEquals.java Fri Oct 7 05:51:31 2011
@@ -33,9 +33,7 @@ public class MailStateNotEquals implemen
this.state = state;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.camel.Predicate#matches(org.apache.camel.Exchange)
*/
public boolean matches(Exchange ex) {
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherMatch.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherMatch.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherMatch.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/MatcherMatch.java Fri Oct 7 05:51:31 2011
@@ -30,9 +30,7 @@ import org.apache.mailet.Mail;
*/
public class MatcherMatch implements Predicate {
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.camel.Predicate#matches(org.apache.camel.Exchange)
*/
public boolean matches(Exchange arg0) {
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateCompositeProcessorListener.java Fri Oct 7 05:51:31 2011
@@ -113,12 +113,10 @@ public class JMXStateCompositeProcessorL
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.api.MailProcessorListListener#afterProcessor
- * (org.apache.james.mailetcontainer.api.MailProcessor, java.lang.String,
+ * org.apache.james.mailetcontainer.lib.AbstractStateCompositeProcessor.CompositeProcessorListener
+ * #afterProcessor(org.apache.james.mailetcontainer.api.MailProcessor, java.lang.String,
* long, javax.mail.MessagingException)
*/
public void afterProcessor(MailProcessor processor, String mailName, long processTime, MessagingException e) {
@@ -128,9 +126,7 @@ public class JMXStateCompositeProcessorL
}
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.james.lifecycle.api.Disposable#dispose()
*/
public void dispose() {
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/JMXStateMailetProcessorListener.java Fri Oct 7 05:51:31 2011
@@ -62,12 +62,10 @@ public class JMXStateMailetProcessorList
registerMBeans();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.api.MailetContainerListener#afterMailet
- * (org.apache.mailet.Mailet, java.lang.String, java.lang.String, long,
+ * org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor.MailetProcessorListener
+ * #afterMailet(org.apache.mailet.Mailet, java.lang.String, java.lang.String, long,
* javax.mail.MessagingException)
*/
public void afterMailet(Mailet m, String mailName, String state, long processTime, MessagingException e) {
@@ -77,12 +75,10 @@ public class JMXStateMailetProcessorList
}
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.api.MailetContainerListener#afterMatcher
- * (org.apache.mailet.Matcher, java.lang.String, java.util.Collection,
+ * org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor.MailetProcessorListener
+ * #afterMatcher(org.apache.mailet.Matcher, java.lang.String, java.util.Collection,
* java.util.Collection, long, javax.mail.MessagingException)
*/
public void afterMatcher(Matcher m, String mailName, Collection<MailAddress> rcpts, Collection<MailAddress> matches, long processTime, MessagingException e) {
@@ -171,9 +167,7 @@ public class JMXStateMailetProcessorList
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.james.lifecycle.api.Disposable#dispose()
*/
public void dispose() {
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailProcessorManagement.java Fri Oct 7 05:51:31 2011
@@ -29,7 +29,7 @@ import org.apache.james.mailetcontainer.
/**
* Wrapper which helps to expose JMX statistics for {@link MailProcessor} and
- * {@link CamelProcessor} implementations
+ * {@link org.apache.james.mailetcontainer.impl.camel.CamelProcessor} implementations
*/
public class MailProcessorManagement extends StandardMBean implements MailProcessorManagementMBean {
private String processorName;
@@ -70,74 +70,56 @@ public class MailProcessorManagement ext
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#
- * getHandledMailCount()
+ /**
+ * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getHandledMailCount()
*/
public long getHandledMailCount() {
return getSuccessCount() + getErrorCount();
}
/*
- * (non-Javadoc)
+ * TODO
+ * Is deprecated or dead code? Can't find an interface defining this method
*
* @see
- * org.apache.james.mailetcontainer.api.jmx.MailProcessorDetailMBean#getName
- * ()
+ * org.apache.james.mailetcontainer.api.jmx.MailProcessorDetailMBean#getName()
*/
public String getName() {
return processorName;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#
- * getFastestProcessing()
+ /**
+ * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getFastestProcessing()
*/
public long getFastestProcessing() {
return fastestProcessing.get();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#
- * getSlowestProcessing()
+ /**
+ * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getSlowestProcessing()
*/
public long getSlowestProcessing() {
return slowestProcessing.get();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#getErrorCount
- * ()
+ * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getErrorCount()
*/
public long getErrorCount() {
return errorCount.get();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#getSuccessCount
- * ()
+ * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getSuccessCount()
*/
public long getSuccessCount() {
return successCount.get();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#
- * getLastProcessing()
+ /**
+ * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getLastProcessing()
*/
public long getLastProcessing() {
return lastProcessing.get();
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MailetManagement.java Fri Oct 7 05:51:31 2011
@@ -63,22 +63,16 @@ public final class MailetManagement exte
lastProcessing.set(processTime);
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.api.jmx.MailetManagementMBean#getMailetName
- * ()
+ * org.apache.james.mailetcontainer.api.jmx.MailetManagementMBean#getMailetName()
*/
public String getMailetName() {
return config.getMailetName();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.mailetcontainer.api.jmx.MailetManagementMBean#
- * getMailetParameters()
+ /**
+ * @see org.apache.james.mailetcontainer.api.jmx.MailetManagementMBean#getMailetParameters()
*/
@SuppressWarnings("unchecked")
public String[] getMailetParameters() {
@@ -93,62 +87,45 @@ public final class MailetManagement exte
return result;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#getErrorCount
- * ()
+ * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getErrorCount()
*/
public long getErrorCount() {
return errorCount.get();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#
- * getFastestProcessing()
+ /**
+ * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getFastestProcessing()
*/
public long getFastestProcessing() {
return fastestProcessing.get();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#
- * getHandledMailCount()
+ /**
+ * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getHandledMailCount()
*/
public long getHandledMailCount() {
return getErrorCount() + getSuccessCount();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#
- * getSlowestProcessing()
+ /**
+ * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getSlowestProcessing()
*/
public long getSlowestProcessing() {
return slowestProcessing.get();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.MailetManagementMBean#getSuccessCount()
+ * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getSuccessCount()
*/
public long getSuccessCount() {
return successCount.get();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#
- * getLastProcessing()
+ /**
+ * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getLastProcessing()
*/
public long getLastProcessing() {
return lastProcessing.get();
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/jmx/MatcherManagement.java Fri Oct 7 05:51:31 2011
@@ -67,105 +67,78 @@ public final class MatcherManagement ext
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.MatcherManagementMBean#getMatcherName()
+ * org.apache.james.mailetcontainer.api.jmx.MatcherManagementMBean#getMatcherName()
*/
public String getMatcherName() {
return matcherConfig.getMatcherName();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.MatcherManagementMBean#getMatcherCondition
- * ()
+ * org.apache.james.mailetcontainer.api.jmx.MatcherManagementMBean#getMatcherCondition()
*/
public String getMatcherCondition() {
return matcherConfig.getCondition();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.mailetcontainer.MailProcessingMBean#getErrorCount()
+ /**
+ * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getErrorCount()
*/
public long getErrorCount() {
return errorCount.get();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.MailProcessingMBean#getFastestProcessing
- * ()
+ * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getFastestProcessing()
*/
public long getFastestProcessing() {
return fastestProcessing.get();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.MailProcessingMBean#getHandledMailCount
- * ()
+ * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getHandledMailCount()
*/
public long getHandledMailCount() {
return getSuccessCount() + getErrorCount();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.MailProcessingMBean#getSlowestProcessing
- * ()
+ * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getSlowestProcessing()
*/
public long getSlowestProcessing() {
return slowestProcessing.get();
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.mailetcontainer.MailProcessingMBean#getSuccessCount()
+ * org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getSuccessCount()
*/
public long getSuccessCount() {
return successCount.get();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.mailetcontainer.api.jmx.MatcherManagementMBean#
- * getMatchedCount()
+ /**
+ * @see org.apache.james.mailetcontainer.api.jmx.MatcherManagementMBean#getMatchedCount()
*/
public long getMatchedCount() {
return matchedCount.get();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.mailetcontainer.api.jmx.MatcherManagementMBean#
- * getNotMatchedCount()
+ /**
+ * @see org.apache.james.mailetcontainer.api.jmx.MatcherManagementMBean#getNotMatchedCount()
*/
public long getNotMatchedCount() {
return notMatchedCount.get();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.mailetcontainer.api.jmx.MailProcessingMBean#
- * getLastProcessing()
+ /**
+ * @see org.apache.james.mailetcontainer.api.jmx.MailProcessorManagementMBean#getLastProcessing()
*/
public long getLastProcessing() {
return lastProcessing.get();
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java Fri Oct 7 05:51:31 2011
@@ -40,8 +40,8 @@ import org.apache.mailet.Mail;
import org.slf4j.Logger;
/**
- * Abstract base class for {@link CompositeProcessor} which service the
- * {@link Mail} with a {@link CamelProcessor} instances
+ * Abstract base class for {@link org.apache.james.mailetcontainer.impl.camel.CamelCompositeProcessor} which service the
+ * {@link Mail} with a {@link org.apache.james.mailetcontainer.impl.camel.CamelProcessor} instances
*/
public abstract class AbstractStateCompositeProcessor implements MailProcessor, Configurable, LogEnabled {
@@ -53,10 +53,8 @@ public abstract class AbstractStateCompo
private JMXStateCompositeProcessorListener jmxListener;
private boolean enableJmx = true;
- /*
- * (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.logger = log;
@@ -75,12 +73,9 @@ public abstract class AbstractStateCompo
listeners.remove(listener);
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.lifecycle.Configurable#configure(org.apache.commons.
- * configuration.HierarchicalConfiguration)
+ * org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
*/
public void configure(HierarchicalConfiguration config) throws ConfigurationException {
this.config = config;
@@ -130,7 +125,7 @@ public abstract class AbstractStateCompo
/**
* Return a {@link MailProcessor} for a given state
*
- * @param name
+ * @param state
* @return processor
*/
public MailProcessor getProcessor(String state) {
@@ -223,7 +218,7 @@ public abstract class AbstractStateCompo
/**
* A Listener which will get called after
- * {@link CompositeProcessor#service(org.apache.mailet.Mail)} was called
+ * {@link org.apache.james.mailetcontainer.api.MailProcessor#service(Mail)} was called
*/
public interface CompositeProcessorListener {
Modified: james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java (original)
+++ james/server/trunk/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java Fri Oct 7 05:51:31 2011
@@ -86,21 +86,16 @@ public abstract class AbstractStateMaile
this.mailetLoader = mailetLoader;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.james.lifecycle.api.LogEnabled#setLog(org.slf4j.Logger)
*/
public void setLog(Logger log) {
this.logger = log;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons
- * .configuration.HierarchicalConfiguration)
+ * org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
*/
public void configure(HierarchicalConfiguration config) throws ConfigurationException {
this.state = config.getString("[@state]", null);
@@ -410,7 +405,7 @@ public abstract class AbstractStateMaile
/**
* Setup the routing for the configured {@link MatcherMailetPair}'s for this
- * {@link CamelProcessor}
+ * {@link org.apache.james.mailetcontainer.impl.camel.CamelProcessor}
*/
protected abstract void setupRouting(List<MatcherMailetPair> pairs) throws MessagingException;
@@ -427,9 +422,7 @@ public abstract class AbstractStateMaile
*/
private static final String TERMINATING_MAILET_NAME = "Terminating%Mailet%Name";
- /*
- * (non-Javadoc)
- *
+ /**
* @see
* org.apache.mailet.base.GenericMailet#service(org.apache.mailet.Mail)
*/
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTableMailet.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTableMailet.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTableMailet.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/AbstractRecipientRewriteTableMailet.java Fri Oct 7 05:51:31 2011
@@ -49,9 +49,7 @@ public abstract class AbstractRecipientR
this.domainList = domainList;
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see org.apache.mailet.base.GenericMailet#service(org.apache.mailet.Mail)
*/
public void service(Mail mail) throws MessagingException {
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java Fri Oct 7 05:51:31 2011
@@ -94,7 +94,7 @@ public class LocalDelivery extends Gener
}
/**
- * @see org.apache.mailet.GenericMailet#init()
+ * @see org.apache.mailet.base.GenericMailet#init()
*/
public void init() throws MessagingException {
super.init();
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTable.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTable.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTable.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RecipientRewriteTable.java Fri Oct 7 05:51:31 2011
@@ -40,7 +40,7 @@ public class RecipientRewriteTable exten
/**
* Sets the virtual table store.
*
- * @param vutStore
+ * @param vut
* the vutStore to set, possibly null
*/
@Resource(name = "recipientrewritetable")
@@ -49,8 +49,7 @@ public class RecipientRewriteTable exten
}
/**
- * @see org.apache.james.transport.mailets.AbstractRecipientRewriteTable#processMail(org.apache.mailet.MailAddress,
- * org.apache.mailet.MailAddress, javax.mail.internet.MimeMessage)
+ * @see org.apache.james.transport.mailets.AbstractRecipientRewriteTableMailet#processMail(MailAddress, MailAddress, MimeMessage)
*/
public Collection<MailAddress> processMail(MailAddress sender, MailAddress recipient, MimeMessage message) throws MessagingException {
try {
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java Fri Oct 7 05:51:31 2011
@@ -1543,8 +1543,7 @@ public class RemoteDelivery extends Gene
* Returns the javamail Session object.
*
* @param props
- * @param authenticator
- * @return
+ * @return the java mail session
*/
protected Session obtainSession(Properties props) {
return Session.getInstance(props);
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SPF.java Fri Oct 7 05:51:31 2011
@@ -55,10 +55,8 @@ public class SPF extends GenericMailet {
public final static String EXPLANATION_ATTRIBUTE = "org.apache.james.transport.mailets.spf.explanation";
public final static String RESULT_ATTRIBUTE = "org.apache.james.transport.mailets.spf.result";
- /*
- * (non-Javadoc)
- *
- * @see org.apache.mailet.GenericMailet#init()
+ /**
+ * @see org.apache.mailet.base.GenericMailet#init()
*/
public void init() {
addHeader = Boolean.valueOf(getInitParameter("addHeader", "false"));
@@ -67,10 +65,8 @@ public class SPF extends GenericMailet {
spf = new DefaultSPF(logger);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.mailet.GenericMailet#service(org.apache.mailet.Mail)
+ /**
+ * @see org.apache.mailet.base.GenericMailet#service(org.apache.mailet.Mail)
*/
public void service(Mail mail) throws MessagingException {
String sender = null;
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SpamAssassin.java Fri Oct 7 05:51:31 2011
@@ -59,7 +59,7 @@ public class SpamAssassin extends Generi
int spamdPort;
/**
- * @see org.apache.mailet.GenericMailet#init()
+ * @see org.apache.mailet.base.GenericMailet#init()
*/
public void init() throws MessagingException {
spamdHost = getInitParameter("spamdHost");
@@ -81,7 +81,7 @@ public class SpamAssassin extends Generi
}
/**
- * @see org.apache.mailet.GenericMailet#service(Mail)
+ * @see org.apache.mailet.base.GenericMailet#service(Mail)
*/
public void service(Mail mail) {
try {
@@ -107,7 +107,7 @@ public class SpamAssassin extends Generi
}
/**
- * @see org.apache.mailet.GenericMailet#getMailetInfo()
+ * @see org.apache.mailet.base.GenericMailet#getMailetInfo()
*/
public String getMailetInfo() {
return "Checks message against SpamAssassin";
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/IsInWhiteList.java Fri Oct 7 05:51:31 2011
@@ -66,21 +66,16 @@ public class IsInWhiteList extends Abstr
selectByPK = sqlQueries.getSqlString("selectByPK", true);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#
- * getSQLSectionName()
+ /**
+ * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#getSQLSectionName()
*/
protected String getSQLSectionName() {
return "WhiteList";
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#
- * matchedWhitelist(org.apache.mailet.MailAddress, org.apache.mailet.Mail)
+ /**
+ * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher
+ * #matchedWhitelist(org.apache.mailet.MailAddress, org.apache.mailet.Mail)
*/
protected boolean matchedWhitelist(MailAddress recipientMailAddress, Mail mail) throws MessagingException {
MailAddress senderMailAddress = mail.getSender();
@@ -159,22 +154,17 @@ public class IsInWhiteList extends Abstr
return false;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#
- * getTableCreateQueryName()
+ /**
+ * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher
+ * #getTableCreateQueryName()
*/
protected String getTableCreateQueryName() {
return "createWhiteListTable";
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#getTableName
- * ()
+ * org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#getTableName()
*/
protected String getTableName() {
return "whiteListTableName";
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/MailboxQuotaFixed.java Fri Oct 7 05:51:31 2011
@@ -31,12 +31,10 @@ import org.apache.mailet.Matcher;
*/
public class MailboxQuotaFixed extends AbstractStorageQuota {
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.transport.matchers.AbstractQuotaMatcher#getQuota(org
- * .apache.mailet.MailAddress, org.apache.mailet.Mail)
+ * org.apache.james.transport.matchers.AbstractQuotaMatcher
+ * #getQuota(org.apache.mailet.MailAddress, org.apache.mailet.Mail)
*/
protected long getQuota(MailAddress arg0, Mail arg1) throws MessagingException {
return parseQuota(this.getCondition());
Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java?rev=1179938&r1=1179937&r2=1179938&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/NetworkIsInWhitelist.java Fri Oct 7 05:51:31 2011
@@ -54,18 +54,15 @@ public class NetworkIsInWhitelist extend
/**
* Injection setter for the DNSService.
*
- * @param dnsService
+ * @param dns
*/
@Resource(name = "dnsservice")
public void setDNSService(DNSService dns) {
this.dns = dns;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#
- * getSQLSectionName()
+ /**
+ * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#getSQLSectionName()
*/
protected String getSQLSectionName() {
return "NetworkWhiteList";
@@ -78,11 +75,9 @@ public class NetworkIsInWhitelist extend
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#
- * matchedWhitelist(org.apache.mailet.MailAddress, org.apache.mailet.Mail)
+ /**
+ * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher
+ * #matchedWhitelist(org.apache.mailet.MailAddress, org.apache.mailet.Mail)
*/
protected boolean matchedWhitelist(MailAddress recipientMailAddress, Mail mail) throws MessagingException {
Connection conn = null;
@@ -132,22 +127,16 @@ public class NetworkIsInWhitelist extend
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#
- * getTableCreateQueryName()
+ /**
+ * @see org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#getTableCreateQueryName()
*/
protected String getTableCreateQueryName() {
return "createNetworkWhiteListTable";
}
- /*
- * (non-Javadoc)
- *
+ /**
* @see
- * org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#getTableName
- * ()
+ * org.apache.james.transport.matchers.AbstractSQLWhitelistMatcher#getTableName()
*/
protected String getTableName() {
return "networkWhiteListTableName";
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org