james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject svn commit: r1228124 - in /james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty: SMTPChannelUpstreamHandler.java SMTPServer.java SMTPServerFactory.java
Date Fri, 06 Jan 2012 11:36:58 GMT
Author: eric
Date: Fri Jan  6 11:36:58 2012
New Revision: 1228124

URL: http://svn.apache.org/viewvc?rev=1228124&view=rev
Log:
Import and Class rename / usage to use the new protocols 1.6.0-RC2-SNAPSHOT (JAMES-1360)

Modified:
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerFactory.java

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=1228124&r1=1228123&r2=1228124&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
Fri Jan  6 11:36:58 2012
@@ -37,11 +37,11 @@ public class SMTPChannelUpstreamHandler 
 
 
     public SMTPChannelUpstreamHandler(Protocol protocol, Logger logger, Encryption encryption)
{
-        super(protocol, logger, encryption);
+        super(protocol, encryption);
     }
 
     public SMTPChannelUpstreamHandler(Protocol protocol, Logger logger) {
-        super(protocol, logger);
+        super(protocol);
     }
 
     /**

Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java?rev=1228124&r1=1228123&r2=1228124&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
(original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
Fri Jan  6 11:36:58 2012
@@ -28,7 +28,8 @@ import org.apache.james.dnsservice.api.D
 import org.apache.james.dnsservice.library.netmatcher.NetMatcher;
 import org.apache.james.protocols.api.ProtocolSession;
 import org.apache.james.protocols.api.ProtocolTransport;
-import org.apache.james.protocols.api.handler.HandlersPackage;
+import org.apache.james.protocols.api.logger.ProtocolLoggerAdapter;
+import org.apache.james.protocols.lib.handler.HandlersPackage;
 import org.apache.james.protocols.lib.netty.AbstractProtocolAsyncServer;
 import org.apache.james.protocols.smtp.SMTPConfiguration;
 import org.apache.james.protocols.smtp.SMTPProtocol;
@@ -106,7 +107,7 @@ public class SMTPServer extends Abstract
             }
             authorizedNetworks = new NetMatcher(networks, dns);
         }
-        SMTPProtocol transport = new SMTPProtocol(getProtocolHandlerChain(), theConfigData)
{
+        SMTPProtocol transport = new SMTPProtocol(getProtocolHandlerChain(), theConfigData,
new ProtocolLoggerAdapter(getLogger())) {
 
             @Override
             public ProtocolSession newSession(ProtocolTransport transport) {
@@ -273,6 +274,18 @@ public class SMTPServer extends Abstract
             return SMTPServer.this.verifyIdentity;
         }
 
+        @Override
+        public String getGreeting() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        @Override
+        public String getSoftwareName() {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
     }
 
     /**

Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerFactory.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerFactory.java?rev=1228124&r1=1228123&r2=1228124&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerFactory.java
(original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerFactory.java
Fri Jan  6 11:36:58 2012
@@ -27,14 +27,13 @@ import javax.annotation.Resource;
 import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.james.dnsservice.api.DNSService;
 import org.apache.james.filesystem.api.FileSystem;
-import org.apache.james.protocols.api.handler.ProtocolHandlerLoader;
+import org.apache.james.protocols.lib.handler.ProtocolHandlerLoader;
 import org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer;
 import org.apache.james.protocols.lib.netty.AbstractServerFactory;
 import org.slf4j.Logger;
 
 public class SMTPServerFactory extends AbstractServerFactory{
 
-
     private DNSService dns;
     private ProtocolHandlerLoader loader;
     private FileSystem fileSystem;



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


Mime
View raw message