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/06/30 16:00:49 UTC
svn commit: r959313 - in /james/protocols/trunk: ./
impl/src/main/java/org/apache/james/protocols/impl/
impl/src/main/java/org/apache/james/socket/
impl/src/main/java/org/jboss/netty/handler/connection/
Author: norman
Date: Wed Jun 30 14:00:49 2010
New Revision: 959313
URL: http://svn.apache.org/viewvc?rev=959313&view=rev
Log:
Upgrade to netty 3.2.1.Final which includes replacing deprecated methods (PROTOCOLS-4)
Removed:
james/protocols/trunk/impl/src/main/java/org/apache/james/socket/
Modified:
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractChannelUpstreamHandler.java
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractResponseEncoder.java
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/ChannelGroupHandler.java
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/LineHandlerUpstreamHandler.java
james/protocols/trunk/impl/src/main/java/org/jboss/netty/handler/connection/ConnectionLimitUpstreamHandler.java
james/protocols/trunk/impl/src/main/java/org/jboss/netty/handler/connection/ConnectionPerIpLimitUpstreamHandler.java
james/protocols/trunk/pom.xml
Modified: james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractChannelUpstreamHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractChannelUpstreamHandler.java?rev=959313&r1=959312&r2=959313&view=diff
==============================================================================
--- james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractChannelUpstreamHandler.java (original)
+++ james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractChannelUpstreamHandler.java Wed Jun 30 14:00:49 2010
@@ -29,7 +29,6 @@ import org.apache.james.protocols.api.Pr
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.ChannelUpstreamHandler;
import org.jboss.netty.channel.ExceptionEvent;
@@ -43,7 +42,6 @@ import org.jboss.netty.handler.codec.fra
*
*
*/
-@ChannelPipelineCoverage("all")
public abstract class AbstractChannelUpstreamHandler extends SimpleChannelUpstreamHandler implements ChannelAttributeSupport{
private ProtocolHandlerChain chain;
Modified: james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractResponseEncoder.java?rev=959313&r1=959312&r2=959313&view=diff
==============================================================================
--- james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractResponseEncoder.java (original)
+++ james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractResponseEncoder.java Wed Jun 30 14:00:49 2010
@@ -20,13 +20,13 @@ package org.apache.james.protocols.impl;
import static org.jboss.netty.buffer.ChannelBuffers.*;
+import java.nio.charset.Charset;
import java.util.List;
import org.apache.james.protocols.api.Response;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
/**
@@ -35,13 +35,12 @@ import org.jboss.netty.handler.codec.one
*
* @param <R>
*/
-@ChannelPipelineCoverage("all")
public abstract class AbstractResponseEncoder<R extends Response> extends OneToOneEncoder{
private Class<? extends Response> classType;
- private String charset;
+ private Charset charset;
- public AbstractResponseEncoder(Class< ? extends Response> classType, String charset) {
+ public AbstractResponseEncoder(Class< ? extends Response> classType, Charset charset) {
this.classType = classType;
this.charset = charset;
}
Modified: james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/ChannelGroupHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/ChannelGroupHandler.java?rev=959313&r1=959312&r2=959313&view=diff
==============================================================================
--- james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/ChannelGroupHandler.java (original)
+++ james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/ChannelGroupHandler.java Wed Jun 30 14:00:49 2010
@@ -20,7 +20,6 @@
package org.apache.james.protocols.impl;
import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
import org.jboss.netty.channel.group.ChannelGroup;
@@ -29,7 +28,6 @@ import org.jboss.netty.channel.group.Cha
* Add channels to the channel group after the channel was opened
*
*/
-@ChannelPipelineCoverage("all")
public final class ChannelGroupHandler extends SimpleChannelUpstreamHandler {
private ChannelGroup channels;
public ChannelGroupHandler(ChannelGroup channels) {
Modified: james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/LineHandlerUpstreamHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/LineHandlerUpstreamHandler.java?rev=959313&r1=959312&r2=959313&view=diff
==============================================================================
--- james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/LineHandlerUpstreamHandler.java (original)
+++ james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/LineHandlerUpstreamHandler.java Wed Jun 30 14:00:49 2010
@@ -22,7 +22,6 @@ import org.apache.james.protocols.api.Li
import org.apache.james.protocols.api.ProtocolSession;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.ChannelUpstreamHandler;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
@@ -32,7 +31,6 @@ import org.jboss.netty.channel.SimpleCha
*
* @param <Session>
*/
-@ChannelPipelineCoverage("all")
public class LineHandlerUpstreamHandler<Session extends ProtocolSession> extends SimpleChannelUpstreamHandler implements ChannelAttributeSupport{
private LineHandler<Session> handler;
Modified: james/protocols/trunk/impl/src/main/java/org/jboss/netty/handler/connection/ConnectionLimitUpstreamHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/jboss/netty/handler/connection/ConnectionLimitUpstreamHandler.java?rev=959313&r1=959312&r2=959313&view=diff
==============================================================================
--- james/protocols/trunk/impl/src/main/java/org/jboss/netty/handler/connection/ConnectionLimitUpstreamHandler.java (original)
+++ james/protocols/trunk/impl/src/main/java/org/jboss/netty/handler/connection/ConnectionLimitUpstreamHandler.java Wed Jun 30 14:00:49 2010
@@ -22,7 +22,6 @@ import java.util.concurrent.atomic.Atomi
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.ChannelUpstreamHandler;
import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
@@ -35,7 +34,6 @@ import org.jboss.netty.channel.SimpleCha
* TODO: Remove when its committed to NETTY.
* https://jira.jboss.org/jira/browse/NETTY-311
*/
-@ChannelPipelineCoverage("all")
public class ConnectionLimitUpstreamHandler extends SimpleChannelUpstreamHandler{
private final AtomicInteger connections = new AtomicInteger(0);
Modified: james/protocols/trunk/impl/src/main/java/org/jboss/netty/handler/connection/ConnectionPerIpLimitUpstreamHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/jboss/netty/handler/connection/ConnectionPerIpLimitUpstreamHandler.java?rev=959313&r1=959312&r2=959313&view=diff
==============================================================================
--- james/protocols/trunk/impl/src/main/java/org/jboss/netty/handler/connection/ConnectionPerIpLimitUpstreamHandler.java (original)
+++ james/protocols/trunk/impl/src/main/java/org/jboss/netty/handler/connection/ConnectionPerIpLimitUpstreamHandler.java Wed Jun 30 14:00:49 2010
@@ -24,7 +24,6 @@ import java.util.Map;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.ChannelUpstreamHandler;
import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
@@ -37,7 +36,6 @@ import org.jboss.netty.channel.SimpleCha
* TODO: Remove when its committed to NETTY.
* https://jira.jboss.org/jira/browse/NETTY-311
*/
-@ChannelPipelineCoverage("all")
public class ConnectionPerIpLimitUpstreamHandler extends SimpleChannelUpstreamHandler{
private final Map<String, Integer> connections = new HashMap<String, Integer>();
Modified: james/protocols/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=959313&r1=959312&r2=959313&view=diff
==============================================================================
--- james/protocols/trunk/pom.xml (original)
+++ james/protocols/trunk/pom.xml Wed Jun 30 14:00:49 2010
@@ -70,7 +70,7 @@
<!-- netty -->
<repository>
<id>repository.jboss.org</id>
- <url>http://repository.jboss.org/maven2</url>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
@@ -226,7 +226,7 @@
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.1.5.GA</version>
+ <version>3.2.1.Final</version>
</dependency>
<dependency>
<groupId>junit</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org