Author: eric
Date: Fri Jan 6 11:29:00 2012
New Revision: 1228110
URL: http://svn.apache.org/viewvc?rev=1228110&view=rev
Log:
Import and Class rename / usage to use the new protocols 1.6.0-RC2-SNAPSHOT
(JAMES-1360)
Modified:
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/POP3ServerFactory.java
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java?rev=1228110&r1=1228109&r2=1228110&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
Fri Jan 6 11:29:00 2012
@@ -21,9 +21,10 @@ package org.apache.james.pop3server.nett
import org.apache.james.pop3server.core.CoreCmdHandlerLoader;
import org.apache.james.pop3server.jmx.JMXHandlersLoader;
-import org.apache.james.protocols.api.handler.HandlersPackage;
-import org.apache.james.protocols.netty.BasicChannelUpstreamHandler;
+import org.apache.james.protocols.api.logger.ProtocolLoggerAdapter;
+import org.apache.james.protocols.lib.handler.HandlersPackage;
import org.apache.james.protocols.lib.netty.AbstractProtocolAsyncServer;
+import org.apache.james.protocols.netty.BasicChannelUpstreamHandler;
import org.apache.james.protocols.pop3.POP3Configuration;
import org.apache.james.protocols.pop3.POP3Protocol;
import org.jboss.netty.channel.ChannelUpstreamHandler;
@@ -53,7 +54,7 @@ public class POP3Server extends Abstract
/**
* A class to provide POP3 handler configuration to the handlers
*/
- private class POP3HandlerConfigurationDataImpl implements
POP3Configuration {
+ private class POP3HandlerConfigurationDataImpl extends POP3Configuration {
/**
* @see
org.apache.james.pop3server.POP3HandlerConfiguration#getHelloName()
@@ -66,12 +67,10 @@ public class POP3Server extends Abstract
@Override
protected void preInit() throws Exception {
super.preInit();
- POP3Protocol protocol = new POP3Protocol(getProtocolHandlerChain(),
theConfigData);
-
- coreHandler = new BasicChannelUpstreamHandler(protocol, getLogger(),
getEncryption());
+ POP3Protocol protocol = new POP3Protocol(getProtocolHandlerChain(),
theConfigData, new ProtocolLoggerAdapter(getLogger()));
+ coreHandler = new BasicChannelUpstreamHandler(protocol,
getEncryption());
}
-
@Override
protected String getDefaultJMXName() {
return "pop3server";
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ServerFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ServerFactory.java?rev=1228110&r1=1228109&r2=1228110&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ServerFactory.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ServerFactory.java
Fri Jan 6 11:29:00 2012
@@ -7,14 +7,13 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.filesystem.api.FileSystem;
-import org.apache.james.protocols.api.handler.ProtocolHandlerLoader;
+import org.apache.james.protocols.lib.handler.ProtocolHandlerLoader;
import org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer;
import org.apache.james.protocols.lib.netty.AbstractServerFactory;
import org.slf4j.Logger;
public class POP3ServerFactory extends AbstractServerFactory{
-
private ProtocolHandlerLoader loader;
private FileSystem fileSystem;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
