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 no...@apache.org on 2010/05/02 18:54:01 UTC
svn commit: r940259 - in /james/server/trunk:
imapserver/src/main/java/org/apache/james/imapserver/netty/
netty-socket/src/main/java/org/apache/james/socket/netty/
netty-socket/src/main/java/org/jboss/
netty-socket/src/main/java/org/jboss/netty/ netty-...
Author: norman
Date: Sun May 2 16:54:00 2010
New Revision: 940259
URL: http://svn.apache.org/viewvc?rev=940259&view=rev
Log:
Move connection limit handlers around
Added:
james/server/trunk/netty-socket/src/main/java/org/jboss/
james/server/trunk/netty-socket/src/main/java/org/jboss/netty/
james/server/trunk/netty-socket/src/main/java/org/jboss/netty/handler/
james/server/trunk/netty-socket/src/main/java/org/jboss/netty/handler/connection/
james/server/trunk/netty-socket/src/main/java/org/jboss/netty/handler/connection/ConnectionLimitUpstreamHandler.java
- copied, changed from r939790, james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ConnectionLimitUpstreamHandler.java
james/server/trunk/netty-socket/src/main/java/org/jboss/netty/handler/connection/ConnectionPerIpLimitUpstreamHandler.java
- copied, changed from r939748, james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ConnectionPerIpLimitUpstreamHandler.java
Removed:
james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ConnectionLimitUpstreamHandler.java
james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ConnectionPerIpLimitUpstreamHandler.java
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/NioImapServer.java
james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractChannelPipelineFactory.java
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=940259&r1=940258&r2=940259&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 May 2 16:54:00 2010
@@ -30,10 +30,10 @@ import org.apache.james.imap.decode.Imap
import org.apache.james.imap.encode.ImapEncoder;
import org.apache.james.imap.main.ImapRequestStreamHandler;
import org.apache.james.socket.netty.AbstractAsyncServer;
-import org.apache.james.socket.netty.ConnectionLimitUpstreamHandler;
-import org.apache.james.socket.netty.ConnectionPerIpLimitUpstreamHandler;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.handler.connection.ConnectionLimitUpstreamHandler;
+import org.jboss.netty.handler.connection.ConnectionPerIpLimitUpstreamHandler;
import org.jboss.netty.handler.ssl.SslHandler;
/**
Modified: james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractChannelPipelineFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractChannelPipelineFactory.java?rev=940259&r1=940258&r2=940259&view=diff
==============================================================================
--- james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractChannelPipelineFactory.java (original)
+++ james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractChannelPipelineFactory.java Sun May 2 16:54:00 2010
@@ -28,6 +28,8 @@ import org.jboss.netty.channel.ChannelUp
import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
import org.jboss.netty.handler.codec.frame.Delimiters;
import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
+import org.jboss.netty.handler.connection.ConnectionLimitUpstreamHandler;
+import org.jboss.netty.handler.connection.ConnectionPerIpLimitUpstreamHandler;
import org.jboss.netty.handler.stream.ChunkedWriteHandler;
import org.jboss.netty.util.HashedWheelTimer;
import org.jboss.netty.util.Timer;
Copied: james/server/trunk/netty-socket/src/main/java/org/jboss/netty/handler/connection/ConnectionLimitUpstreamHandler.java (from r939790, james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ConnectionLimitUpstreamHandler.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/netty-socket/src/main/java/org/jboss/netty/handler/connection/ConnectionLimitUpstreamHandler.java?p2=james/server/trunk/netty-socket/src/main/java/org/jboss/netty/handler/connection/ConnectionLimitUpstreamHandler.java&p1=james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ConnectionLimitUpstreamHandler.java&r1=939790&r2=940259&rev=940259&view=diff
==============================================================================
--- james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ConnectionLimitUpstreamHandler.java (original)
+++ james/server/trunk/netty-socket/src/main/java/org/jboss/netty/handler/connection/ConnectionLimitUpstreamHandler.java Sun May 2 16:54:00 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.socket.netty;
+package org.jboss.netty.handler.connection;
import java.util.concurrent.atomic.AtomicInteger;
@@ -32,6 +32,8 @@ import org.jboss.netty.channel.SimpleCha
*
* This handler must be used as singleton when adding it to the {@link ChannelPipeline} to work correctly
*
+ * TODO: Remove when its committed to NETTY.
+ * https://jira.jboss.org/jira/browse/NETTY-311
*/
@ChannelPipelineCoverage("all")
public class ConnectionLimitUpstreamHandler extends SimpleChannelUpstreamHandler{
Copied: james/server/trunk/netty-socket/src/main/java/org/jboss/netty/handler/connection/ConnectionPerIpLimitUpstreamHandler.java (from r939748, james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ConnectionPerIpLimitUpstreamHandler.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/netty-socket/src/main/java/org/jboss/netty/handler/connection/ConnectionPerIpLimitUpstreamHandler.java?p2=james/server/trunk/netty-socket/src/main/java/org/jboss/netty/handler/connection/ConnectionPerIpLimitUpstreamHandler.java&p1=james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ConnectionPerIpLimitUpstreamHandler.java&r1=939748&r2=940259&rev=940259&view=diff
==============================================================================
--- james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/ConnectionPerIpLimitUpstreamHandler.java (original)
+++ james/server/trunk/netty-socket/src/main/java/org/jboss/netty/handler/connection/ConnectionPerIpLimitUpstreamHandler.java Sun May 2 16:54:00 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.socket.netty;
+package org.jboss.netty.handler.connection;
import java.net.InetSocketAddress;
import java.util.HashMap;
@@ -34,6 +34,8 @@ import org.jboss.netty.channel.SimpleCha
*
* This handler must be used as singleton when adding it to the {@link ChannelPipeline} to work correctly
*
+ * TODO: Remove when its committed to NETTY.
+ * https://jira.jboss.org/jira/browse/NETTY-311
*/
@ChannelPipelineCoverage("all")
public class ConnectionPerIpLimitUpstreamHandler extends SimpleChannelUpstreamHandler{
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org