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/04/04 20:44:59 UTC
svn commit: r1088712 [1/5] - in /james/server/trunk:
osgi/src/main/java/org/apache/james/container/osgi/
pop3server/src/main/java/org/apache/james/pop3server/
pop3server/src/main/java/org/apache/james/pop3server/core/
pop3server/src/main/java/org/apach...
Author: felixk
Date: Mon Apr 4 18:44:55 2011
New Revision: 1088712
URL: http://svn.apache.org/viewvc?rev=1088712&view=rev
Log:
Formatting (see JAMES-711)
Modified:
james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/JamesOsgiBeanFactoryPostProcessor.java
james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiConfigurationProvider.java
james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiLogProvider.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3HandlerConfigurationData.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Request.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Response.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CRLFTerminatedInputStream.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCapability.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ExtraDotInputStream.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/MessageMetaData.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/NoopCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandHandlerResultLogger.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ReadByteFilterInputStream.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StatCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UidlCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UnknownCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UserCmdHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStatsMBean.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/OioPOP3Server.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3NettySession.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ResponseEncoder.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ServerMBean.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/POP3BeforeSMTPHelper.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerResultJMXMonitor.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractCommandHandlerStats.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractConnectHandlerResultJMXMonitor.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/AbstractLineHandlerResultJMXMonitor.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/CommandHandlerStatsMBean.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ConnectHandlerStats.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/HandlerStatsMBean.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/LineHandlerStats.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/jmx/ServerMBean.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/ConnectionCountHandler.java
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueFactory.java
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQSupport.java
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobStrategy.java
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/FileSystemBlobTransferPolicy.java
james/server/trunk/queue-activemq/src/main/java/org/apache/james/queue/activemq/MimeMessageBlobMessageSource.java
james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailPrioritySupport.java
james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueue.java
james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueueFactory.java
james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/MailQueueManagementMBean.java
james/server/trunk/queue-api/src/main/java/org/apache/james/queue/api/ManageableMailQueue.java
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/JMSSupport.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/AddDefaultAttributesMessageHook.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/AuthRequiredToRelayRcptHook.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/JamesDataCmdHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesMailCmdHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesMessageHook.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesRcptCmdHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/JamesWelcomeMessageHandler.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/SMTPCommandHandlerResultLogger.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPConstants.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SendMailHandler.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/SetMimeHeaderHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/TLDLookup.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/UsersRepositoryAuthHook.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/DNSRBLHandler.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/MaxRcptHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ResolvableEhloHeloHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ReverseEqualsEhloHeloHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamAssassinHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SpamTrapHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/TarpitHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIScanner.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/fastfail/ValidSenderDomainHandler.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/HookStatsMBean.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/jmx/SMTPCommandHandlerStatsMBean.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/OioSMTPServer.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/SMTPNettySession.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPResponseEncoder.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerMBean.java
Modified: james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/JamesOsgiBeanFactoryPostProcessor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/JamesOsgiBeanFactoryPostProcessor.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/JamesOsgiBeanFactoryPostProcessor.java (original)
+++ james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/JamesOsgiBeanFactoryPostProcessor.java Mon Apr 4 18:44:55 2011
@@ -33,33 +33,37 @@ import org.springframework.context.annot
import org.springframework.osgi.extender.OsgiBeanFactoryPostProcessor;
/**
- * {@link OsgiBeanFactoryPostProcessor} which add all life-cycle needed {@link BeanPostProcessor} to the {@link ConfigurableListableBeanFactory} on creation. This ensures that
- * the right methods are called during startup when deploying James bundles.
+ * {@link OsgiBeanFactoryPostProcessor} which add all life-cycle needed
+ * {@link BeanPostProcessor} to the {@link ConfigurableListableBeanFactory} on
+ * creation. This ensures that the right methods are called during startup when
+ * deploying James bundles.
*
* Beside this it also add support for JSR-250 annotations
- *
- *
*/
-public class JamesOsgiBeanFactoryPostProcessor implements OsgiBeanFactoryPostProcessor{
+public class JamesOsgiBeanFactoryPostProcessor implements OsgiBeanFactoryPostProcessor {
private String confDir;
+
public void setConfigurationDirectory(String confDir) {
this.confDir = confDir;
}
+
/*
* (non-Javadoc)
- * @see org.springframework.osgi.extender.OsgiBeanFactoryPostProcessor#postProcessBeanFactory(org.osgi.framework.BundleContext, org.springframework.beans.factory.config.ConfigurableListableBeanFactory)
+ *
+ * @see org.springframework.osgi.extender.OsgiBeanFactoryPostProcessor#
+ * postProcessBeanFactory(org.osgi.framework.BundleContext,
+ * org.springframework.beans.factory.config.ConfigurableListableBeanFactory)
*/
public void postProcessBeanFactory(BundleContext context, ConfigurableListableBeanFactory factory) throws BeansException, InvalidSyntaxException, BundleException {
-
+
// life-cycle for LogEnabled
OsgiLogProvider logProvider = new OsgiLogProvider();
LogEnabledBeanPostProcessor logProcessor = new LogEnabledBeanPostProcessor();
logProcessor.setLogProvider(logProvider);
logProcessor.setBeanFactory(factory);
factory.addBeanPostProcessor(logProcessor);
-
-
+
// Life-cycle for Configurable
OsgiConfigurationProvider confProvider = new OsgiConfigurationProvider(confDir);
ConfigurableBeanPostProcessor confProcessor = new ConfigurableBeanPostProcessor();
@@ -74,6 +78,6 @@ public class JamesOsgiBeanFactoryPostPro
commAnnotationProcessor.setDestroyAnnotationType(PreDestroy.class);
commAnnotationProcessor.setResourceFactory(factory);
factory.addBeanPostProcessor(commAnnotationProcessor);
-
+
}
}
Modified: james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiConfigurationProvider.java
URL: http://svn.apache.org/viewvc/james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiConfigurationProvider.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiConfigurationProvider.java (original)
+++ james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiConfigurationProvider.java Mon Apr 4 18:44:55 2011
@@ -27,33 +27,33 @@ import org.apache.james.container.spring
/**
* Load configuration files from the specified configuration directory
- *
- *
*/
-public class OsgiConfigurationProvider implements ConfigurationProvider{
+public class OsgiConfigurationProvider implements ConfigurationProvider {
private String configDir;
public OsgiConfigurationProvider(String configDir) {
this.configDir = configDir;
}
-
+
/*
* (non-Javadoc)
- * @see org.apache.james.container.spring.lifecycle.ConfigurationProvider#getConfiguration(java.lang.String)
+ *
+ * @see org.apache.james.container.spring.lifecycle.ConfigurationProvider#
+ * getConfiguration(java.lang.String)
*/
public HierarchicalConfiguration getConfiguration(String beanName) throws ConfigurationException {
XMLConfiguration config = new XMLConfiguration();
config.setDelimiterParsingDisabled(true);
-
- config.load(new File(configDir +"/" + beanName + ".xml"));
+
+ config.load(new File(configDir + "/" + beanName + ".xml"));
return config;
-
+
}
public void registerConfiguration(String beanName, HierarchicalConfiguration conf) {
// TODO Auto-generated method stub
-
+
}
}
Modified: james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiLogProvider.java
URL: http://svn.apache.org/viewvc/james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiLogProvider.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiLogProvider.java (original)
+++ james/server/trunk/osgi/src/main/java/org/apache/james/container/osgi/OsgiLogProvider.java Mon Apr 4 18:44:55 2011
@@ -22,16 +22,17 @@ import org.apache.james.container.spring
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* Return {@link Log} for using within OSGI container
- *
*/
-public class OsgiLogProvider implements LogProvider{
+public class OsgiLogProvider implements LogProvider {
/*
* (non-Javadoc)
- * @see org.apache.james.container.spring.lifecycle.LogProvider#getLog(java.lang.String)
+ *
+ * @see
+ * org.apache.james.container.spring.lifecycle.LogProvider#getLog(java.lang
+ * .String)
*/
public Logger getLog(String beanName) {
return LoggerFactory.getLogger(beanName);
@@ -39,7 +40,7 @@ public class OsgiLogProvider implements
public void registerLog(String beanName, Logger log) {
// TODO Auto-generated method stub
-
+
}
}
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3HandlerConfigurationData.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3HandlerConfigurationData.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3HandlerConfigurationData.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3HandlerConfigurationData.java Mon Apr 4 18:44:55 2011
@@ -17,33 +17,29 @@
* under the License. *
****************************************************************/
-
-
package org.apache.james.pop3server;
/**
- * Provides a number of server-wide constant values to the
- * POP3Handlers
- *
+ * Provides a number of server-wide constant values to the POP3Handlers
*/
public interface POP3HandlerConfigurationData {
/**
* Returns the service wide hello name
- *
+ *
* @return the hello name
*/
String getHelloName();
/**
* Returns the service wide reset length in bytes.
- *
+ *
* @return the reset length
*/
int getResetLength();
-
+
/**
- * Return if starttls is supported by the POP3Server
+ * Return if starttls is supported by the POP3Server
*
* @return startTLSSupported
*/
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Request.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Request.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Request.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Request.java Mon Apr 4 18:44:55 2011
@@ -22,14 +22,11 @@ package org.apache.james.pop3server;
import org.apache.james.protocols.api.BaseRequest;
/**
- * POP3Request object
- *
+ * POP3Request object
*/
-public class POP3Request extends BaseRequest{
-
-
+public class POP3Request extends BaseRequest {
public POP3Request(final String command, final String argument) {
- super(command,argument);
+ super(command, argument);
}
}
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Response.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Response.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Response.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Response.java Mon Apr 4 18:44:55 2011
@@ -24,59 +24,58 @@ import java.util.List;
import org.apache.james.protocols.api.RetCodeResponse;
-
/**
* Contains an SMTP result
*/
-public class POP3Response implements RetCodeResponse{
-
+public class POP3Response implements RetCodeResponse {
// POP3 response prefixes
- /** OK response. Requested content will follow */
+ /** OK response. Requested content will follow */
public final static String OK_RESPONSE = "+OK";
-
- /**
- * Error response.
- * Requested content will not be provided.
- * This prefix is followed by a more detailed error message.
+
+ /**
+ * Error response. Requested content will not be provided. This prefix is
+ * followed by a more detailed error message.
*/
- public final static String ERR_RESPONSE = "-ERR";
-
+ public final static String ERR_RESPONSE = "-ERR";
+
private String retCode = null;
private List<CharSequence> lines = null;
private String rawLine = null;
private boolean endSession = false;
-
-
+
/**
- * Construct a new POP3Response. The given code and description can not be null, if null an IllegalArgumentException
- * get thrown
+ * Construct a new POP3Response. The given code and description can not be
+ * null, if null an IllegalArgumentException get thrown
*
- * @param code the returnCode
- * @param description the description
+ * @param code
+ * the returnCode
+ * @param description
+ * the description
*/
public POP3Response(String code, CharSequence description) {
- if (code == null) throw new IllegalArgumentException("POP3Response code can not be null");
-
+ if (code == null)
+ throw new IllegalArgumentException("POP3Response code can not be null");
+
this.setRetCode(code);
if (description == null) {
- description = "";
+ description = "";
}
this.rawLine = code + " " + description;
this.appendLine(description);
-
}
-
+
public POP3Response(String code) {
- this(code,null);
+ this(code, null);
}
-
+
/**
* Append the responseLine to the SMTPResponse
*
- * @param line the responseLine to append
+ * @param line
+ * the responseLine to append
*/
public void appendLine(CharSequence line) {
if (lines == null) {
@@ -89,7 +88,6 @@ public class POP3Response implements Ret
return retCode;
}
-
public void setRetCode(String retCode) {
this.retCode = retCode;
}
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java Mon Apr 4 18:44:55 2011
@@ -17,17 +17,13 @@
* under the License. *
****************************************************************/
-
-
package org.apache.james.pop3server;
-
import org.apache.james.mailbox.MessageManager;
import org.apache.james.protocols.api.TLSSupportedSession;
/**
- * All the handlers access this interface to communicate with
- * POP3Handler object
+ * All the handlers access this interface to communicate with POP3Handler object
*/
public interface POP3Session extends TLSSupportedSession {
@@ -35,29 +31,28 @@ public interface POP3Session extends TLS
final static String UID_LIST = "UID_LIST";
final static String DELETED_UID_LIST = "DELETED_UID_LIST";
final static String MAILBOX_SESSION = "MAILBOX_SESSION";
-
+
// Authentication states for the POP3 interaction
/** Waiting for user id */
final static int AUTHENTICATION_READY = 0;
/** User id provided, waiting for password */
- final static int AUTHENTICATION_USERSET = 1;
+ final static int AUTHENTICATION_USERSET = 1;
/**
- * A valid user id/password combination has been provided.
- * In this state the client can access the mailbox
- * of the specified user.
+ * A valid user id/password combination has been provided. In this state the
+ * client can access the mailbox of the specified user.
*/
- final static int TRANSACTION = 2;
+ final static int TRANSACTION = 2;
/**
* Returns POP3Handler service wide configuration
- *
+ *
* @return POP3HandlerConfigurationData
*/
POP3HandlerConfigurationData getConfigurationData();
-
+
/**
* Returns the current handler state
- *
+ *
* @return handler state
*/
int getHandlerState();
@@ -65,7 +60,8 @@ public interface POP3Session extends TLS
/**
* Sets the new handler state
*
- * @param handlerState state
+ * @param handlerState
+ * state
*/
void setHandlerState(int handlerState);
@@ -79,8 +75,8 @@ public interface POP3Session extends TLS
/**
* Sets a new mailbox content
*
- * @param userMailbox mailbox
+ * @param userMailbox
+ * mailbox
*/
void setUserMailbox(MessageManager mailbox);
}
-
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CRLFTerminatedInputStream.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CRLFTerminatedInputStream.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CRLFTerminatedInputStream.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CRLFTerminatedInputStream.java Mon Apr 4 18:44:55 2011
@@ -24,20 +24,20 @@ import java.io.IOException;
import java.io.InputStream;
/**
- * This {@link FilterInputStream} makes sure that the last chars of the stream are \r\n
+ * This {@link FilterInputStream} makes sure that the last chars of the stream
+ * are \r\n
*
* See JAMES-1174 for an use case
- *
*/
-public class CRLFTerminatedInputStream extends FilterInputStream{
+public class CRLFTerminatedInputStream extends FilterInputStream {
private int last;
private byte[] extraData;
private int pos = 0;
private boolean complete = false;
-
+
private boolean endOfStream = false;
-
+
public CRLFTerminatedInputStream(InputStream in) {
super(in);
}
@@ -50,10 +50,10 @@ public class CRLFTerminatedInputStream e
if (r == -1) {
endOfStream = true;
calculateExtraData();
-
+
return fillArray(b, off, len);
- } else {
- last = b[r -1];
+ } else {
+ last = b[r - 1];
return r;
}
} else {
@@ -67,7 +67,7 @@ public class CRLFTerminatedInputStream e
if (complete) {
return -1;
}
- while( i < len) {
+ while (i < len) {
a = readNext();
if (a == -1) {
complete = true;
@@ -79,7 +79,7 @@ public class CRLFTerminatedInputStream e
}
return i;
}
-
+
@Override
public int read(byte[] b) throws IOException {
return read(b, 0, b.length);
@@ -102,7 +102,7 @@ public class CRLFTerminatedInputStream e
return readNext();
}
}
-
+
private void calculateExtraData() {
if (last == '\n') {
extraData = null;
@@ -114,8 +114,9 @@ public class CRLFTerminatedInputStream e
extraData[0] = '\r';
extraData[1] = '\n';
}
-
+
}
+
private int readNext() {
if (extraData == null || extraData.length == pos) {
return -1;
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCapability.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCapability.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCapability.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCapability.java Mon Apr 4 18:44:55 2011
@@ -26,8 +26,6 @@ import org.apache.james.pop3server.POP3S
/**
* A handler which support the POP3 Extension Mechanism should implement this
* interface
- *
- *
*/
public interface CapaCapability {
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java Mon Apr 4 18:44:55 2011
@@ -33,7 +33,6 @@ import org.apache.james.protocols.api.Wi
/**
* This handler is used to handle CAPA commands
- *
*/
public class CapaCmdHandler implements CommandHandler<POP3Session>, ExtensibleHandler, CapaCapability {
public final static String COMMAND_NAME = "CAPA";
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java Mon Apr 4 18:44:55 2011
@@ -26,7 +26,7 @@ import org.apache.james.protocols.api.Ha
import org.apache.james.protocols.impl.log.ConnectHandlerResultLogger;
import org.apache.james.protocols.impl.log.LineHandlerResultLogger;
-public class CoreCmdHandlerLoader implements HandlersPackage{
+public class CoreCmdHandlerLoader implements HandlersPackage {
private final static String CAPACMDHANDLER = CapaCmdHandler.class.getName();
private final static String USERCMDHANDLER = UserCmdHandler.class.getName();
@@ -44,12 +44,12 @@ public class CoreCmdHandlerLoader implem
private final static String UNKOWNCMDHANDLER = UnknownCmdHandler.class.getName();
private final static String COMMANDDISPATCHER = POP3CommandDispatcherLineHandler.class.getName();
-
+
// logging stuff
private final String COMMANDHANDLERRESULTLOGGER = POP3CommandHandlerResultLogger.class.getName();
private final String CONNECTHANDLERRESULTLOGGER = ConnectHandlerResultLogger.class.getName();
private final String LINEHANDLERRESULTLOGGER = LineHandlerResultLogger.class.getName();
-
+
private final List<String> commands = new LinkedList<String>();
public CoreCmdHandlerLoader() {
@@ -69,8 +69,7 @@ public class CoreCmdHandlerLoader implem
commands.add(STATCMDHANDLER);
commands.add(QUITCMDHANDLER);
commands.add(UNKOWNCMDHANDLER);
-
-
+
// Add logging stuff
commands.add(COMMANDHANDLERRESULTLOGGER);
commands.add(CONNECTHANDLERRESULTLOGGER);
@@ -79,6 +78,7 @@ public class CoreCmdHandlerLoader implem
/*
* (non-Javadoc)
+ *
* @see org.apache.james.protocols.api.HandlersPackage#getHandlers()
*/
public List<String> getHandlers() {
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java Mon Apr 4 18:44:55 2011
@@ -17,15 +17,12 @@
* under the License. *
****************************************************************/
-
-
package org.apache.james.pop3server.core;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-
import org.apache.james.pop3server.POP3Response;
import org.apache.james.pop3server.POP3Session;
import org.apache.james.protocols.api.CommandHandler;
@@ -33,17 +30,15 @@ import org.apache.james.protocols.api.Re
import org.apache.james.protocols.api.Response;
/**
- * Handles DELE command
- */
+ * Handles DELE command
+ */
public class DeleCmdHandler implements CommandHandler<POP3Session> {
- private final static String COMMAND_NAME = "DELE";
+ private final static String COMMAND_NAME = "DELE";
- /**
- * Handler method called upon receipt of a DELE command.
- * This command deletes a particular mail message from the
- * mailbox.
- *
- */
+ /**
+ * Handler method called upon receipt of a DELE command. This command
+ * deletes a particular mail message from the mailbox.
+ */
@SuppressWarnings("unchecked")
public Response onCommand(POP3Session session, Request request) {
POP3Response response = null;
@@ -52,44 +47,34 @@ public class DeleCmdHandler implements C
try {
num = Integer.parseInt(request.getArgument());
} catch (Exception e) {
- response = new POP3Response(POP3Response.ERR_RESPONSE,"Usage: DELE [mail number]");
+ response = new POP3Response(POP3Response.ERR_RESPONSE, "Usage: DELE [mail number]");
return response;
}
try {
List<MessageMetaData> uidList = (List<MessageMetaData>) session.getState().get(POP3Session.UID_LIST);
List<Long> deletedUidList = (List<Long>) session.getState().get(POP3Session.DELETED_UID_LIST);
- Long uid = uidList.get(num -1).getUid();
-
+ Long uid = uidList.get(num - 1).getUid();
+
if (deletedUidList.contains(uid)) {
- StringBuilder responseBuffer =
- new StringBuilder(64)
- .append("Message (")
- .append(num)
- .append(") already deleted.");
- response = new POP3Response(POP3Response.ERR_RESPONSE,responseBuffer.toString());
+ StringBuilder responseBuffer = new StringBuilder(64).append("Message (").append(num).append(") already deleted.");
+ response = new POP3Response(POP3Response.ERR_RESPONSE, responseBuffer.toString());
} else {
deletedUidList.add(uid);
// we are replacing our reference with "DELETED", so we have
// to dispose the no-more-referenced mail object.
- response = new POP3Response(POP3Response.OK_RESPONSE,"Message deleted");
+ response = new POP3Response(POP3Response.OK_RESPONSE, "Message deleted");
}
} catch (IndexOutOfBoundsException iob) {
- StringBuilder responseBuffer =
- new StringBuilder(64)
- .append("Message (")
- .append(num)
- .append(") does not exist.");
- response = new POP3Response(POP3Response.ERR_RESPONSE,responseBuffer.toString());
+ StringBuilder responseBuffer = new StringBuilder(64).append("Message (").append(num).append(") does not exist.");
+ response = new POP3Response(POP3Response.ERR_RESPONSE, responseBuffer.toString());
}
} else {
response = new POP3Response(POP3Response.ERR_RESPONSE);
}
- return response;
+ return response;
}
-
-
/**
* @see org.apache.james.api.protocol.CommonCommandHandler#getImplCommands()
*/
@@ -99,5 +84,4 @@ public class DeleCmdHandler implements C
return commands;
}
-
}
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ExtraDotInputStream.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ExtraDotInputStream.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ExtraDotInputStream.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ExtraDotInputStream.java Mon Apr 4 18:44:55 2011
@@ -23,9 +23,10 @@ import java.io.IOException;
import java.io.InputStream;
/**
- * Adds extra dot if dot occurs in message body at beginning of line (according to RFC1939)
+ * Adds extra dot if dot occurs in message body at beginning of line (according
+ * to RFC1939)
*/
-public class ExtraDotInputStream extends ReadByteFilterInputStream{
+public class ExtraDotInputStream extends ReadByteFilterInputStream {
byte[] buf = new byte[3];
int pos = 0;
@@ -33,41 +34,41 @@ public class ExtraDotInputStream extends
boolean extraDot = false;
boolean startLine;
int last;
-
+
public ExtraDotInputStream(InputStream in) {
super(in);
startLine = true;
}
-
@Override
public synchronized int read() throws IOException {
- if (end) return -1;
-
+ if (end)
+ return -1;
+
if (startLine) {
int i = 0;
// check if we still have something in the buffer
// if so we need to copy it so we don't lose data
-
+
// See JAMES-1152
if (pos != -1 && pos != 0) {
byte[] tmpBuf = new byte[3];
- while(pos < buf.length) {
+ while (pos < buf.length) {
tmpBuf[i++] = buf[pos++];
}
-
+
buf = tmpBuf;
}
while (i < buf.length) {
buf[i++] = (byte) in.read();
}
- if (buf[0] == '.' && buf[1] == '\r' && buf[2] == '\n') {
+ if (buf[0] == '.' && buf[1] == '\r' && buf[2] == '\n') {
extraDot = true;
}
startLine = false;
pos = 0;
}
-
+
int a;
if (pos == -1) {
a = in.read();
@@ -77,7 +78,7 @@ public class ExtraDotInputStream extends
return '.';
} else {
a = buf[pos++];
-
+
if (pos == buf.length) {
pos = -1;
}
@@ -85,14 +86,14 @@ public class ExtraDotInputStream extends
end = true;
}
}
-
+
}
if (last == '\r' && a == '\n') {
startLine = true;
}
last = a;
return a;
-
+
}
}
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java Mon Apr 4 18:44:55 2011
@@ -81,7 +81,7 @@ public class ListCmdHandler implements C
num = Integer.parseInt(parameters);
MessageMetaData data = uidList.get(num - 1);
if (deletedUidList.contains(data.getUid()) == false) {
-
+
StringBuilder responseBuffer = new StringBuilder(64).append(num).append(" ").append(data.getSize());
response = new POP3Response(POP3Response.OK_RESPONSE, responseBuffer.toString());
} else {
@@ -94,7 +94,7 @@ public class ListCmdHandler implements C
} catch (NumberFormatException nfe) {
StringBuilder responseBuffer = new StringBuilder(64).append(parameters).append(" is not a valid number");
response = new POP3Response(POP3Response.ERR_RESPONSE, responseBuffer.toString());
- }
+ }
}
} else {
response = new POP3Response(POP3Response.ERR_RESPONSE);
@@ -104,6 +104,7 @@ public class ListCmdHandler implements C
/*
* (non-Javadoc)
+ *
* @see org.apache.james.protocols.api.CommandHandler#getImplCommands()
*/
public Collection<String> getImplCommands() {
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/MessageMetaData.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/MessageMetaData.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/MessageMetaData.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/MessageMetaData.java Mon Apr 4 18:44:55 2011
@@ -18,11 +18,8 @@
****************************************************************/
package org.apache.james.pop3server.core;
-
/**
* Hold meta data for a message
- *
- *
*/
public final class MessageMetaData {
@@ -33,7 +30,7 @@ public final class MessageMetaData {
this.uid = uid;
this.size = size;
}
-
+
/**
* Return the uid of the message
*
@@ -42,7 +39,7 @@ public final class MessageMetaData {
public long getUid() {
return uid;
}
-
+
/**
* Return the size of a message
*
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/NoopCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/NoopCmdHandler.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/NoopCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/NoopCmdHandler.java Mon Apr 4 18:44:55 2011
@@ -17,8 +17,6 @@
* under the License. *
****************************************************************/
-
-
package org.apache.james.pop3server.core;
import java.util.ArrayList;
@@ -32,16 +30,15 @@ import org.apache.james.protocols.api.Re
import org.apache.james.protocols.api.Response;
/**
- * Handles NOOP command
- */
+ * Handles NOOP command
+ */
public class NoopCmdHandler implements CommandHandler<POP3Session> {
- private final static String COMMAND_NAME = "NOOP";
+ private final static String COMMAND_NAME = "NOOP";
/**
- * Handler method called upon receipt of a NOOP command.
- * Like all good NOOPs, does nothing much.
- *
- */
+ * Handler method called upon receipt of a NOOP command. Like all good
+ * NOOPs, does nothing much.
+ */
public Response onCommand(POP3Session session, Request request) {
POP3Response response = null;
if (session.getHandlerState() == POP3Session.TRANSACTION) {
@@ -49,19 +46,16 @@ public class NoopCmdHandler implements C
} else {
response = new POP3Response(POP3Response.ERR_RESPONSE);
}
- return response;
+ return response;
}
-
-
- /**
- * @see org.apache.james.api.protocol.CommonCommandHandler#getImplCommands()
- */
+ /**
+ * @see org.apache.james.api.protocol.CommonCommandHandler#getImplCommands()
+ */
public Collection<String> getImplCommands() {
List<String> commands = new ArrayList<String>();
commands.add(COMMAND_NAME);
return commands;
}
-
}
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java Mon Apr 4 18:44:55 2011
@@ -31,9 +31,7 @@ import org.apache.james.protocols.api.Ab
import org.apache.james.protocols.api.CommandHandler;
/**
- * Dispatch POP3 {@link CommandHandler}
- *
- *
+ * Dispatch POP3 {@link CommandHandler}
*/
public class POP3CommandDispatcherLineHandler extends AbstractCommandDispatcher<POP3Session> {
private final static String[] mandatoryCommands = { "USER", "PASS", "LIST" };
@@ -79,7 +77,7 @@ public class POP3CommandDispatcherLineHa
// notify the mailboxmanager about the end of the processing
manager.endProcessingRequest(mSession);
return disconnect;
-
+
}
}
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandHandlerResultLogger.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandHandlerResultLogger.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandHandlerResultLogger.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandHandlerResultLogger.java Mon Apr 4 18:44:55 2011
@@ -23,10 +23,10 @@ import org.apache.james.pop3server.POP3S
import org.apache.james.protocols.impl.log.AbstractCommandHandlerResultLogger;
/**
- * Log {@link POP3Response} with {@link POP3Response#ERR_RESPONSE} return code to INFO. The rest to DEBUG
- *
+ * Log {@link POP3Response} with {@link POP3Response#ERR_RESPONSE} return code
+ * to INFO. The rest to DEBUG
*/
-public class POP3CommandHandlerResultLogger extends AbstractCommandHandlerResultLogger<POP3Response, POP3Session>{
+public class POP3CommandHandlerResultLogger extends AbstractCommandHandlerResultLogger<POP3Response, POP3Session> {
@Override
protected boolean logWithInfo(String code) {
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java Mon Apr 4 18:44:55 2011
@@ -53,7 +53,6 @@ public class PassCmdHandler extends Rset
/**
* Handler method called upon receipt of a PASS command. Reads in and
* validates the password.
- *
*/
public Response onCommand(POP3Session session, Request request) {
String parameters = request.getArgument();
@@ -62,12 +61,13 @@ public class PassCmdHandler extends Rset
String passArg = parameters;
try {
MailboxSession mSession = mailboxManager.login(session.getUser(), passArg, session.getLogger());
-
- // explicit call start processing because it was not stored before in the session
+
+ // explicit call start processing because it was not stored
+ // before in the session
mailboxManager.startProcessingRequest(mSession);
-
+
MailboxPath mailboxPath = MailboxPath.inbox(session.getUser());
-
+
// check if mailbox exists.. if not just create it
if (mailboxManager.mailboxExists(mailboxPath, mSession) == false) {
mailboxManager.createMailbox(mailboxPath, mSession);
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java Mon Apr 4 18:44:55 2011
@@ -52,7 +52,6 @@ public class QuitCmdHandler implements C
/**
* Handler method called upon receipt of a QUIT command. This method handles
* cleanup of the POP3Handler state.
- *
*/
@SuppressWarnings("unchecked")
public Response onCommand(POP3Session session, Request request) {
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ReadByteFilterInputStream.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ReadByteFilterInputStream.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ReadByteFilterInputStream.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ReadByteFilterInputStream.java Mon Apr 4 18:44:55 2011
@@ -23,7 +23,7 @@ import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
-public class ReadByteFilterInputStream extends FilterInputStream{
+public class ReadByteFilterInputStream extends FilterInputStream {
protected ReadByteFilterInputStream(InputStream in) {
super(in);
@@ -34,18 +34,18 @@ public class ReadByteFilterInputStream e
int i;
for (i = 0; i < len; i++) {
int a = read();
- if (i == 0 && a == - 1) {
+ if (i == 0 && a == -1) {
return -1;
} else {
if (a == -1) {
break;
} else {
- b[off++] = (byte) a;
+ b[off++] = (byte) a;
}
}
}
return i;
-
+
}
@Override
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java Mon Apr 4 18:44:55 2011
@@ -54,7 +54,6 @@ public class RetrCmdHandler implements C
/**
* Handler method called upon receipt of a RETR command. This command
* retrieves a particular mail message from the mailbox.
- *
*/
@SuppressWarnings("unchecked")
public Response onCommand(POP3Session session, Request request) {
@@ -76,25 +75,26 @@ public class RetrCmdHandler implements C
Long uid = uidList.get(num - 1).getUid();
if (deletedUidList.contains(uid) == false) {
Iterator<MessageResult> results = session.getUserMailbox().getMessages(MessageRange.one(uid), new FetchGroupImpl(FetchGroup.FULL_CONTENT), mailboxSession);
-
+
if (results.hasNext()) {
MessageResult result = results.next();
try {
session.writeStream(new ByteArrayInputStream((POP3Response.OK_RESPONSE + " Message follows\r\n").getBytes()));
- // response = new POP3Response(POP3Response.OK_RESPONSE,
+ // response = new
+ // POP3Response(POP3Response.OK_RESPONSE,
// "Message follows");
Content content = result.getFullContent();
InputStream in;
if (content instanceof InputStreamContent) {
- in =((InputStreamContent) content).getInputStream();
+ in = ((InputStreamContent) content).getInputStream();
} else {
in = createInputStream(content);
}
- //session.writeStream(new ExtraDotInputStream(in));
+ // session.writeStream(new ExtraDotInputStream(in));
session.writeStream(new ExtraDotInputStream(new CRLFTerminatedInputStream(in)));
- } finally {
+ } finally {
// write a single dot to mark message as complete
session.writeStream(new ByteArrayInputStream(".\r\n".getBytes()));
}
@@ -131,7 +131,7 @@ public class RetrCmdHandler implements C
content.writeTo(Channels.newChannel(out));
return new ByteArrayInputStream(out.toByteArray());
}
-
+
/*
* (non-Javadoc)
*
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java Mon Apr 4 18:44:55 2011
@@ -45,7 +45,6 @@ public class RsetCmdHandler implements C
/**
* Handler method called upon receipt of a RSET command. Calls stat() to
* reset the mailbox.
- *
*/
public Response onCommand(POP3Session session, Request request) {
POP3Response response = null;
@@ -63,7 +62,6 @@ public class RsetCmdHandler implements C
* this amounts to a rollback of the mailbox contents to the beginning of
* the transaction. This method is also called when first entering the
* transaction state to initialize the handler copies of the user inbox.
- *
*/
protected void stat(POP3Session session) {
try {
@@ -74,7 +72,7 @@ public class RsetCmdHandler implements C
while (it.hasNext()) {
MessageResult result = it.next();
uids.add(new MessageMetaData(result.getUid(), result.getSize()));
-
+
}
session.getState().put(POP3Session.UID_LIST, uids);
session.getState().put(POP3Session.DELETED_UID_LIST, new ArrayList<Long>());
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StatCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StatCmdHandler.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StatCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StatCmdHandler.java Mon Apr 4 18:44:55 2011
@@ -38,7 +38,6 @@ public class StatCmdHandler implements C
/**
* Handler method called upon receipt of a STAT command. Returns the number
* of messages in the mailbox and its aggregate size.
- *
*/
@SuppressWarnings("unchecked")
public Response onCommand(POP3Session session, Request request) {
@@ -49,7 +48,7 @@ public class StatCmdHandler implements C
List<Long> deletedUidList = (List<Long>) session.getState().get(POP3Session.DELETED_UID_LIST);
long size = 0;
int count = 0;
- if (uidList.isEmpty() == false) {
+ if (uidList.isEmpty() == false) {
List<MessageMetaData> validResults = new ArrayList<MessageMetaData>();
for (int i = 0; i < uidList.size(); i++) {
MessageMetaData data = uidList.get(i);
@@ -62,7 +61,7 @@ public class StatCmdHandler implements C
}
StringBuilder responseBuffer = new StringBuilder(32).append(count).append(" ").append(size);
response = new POP3Response(POP3Response.OK_RESPONSE, responseBuffer.toString());
-
+
} else {
response = new POP3Response(POP3Response.ERR_RESPONSE);
}
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java Mon Apr 4 18:44:55 2011
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-
import org.apache.james.pop3server.POP3Response;
import org.apache.james.pop3server.POP3Session;
import org.apache.james.protocols.api.CommandHandler;
@@ -34,24 +33,23 @@ import org.apache.james.protocols.api.Re
/**
* Handler which offer STARTTLS implementation for POP3. STARTTLS is started
* with the STSL command
- *
- *
*/
public class StlsCmdHandler implements CommandHandler<POP3Session>, CapaCapability {
public final static String COMMAND_NAME = "STLS";
-
/*
* (non-Javadoc)
- * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+ *
+ * @see
+ * org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james
+ * .api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
*/
public Response onCommand(POP3Session session, Request request) {
POP3Response response;
// check if starttls is supported, the state is the right one and it was
// not started before
- if (session.isStartTLSSupported() && session.getHandlerState() == POP3Session.AUTHENTICATION_READY
- && session.isTLSStarted() == false) {
- response = new POP3Response(POP3Response.OK_RESPONSE,"Begin TLS negotiation");
+ if (session.isStartTLSSupported() && session.getHandlerState() == POP3Session.AUTHENTICATION_READY && session.isTLSStarted() == false) {
+ response = new POP3Response(POP3Response.OK_RESPONSE, "Begin TLS negotiation");
session.writeResponse(response);
try {
session.startTLS();
@@ -70,8 +68,6 @@ public class StlsCmdHandler implements C
return null;
}
-
-
/**
* @see org.apache.james.pop3server.core.CapaCapability#getImplementedCapabilities(org.apache.james.pop3server.POP3Session)
*/
@@ -84,8 +80,6 @@ public class StlsCmdHandler implements C
return caps;
}
-
-
/**
* @see org.apache.james.api.protocol.CommonCommandHandler#getImplCommands()
*/
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java Mon Apr 4 18:44:55 2011
@@ -59,7 +59,6 @@ public class TopCmdHandler extends RetrC
*
* The expected command format is TOP [mail message number] [number of lines
* to return]
- *
*/
@SuppressWarnings("unchecked")
@Override
@@ -99,28 +98,29 @@ public class TopCmdHandler extends RetrC
FetchGroupImpl fetchGroup = new FetchGroupImpl(FetchGroup.BODY_CONTENT);
fetchGroup.or(FetchGroup.HEADERS);
Iterator<MessageResult> results = session.getUserMailbox().getMessages(MessageRange.one(uid), fetchGroup, mailboxSession);
-
+
if (results.hasNext()) {
MessageResult result = results.next();
-
+
session.writeStream(new ByteArrayInputStream((POP3Response.OK_RESPONSE + " Message follows\r\n").getBytes()));
try {
ByteArrayOutputStream headersOut = new ByteArrayOutputStream();
WritableByteChannel headersChannel = Channels.newChannel(headersOut);
-
+
// write headers
Iterator<Header> headers = result.headers();
while (headers.hasNext()) {
headers.next().writeTo(headersChannel);
- // we need to write out the CRLF after each header
+ // we need to write out the CRLF after each
+ // header
headersChannel.write(ByteBuffer.wrap("\r\n".getBytes()));
}
// headers and body are seperated by a CRLF
headersChannel.write(ByteBuffer.wrap("\r\n".getBytes()));
session.writeStream(new ByteArrayInputStream(headersOut.toByteArray()));
-
+
InputStream bodyIn;
Content content = result.getBody();
if (content instanceof InputStreamContent) {
@@ -134,7 +134,7 @@ public class TopCmdHandler extends RetrC
} finally {
// write a single dot to mark message as complete
session.writeStream(new ByteArrayInputStream(".\r\n".getBytes()));
-
+
}
return null;
@@ -142,7 +142,7 @@ public class TopCmdHandler extends RetrC
StringBuilder exceptionBuffer = new StringBuilder(64).append("Message (").append(num).append(") does not exist.");
response = new POP3Response(POP3Response.ERR_RESPONSE, exceptionBuffer.toString());
}
-
+
} else {
StringBuilder responseBuffer = new StringBuilder(64).append("Message (").append(num).append(") already deleted.");
response = new POP3Response(POP3Response.ERR_RESPONSE, responseBuffer.toString());
@@ -187,11 +187,8 @@ public class TopCmdHandler extends RetrC
}
/**
- * This {@link InputStream} implementation can be used to limit the body lines
- * which will be read from the wrapped {@link InputStream}
- *
- *
- *
+ * This {@link InputStream} implementation can be used to limit the body
+ * lines which will be read from the wrapped {@link InputStream}
*/
private final class CountingBodyInputStream extends FilterInputStream {
@@ -204,8 +201,7 @@ public class TopCmdHandler extends RetrC
* @param in
* InputStream to read from
* @param limit
- * the lines to read. -1 is used for no
- * limits
+ * the lines to read. -1 is used for no limits
*/
public CountingBodyInputStream(InputStream in, int limit) {
super(in);
@@ -216,13 +212,13 @@ public class TopCmdHandler extends RetrC
public synchronized int read() throws IOException {
if (limit != -1) {
if (count <= limit) {
- int a = in.read();
-
+ int a = in.read();
+
if (lastChar == '\r' && a == '\n') {
count++;
}
lastChar = a;
-
+
return a;
} else {
return -1;
@@ -231,25 +227,23 @@ public class TopCmdHandler extends RetrC
return in.read();
}
-
-
}
@Override
public int read(byte[] b, int off, int len) throws IOException {
if (limit == -1) {
return in.read(b, off, len);
- } else {
+ } else {
int i;
for (i = 0; i < len; i++) {
int a = read();
- if (i == 0 && a == - 1) {
+ if (i == 0 && a == -1) {
return -1;
} else {
if (a == -1) {
break;
} else {
- b[off++] = (byte) a;
+ b[off++] = (byte) a;
}
}
}
@@ -262,11 +256,9 @@ public class TopCmdHandler extends RetrC
if (limit == -1) {
return in.read(b);
} else {
- return read(b, 0 , b.length);
+ return read(b, 0, b.length);
}
}
-
-
}
}
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UidlCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UidlCmdHandler.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UidlCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UidlCmdHandler.java Mon Apr 4 18:44:55 2011
@@ -38,7 +38,6 @@ public class UidlCmdHandler implements C
/**
* Handler method called upon receipt of a UIDL command. Returns a listing
* of message ids to the client.
- *
*/
@SuppressWarnings("unchecked")
public Response onCommand(POP3Session session, Request request) {
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UnknownCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UnknownCmdHandler.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UnknownCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UnknownCmdHandler.java Mon Apr 4 18:44:55 2011
@@ -41,7 +41,6 @@ public class UnknownCmdHandler implement
/**
* Handler method called upon receipt of an unrecognized command. Returns an
* error response and logs the command.
- *
*/
public Response onCommand(POP3Session session, Request request) {
return new POP3Response(POP3Response.ERR_RESPONSE);
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UserCmdHandler.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UserCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UserCmdHandler.java Mon Apr 4 18:44:55 2011
@@ -39,7 +39,6 @@ public class UserCmdHandler implements C
/**
* Handler method called upon receipt of a USER command. Reads in the user
* id.
- *
*/
public Response onCommand(POP3Session session, Request request) {
POP3Response response = null;
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java Mon Apr 4 18:44:55 2011
@@ -25,7 +25,8 @@ import org.apache.james.protocols.api.Co
public class WelcomeMessageHandler implements ConnectHandler<POP3Session> {
/** POP3 Server identification string used in POP3 headers */
- private static final String softwaretype = "JAMES POP3 Server ";// + Constants.SOFTWARE_VERSION;
+ private static final String softwaretype = "JAMES POP3 Server ";// +
+ // Constants.SOFTWARE_VERSION;
/**
* @see org.apache.james.pop3server.ConnectHandler#onConnect(org.apache.james.pop3server.POP3Session)
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/CommandHandlerResultJMXMonitor.java Mon Apr 4 18:44:55 2011
@@ -31,16 +31,16 @@ import org.apache.james.protocols.lib.jm
/**
* Gather JMX stats for {@link CommandHandler}
- *
*/
-public class CommandHandlerResultJMXMonitor extends AbstractCommandHandlerResultJMXMonitor<POP3Response, POP3Session> implements Configurable{
+public class CommandHandlerResultJMXMonitor extends AbstractCommandHandlerResultJMXMonitor<POP3Response, POP3Session> implements Configurable {
private String jmxName;
-
/*
* (non-Javadoc)
- * @see org.apache.james.socket.AbstractCommandHandlerResultJMXMonitor#createCommandHandlerStats(org.apache.james.protocols.api.CommandHandler)
+ *
+ * @see org.apache.james.socket.AbstractCommandHandlerResultJMXMonitor#
+ * createCommandHandlerStats(org.apache.james.protocols.api.CommandHandler)
*/
protected AbstractCommandHandlerStats<POP3Response> createCommandHandlerStats(CommandHandler<POP3Session> handler) throws Exception {
Collection<String> col = handler.getImplCommands();
@@ -49,10 +49,12 @@ public class CommandHandlerResultJMXMoni
return new POP3CommandHandlerStats(jmxName, cName, col.toArray(new String[col.size()]));
}
-
/*
* (non-Javadoc)
- * @see org.apache.james.lifecycle.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration)
+ *
+ * @see
+ * org.apache.james.lifecycle.Configurable#configure(org.apache.commons.
+ * configuration.HierarchicalConfiguration)
*/
public void configure(HierarchicalConfiguration config) throws ConfigurationException {
this.jmxName = config.getString("jmxName", "pop3server");
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/ConnectHandlerResultJMXMonitor.java Mon Apr 4 18:44:55 2011
@@ -21,14 +21,13 @@ package org.apache.james.pop3server.jmx;
import org.apache.james.pop3server.POP3Session;
import org.apache.james.protocols.lib.jmx.AbstractConnectHandlerResultJMXMonitor;
-public class ConnectHandlerResultJMXMonitor extends AbstractConnectHandlerResultJMXMonitor<POP3Session>{
-
-
-
+public class ConnectHandlerResultJMXMonitor extends AbstractConnectHandlerResultJMXMonitor<POP3Session> {
/*
* (non-Javadoc)
- * @see org.apache.james.socket.AbstractConnectHandlerResultJMXMonitor#getDefaultJMXName()
+ *
+ * @see org.apache.james.socket.AbstractConnectHandlerResultJMXMonitor#
+ * getDefaultJMXName()
*/
protected String getDefaultJMXName() {
return "pop3server";
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/JMXHandlersLoader.java Mon Apr 4 18:44:55 2011
@@ -23,9 +23,10 @@ import java.util.List;
import org.apache.james.protocols.api.HandlersPackage;
-public class JMXHandlersLoader implements HandlersPackage{
+public class JMXHandlersLoader implements HandlersPackage {
private final List<String> handlers = new ArrayList<String>();
+
public JMXHandlersLoader() {
handlers.add(ConnectHandlerResultJMXMonitor.class.getName());
handlers.add(CommandHandlerResultJMXMonitor.class.getName());
@@ -34,6 +35,7 @@ public class JMXHandlersLoader implement
/*
* (non-Javadoc)
+ *
* @see org.apache.james.protocols.api.HandlersPackage#getHandlers()
*/
public List<String> getHandlers() {
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/LineHandlerResultJMXMonitor.java Mon Apr 4 18:44:55 2011
@@ -21,11 +21,14 @@ package org.apache.james.pop3server.jmx;
import org.apache.james.pop3server.POP3Session;
import org.apache.james.protocols.lib.jmx.AbstractLineHandlerResultJMXMonitor;
-public class LineHandlerResultJMXMonitor extends AbstractLineHandlerResultJMXMonitor<POP3Session>{
+public class LineHandlerResultJMXMonitor extends AbstractLineHandlerResultJMXMonitor<POP3Session> {
/*
* (non-Javadoc)
- * @see org.apache.james.socket.AbstractLineHandlerResultJMXMonitor#getDefaultJMXName()
+ *
+ * @see
+ * org.apache.james.socket.AbstractLineHandlerResultJMXMonitor#getDefaultJMXName
+ * ()
*/
protected String getDefaultJMXName() {
return "pop3server";
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStats.java Mon Apr 4 18:44:55 2011
@@ -28,31 +28,36 @@ import javax.management.NotCompliantMBea
import org.apache.james.pop3server.POP3Response;
import org.apache.james.protocols.lib.jmx.AbstractCommandHandlerStats;
-public class POP3CommandHandlerStats extends AbstractCommandHandlerStats<POP3Response> implements POP3CommandHandlerStatsMBean{
+public class POP3CommandHandlerStats extends AbstractCommandHandlerStats<POP3Response> implements POP3CommandHandlerStatsMBean {
private AtomicLong error = new AtomicLong(0);
- private AtomicLong ok = new AtomicLong(0);
-
+ private AtomicLong ok = new AtomicLong(0);
+
public POP3CommandHandlerStats(String jmxPath, String handlerName, String[] commands) throws NotCompliantMBeanException, MalformedObjectNameException, NullPointerException, InstanceAlreadyExistsException, MBeanRegistrationException {
super(POP3CommandHandlerStatsMBean.class, jmxPath, handlerName, commands);
}
/*
* (non-Javadoc)
- * @see org.apache.james.socket.AbstractCommandHandlerStats#incrementStats(org.apache.james.protocols.api.Response)
+ *
+ * @see
+ * org.apache.james.socket.AbstractCommandHandlerStats#incrementStats(org
+ * .apache.james.protocols.api.Response)
*/
protected void incrementStats(POP3Response response) {
- String code = response.getRetCode();
- if (POP3Response.OK_RESPONSE.equals(code)) {
- ok.incrementAndGet();
- } else if (POP3Response.ERR_RESPONSE.equals(code)) {
- error.incrementAndGet();
- }
+ String code = response.getRetCode();
+ if (POP3Response.OK_RESPONSE.equals(code)) {
+ ok.incrementAndGet();
+ } else if (POP3Response.ERR_RESPONSE.equals(code)) {
+ error.incrementAndGet();
+ }
}
/*
* (non-Javadoc)
- * @see org.apache.james.pop3server.jmx.POP3CommandHandlerStatsMBean#getError()
+ *
+ * @see
+ * org.apache.james.pop3server.jmx.POP3CommandHandlerStatsMBean#getError()
*/
public long getError() {
return error.get();
@@ -60,6 +65,7 @@ public class POP3CommandHandlerStats ext
/*
* (non-Javadoc)
+ *
* @see org.apache.james.pop3server.jmx.POP3CommandHandlerStatsMBean#getOk()
*/
public long getOk() {
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStatsMBean.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStatsMBean.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStatsMBean.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/jmx/POP3CommandHandlerStatsMBean.java Mon Apr 4 18:44:55 2011
@@ -20,7 +20,7 @@ package org.apache.james.pop3server.jmx;
import org.apache.james.protocols.lib.jmx.CommandHandlerStatsMBean;
-public interface POP3CommandHandlerStatsMBean extends CommandHandlerStatsMBean{
+public interface POP3CommandHandlerStatsMBean extends CommandHandlerStatsMBean {
/**
* Return the count of errors returned by the handler
@@ -29,13 +29,11 @@ public interface POP3CommandHandlerStats
*/
long getError();
-
-
/**
* Return the count of successful handling returned by the handler
*
* @return tempCount
*/
long getOk();
-
+
}
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/OioPOP3Server.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/OioPOP3Server.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/OioPOP3Server.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/OioPOP3Server.java Mon Apr 4 18:44:55 2011
@@ -22,12 +22,10 @@ import org.jboss.netty.channel.socket.Se
import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
/**
- * POP3Server which use old IO and not NIO. If you want to use NIO you should use {@link POP3Server}
- *
- *
+ * POP3Server which use old IO and not NIO. If you want to use NIO you should
+ * use {@link POP3Server}
*/
-public class OioPOP3Server extends POP3Server{
-
+public class OioPOP3Server extends POP3Server {
@Override
protected ServerSocketChannelFactory createSocketChannelFactory() {
@@ -36,8 +34,6 @@ public class OioPOP3Server extends POP3S
/**
* Return -1 as it is not known
- *
- *
*/
@Override
public int getIoWorkerCount() {
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java?rev=1088712&r1=1088711&r2=1088712&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java Mon Apr 4 18:44:55 2011
@@ -31,16 +31,14 @@ import org.slf4j.Logger;
/**
* {@link ChannelUpstreamHandler} which is used for the POP3 Server
- *
- *
*/
-public class POP3ChannelUpstreamHandler extends AbstractChannelUpstreamHandler{
+public class POP3ChannelUpstreamHandler extends AbstractChannelUpstreamHandler {
private final Logger logger;
private final POP3HandlerConfigurationData conf;
- private final SSLContext context;
+ private final SSLContext context;
private String[] enabledCipherSuites;
-
+
public POP3ChannelUpstreamHandler(ProtocolHandlerChain chain, POP3HandlerConfigurationData conf, Logger logger, SSLContext context, String[] enabledCipherSuites) {
super(chain);
this.logger = logger;
@@ -53,7 +51,6 @@ public class POP3ChannelUpstreamHandler
this(chain, conf, logger, null, null);
}
-
@Override
protected ProtocolSession createSession(ChannelHandlerContext ctx) throws Exception {
if (context != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org