Author: norman
Date: Sun Apr 18 17:28:14 2010
New Revision: 935368
URL: http://svn.apache.org/viewvc?rev=935368&view=rev
Log:
Reflect latest changes in imap trunk
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/mina/AsyncImapServer.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/mina/ImapIoHandler.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NioImapServer.java
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/mina/AsyncImapServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/mina/AsyncImapServer.java?rev=935368&r1=935367&r2=935368&view=diff
==============================================================================
---
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/mina/AsyncImapServer.java
(original)
+++
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/mina/AsyncImapServer.java
Sun Apr 18 17:28:14 2010
@@ -27,7 +27,7 @@ import org.apache.james.imap.api.ImapCon
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.decode.ImapDecoder;
import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.main.ImapRequestHandler;
+import org.apache.james.imap.main.ImapRequestStreamHandler;
import org.apache.james.socket.mina.AbstractAsyncServer;
import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
import org.apache.mina.core.service.IoHandler;
@@ -87,7 +87,7 @@ public class AsyncImapServer extends Abs
@Override
protected IoHandler createIoHandler() {
- final ImapRequestHandler handler = new ImapRequestHandler(decoder,
processor, encoder);
+ final ImapRequestStreamHandler handler = new
ImapRequestStreamHandler(decoder, processor, encoder);
return new ImapIoHandler(hello, handler, getLogger());
}
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/mina/ImapIoHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/mina/ImapIoHandler.java?rev=935368&r1=935367&r2=935368&view=diff
==============================================================================
---
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/mina/ImapIoHandler.java
(original)
+++
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/mina/ImapIoHandler.java
Sun Apr 18 17:28:14 2010
@@ -26,7 +26,7 @@ import java.util.concurrent.Executors;
import org.apache.commons.logging.Log;
import org.apache.james.imap.api.ImapConstants;
-import org.apache.james.imap.main.ImapRequestHandler;
+import org.apache.james.imap.main.ImapRequestStreamHandler;
import org.apache.james.imap.main.ImapSessionImpl;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.session.IoSession;
@@ -42,12 +42,12 @@ public class ImapIoHandler extends Strea
private final String hello;
- private final ImapRequestHandler handler;
+ private final ImapRequestStreamHandler handler;
private final static String IMAP_SESSION = "IMAP_SESSION";
private ExecutorService executor = Executors.newCachedThreadPool();
- public ImapIoHandler(String hello, ImapRequestHandler handler, Log logger)
{
+ public ImapIoHandler(String hello, ImapRequestStreamHandler handler, Log
logger) {
this.logger = logger;
this.hello = hello;
this.handler = handler;
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java?rev=935368&r1=935367&r2=935368&view=diff
==============================================================================
---
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
(original)
+++
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java
Sun Apr 18 17:28:14 2010
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.commons.logging.Log;
import org.apache.james.imap.api.ImapConstants;
-import org.apache.james.imap.main.ImapRequestHandler;
+import org.apache.james.imap.main.ImapRequestStreamHandler;
import org.apache.james.imap.main.ImapSessionImpl;
import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.Channel;
@@ -45,11 +45,11 @@ public class ImapChannelUpstreamHandler
private final String hello;
- private final ImapRequestHandler handler;
+ private final ImapRequestStreamHandler handler;
private final static String IMAP_SESSION = "IMAP_SESSION";
- public ImapChannelUpstreamHandler(final String hello, final
ImapRequestHandler handler, final Log logger, final long readTimeout) {
+ public ImapChannelUpstreamHandler(final String hello, final
ImapRequestStreamHandler handler, final Log logger, final long readTimeout) {
super(new HashedWheelTimer(), readTimeout, TimeUnit.SECONDS);
this.logger = logger;
this.hello = hello;
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NioImapServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NioImapServer.java?rev=935368&r1=935367&r2=935368&view=diff
==============================================================================
---
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NioImapServer.java
(original)
+++
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NioImapServer.java
Sun Apr 18 17:28:14 2010
@@ -28,7 +28,7 @@ import org.apache.james.imap.api.ImapCon
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.decode.ImapDecoder;
import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.main.ImapRequestHandler;
+import org.apache.james.imap.main.ImapRequestStreamHandler;
import org.apache.james.socket.netty.AbstractAsyncServer;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
@@ -96,9 +96,9 @@ public class NioImapServer extends Abstr
if (isSSLSocket()) {
pipeline.addFirst("sslHandler", new
SslHandler(getSSLContext().createSSLEngine()));
}
- final ImapRequestHandler handler = new
ImapRequestHandler(decoder, processor, encoder);
+ final ImapRequestStreamHandler handler = new
ImapRequestStreamHandler(decoder, processor, encoder);
- pipeline.addLast("coreHandler", new
ImapChannelUpstreamHandler(hello, handler, getLogger(),
NioImapServer.this.getTimeout()));
+ pipeline.addLast("coreHandler", new
ImapStreamChannelUpstreamHandler(hello, handler, getLogger(),
NioImapServer.this.getTimeout()));
return pipeline;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
