Author: norman
Date: Wed Nov 30 09:04:34 2011
New Revision: 1208334
URL: http://svn.apache.org/viewvc?rev=1208334&view=rev
Log:
Adjust for changes in protocols-1.6-beta3
Modified:
james/server/trunk/imapserver/pom.xml
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
james/server/trunk/lmtpserver/pom.xml
james/server/trunk/pom.xml
james/server/trunk/pop3server/pom.xml
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/netty/POP3Server.java
james/server/trunk/protocols-library/pom.xml
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/AbstractExecutorAwareChannelPipelineFactory.java
james/server/trunk/smtpserver/pom.xml
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPCommandHandlerResultLogger.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
Modified: james/server/trunk/imapserver/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/pom.xml?rev=1208334&r1=1208333&r2=1208334&view=diff
==============================================================================
--- james/server/trunk/imapserver/pom.xml (original)
+++ james/server/trunk/imapserver/pom.xml Wed Nov 30 09:04:34 2011
@@ -65,7 +65,7 @@
</dependency>
<dependency>
<groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-impl</artifactId>
+ <artifactId>protocols-netty</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java?rev=1208334&r1=1208333&r2=1208334&view=diff
==============================================================================
---
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
(original)
+++
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
Wed Nov 30 09:04:34 2011
@@ -32,9 +32,9 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.decode.ImapDecoder;
import org.apache.james.imap.encode.ImapEncoder;
import org.apache.james.protocols.api.Encryption;
-import org.apache.james.protocols.impl.ChannelGroupHandler;
-import org.apache.james.protocols.impl.ConnectionLimitUpstreamHandler;
-import org.apache.james.protocols.impl.ConnectionPerIpLimitUpstreamHandler;
+import org.apache.james.protocols.netty.ChannelGroupHandler;
+import org.apache.james.protocols.netty.ConnectionLimitUpstreamHandler;
+import org.apache.james.protocols.netty.ConnectionPerIpLimitUpstreamHandler;
import org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
Modified: james/server/trunk/lmtpserver/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/pom.xml?rev=1208334&r1=1208333&r2=1208334&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/pom.xml (original)
+++ james/server/trunk/lmtpserver/pom.xml Wed Nov 30 09:04:34 2011
@@ -94,7 +94,7 @@
</dependency>
<dependency>
<groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-impl</artifactId>
+ <artifactId>protocols-netty</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james.protocols</groupId>
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1208334&r1=1208333&r2=1208334&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Wed Nov 30 09:04:34 2011
@@ -287,7 +287,7 @@
</dependency>
<dependency>
<groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-impl</artifactId>
+ <artifactId>protocols-netty</artifactId>
<version>${protocols.version}</version>
</dependency>
<dependency>
Modified: james/server/trunk/pop3server/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/pom.xml?rev=1208334&r1=1208333&r2=1208334&view=diff
==============================================================================
--- james/server/trunk/pop3server/pom.xml (original)
+++ james/server/trunk/pop3server/pom.xml Wed Nov 30 09:04:34 2011
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-impl</artifactId>
+ <artifactId>protocols-netty</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james.protocols</groupId>
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=1208334&r1=1208333&r2=1208334&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
Wed Nov 30 09:04:34 2011
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.pop3server.core;
-import org.apache.james.protocols.impl.log.AbstractCommandHandlerResultLogger;
+import org.apache.james.protocols.netty.log.AbstractCommandHandlerResultLogger;
import org.apache.james.protocols.pop3.POP3Response;
import org.apache.james.protocols.pop3.POP3Session;
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=1208334&r1=1208333&r2=1208334&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
Wed Nov 30 09:04:34 2011
@@ -22,7 +22,7 @@ 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.impl.BasicChannelUpstreamHandler;
+import org.apache.james.protocols.netty.BasicChannelUpstreamHandler;
import org.apache.james.protocols.lib.netty.AbstractProtocolAsyncServer;
import org.apache.james.protocols.pop3.POP3Configuration;
import org.apache.james.protocols.pop3.POP3Protocol;
Modified: james/server/trunk/protocols-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/pom.xml?rev=1208334&r1=1208333&r2=1208334&view=diff
==============================================================================
--- james/server/trunk/protocols-library/pom.xml (original)
+++ james/server/trunk/protocols-library/pom.xml Wed Nov 30 09:04:34 2011
@@ -71,7 +71,7 @@
</dependency>
<dependency>
<groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-impl</artifactId>
+ <artifactId>protocols-netty</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java?rev=1208334&r1=1208333&r2=1208334&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
Wed Nov 30 09:04:34 2011
@@ -44,7 +44,7 @@ import org.apache.james.lifecycle.api.Co
import org.apache.james.lifecycle.api.LogEnabled;
import org.apache.james.protocols.api.Encryption;
-import org.apache.james.protocols.impl.AbstractAsyncServer;
+import org.apache.james.protocols.netty.AbstractAsyncServer;
import org.apache.james.protocols.lib.jmx.ServerMBean;
import org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutor;
import org.jboss.netty.bootstrap.ServerBootstrap;
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractExecutorAwareChannelPipelineFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractExecutorAwareChannelPipelineFactory.java?rev=1208334&r1=1208333&r2=1208334&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractExecutorAwareChannelPipelineFactory.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractExecutorAwareChannelPipelineFactory.java
Wed Nov 30 09:04:34 2011
@@ -18,7 +18,8 @@
****************************************************************/
package org.apache.james.protocols.lib.netty;
-import org.apache.james.protocols.impl.AbstractSSLAwareChannelPipelineFactory;
+import org.apache.james.protocols.netty.AbstractSSLAwareChannelPipelineFactory;
+import org.apache.james.protocols.netty.HandlerConstants;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.group.ChannelGroup;
import org.jboss.netty.handler.execution.ExecutionHandler;
@@ -40,7 +41,7 @@ public abstract class AbstractExecutorAw
@Override
public ChannelPipeline getPipeline() throws Exception {
ChannelPipeline pipeLine = super.getPipeline();
- pipeLine.addBefore("coreHandler", "countHandler",
getConnectionCountHandler());
+ pipeLine.addBefore(HandlerConstants.CORE_HANDLER, "countHandler",
getConnectionCountHandler());
return pipeLine;
}
Modified: james/server/trunk/smtpserver/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/pom.xml?rev=1208334&r1=1208333&r2=1208334&view=diff
==============================================================================
--- james/server/trunk/smtpserver/pom.xml (original)
+++ james/server/trunk/smtpserver/pom.xml Wed Nov 30 09:04:34 2011
@@ -97,7 +97,7 @@
</dependency>
<dependency>
<groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-impl</artifactId>
+ <artifactId>protocols-netty</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james.jspf</groupId>
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPCommandHandlerResultLogger.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPCommandHandlerResultLogger.java?rev=1208334&r1=1208333&r2=1208334&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPCommandHandlerResultLogger.java
(original)
+++
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPCommandHandlerResultLogger.java
Wed Nov 30 09:04:34 2011
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.smtpserver;
-import org.apache.james.protocols.impl.log.AbstractCommandHandlerResultLogger;
+import org.apache.james.protocols.netty.log.AbstractCommandHandlerResultLogger;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPSession;
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java?rev=1208334&r1=1208333&r2=1208334&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
(original)
+++
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
Wed Nov 30 09:04:34 2011
@@ -21,7 +21,7 @@ package org.apache.james.smtpserver.nett
import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.james.protocols.api.Encryption;
import org.apache.james.protocols.api.Protocol;
-import org.apache.james.protocols.impl.BasicChannelUpstreamHandler;
+import org.apache.james.protocols.netty.BasicChannelUpstreamHandler;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.smtpserver.SMTPConstants;
import org.jboss.netty.channel.ChannelHandler.Sharable;
Modified:
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java?rev=1208334&r1=1208333&r2=1208334&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
(original)
+++
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
Wed Nov 30 09:04:34 2011
@@ -41,7 +41,7 @@ import junit.framework.TestCase;
import org.apache.commons.net.smtp.SMTPClient;
import org.apache.commons.net.smtp.SMTPReply;
-import org.apache.james.protocols.impl.AbstractChannelPipelineFactory;
+import org.apache.james.protocols.netty.AbstractChannelPipelineFactory;
import org.apache.james.protocols.lib.PortUtil;
import org.apache.james.protocols.lib.mock.MockProtocolHandlerLoader;
import org.apache.james.queue.api.mock.MockMailQueue;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
