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:02:50 UTC

svn commit: r959316 - in /james/server/trunk: ./ pop3server/src/main/java/org/apache/james/pop3server/netty/ remotemanager/src/main/java/org/apache/james/remotemanager/netty/ smtpserver/src/main/java/org/apache/james/smtpserver/netty/

Author: norman
Date: Wed Jun 30 14:02:50 2010
New Revision: 959316

URL: http://svn.apache.org/viewvc?rev=959316&view=rev
Log:
Upgrade to netty 3.2.1.Final which includes replacing deprecated methods and fixes for use latest protocols library (JAMES-1022)

Modified:
    james/server/trunk/pom.xml
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ResponseEncoder.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManagerResponseEncoder.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPResponseEncoder.java

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=959316&r1=959315&r2=959316&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Wed Jun 30 14:02:50 2010
@@ -83,7 +83,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>
@@ -1070,7 +1070,7 @@
     <dependency>
       <groupId>org.jboss.netty</groupId>
       <artifactId>netty</artifactId>
-      <version>3.1.5.GA</version>
+      <version>3.2.1.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ResponseEncoder.java?rev=959316&r1=959315&r2=959316&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ResponseEncoder.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ResponseEncoder.java Wed Jun 30 14:02:50 2010
@@ -18,6 +18,7 @@
  ****************************************************************/
 package org.apache.james.pop3server.netty;
 
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,7 +32,7 @@ import org.apache.james.protocols.impl.A
 public class POP3ResponseEncoder extends AbstractResponseEncoder<POP3Response>{
 
     public POP3ResponseEncoder() {
-        super(POP3Response.class, "US-ASCII");
+        super(POP3Response.class, Charset.forName("US-ASCII"));
     }
 
     @Override

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManagerResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManagerResponseEncoder.java?rev=959316&r1=959315&r2=959316&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManagerResponseEncoder.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/RemoteManagerResponseEncoder.java Wed Jun 30 14:02:50 2010
@@ -19,6 +19,7 @@
 
 package org.apache.james.remotemanager.netty;
 
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,7 +33,7 @@ import org.apache.james.remotemanager.Re
 public class RemoteManagerResponseEncoder extends AbstractResponseEncoder<RemoteManagerResponse>{
 
     public RemoteManagerResponseEncoder() {
-        super(RemoteManagerResponse.class, "UTF-8");
+        super(RemoteManagerResponse.class, Charset.forName("UTF-8"));
     }
 
     @Override

Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPResponseEncoder.java?rev=959316&r1=959315&r2=959316&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPResponseEncoder.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPResponseEncoder.java Wed Jun 30 14:02:50 2010
@@ -18,6 +18,7 @@
  ****************************************************************/
 package org.apache.james.smtpserver.netty;
 
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,7 +32,7 @@ import org.apache.james.protocols.smtp.S
 public class SMTPResponseEncoder extends AbstractResponseEncoder<SMTPResponse>{
 
     public SMTPResponseEncoder() {
-        super(SMTPResponse.class, "US-ASCII");
+        super(SMTPResponse.class, Charset.forName("US-ASCII"));
     }
 
     @Override



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org