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/12/09 21:15:06 UTC
svn commit: r1044115 - in /james/server/trunk: ./
lmtpserver/src/main/java/org/apache/james/lmtpserver/
pop3server/src/main/java/org/apache/james/pop3server/core/
remotemanager/src/main/java/org/apache/james/remotemanager/netty/
smtpserver/src/main/jav...
Author: norman
Date: Thu Dec 9 20:15:05 2010
New Revision: 1044115
URL: http://svn.apache.org/viewvc?rev=1044115&view=rev
Log:
Adjust code to use logging code which was moved to protocols. Also enable logging for POP3Server.
Added:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandHandlerResultLogger.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPCommandHandlerResultLogger.java
- copied, changed from r1044103, james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/SMTPCommandHandlerResultLogger.java
Removed:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/log/CommandHandlerResultLogger.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/log/ConnectHandlerResultLogger.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/log/HookResultLogger.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/log/LineHandlerResultLogger.java
Modified:
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java
james/server/trunk/pom.xml
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/NettyRemoteManagerSession.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java
Modified: james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java?rev=1044115&r1=1044114&r2=1044115&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java (original)
+++ james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java Thu Dec 9 20:15:05 2010
@@ -25,7 +25,10 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.james.protocols.api.HandlersPackage;
+import org.apache.james.protocols.impl.log.ConnectHandlerResultLogger;
+import org.apache.james.protocols.impl.log.LineHandlerResultLogger;
import org.apache.james.protocols.smtp.core.ExpnCmdHandler;
+import org.apache.james.protocols.smtp.core.log.HookResultLogger;
import org.apache.james.protocols.smtp.core.NoopCmdHandler;
import org.apache.james.protocols.smtp.core.PostmasterAbuseRcptHook;
import org.apache.james.protocols.smtp.core.QuitCmdHandler;
@@ -38,11 +41,8 @@ import org.apache.james.smtpserver.AuthR
import org.apache.james.smtpserver.JamesDataCmdHandler;
import org.apache.james.smtpserver.JamesMailCmdHandler;
import org.apache.james.smtpserver.JamesRcptCmdHandler;
+import org.apache.james.smtpserver.SMTPCommandHandlerResultLogger;
import org.apache.james.smtpserver.fastfail.ValidRcptHandler;
-import org.apache.james.smtpserver.log.CommandHandlerResultLogger;
-import org.apache.james.smtpserver.log.ConnectHandlerResultLogger;
-import org.apache.james.smtpserver.log.HookResultLogger;
-import org.apache.james.smtpserver.log.LineHandlerResultLogger;
/**
* This class represent the base command handlers which are shipped with james.
@@ -69,7 +69,7 @@ public class CoreCmdHandlerLoader implem
private final String DATALINEMESSAGEHOOKHANDLER = DataLineLMTPMessageHookHandler.class.getName();
// logging stuff
- private final String COMMANDHANDLERRESULTLOGGER = CommandHandlerResultLogger.class.getName();
+ private final String COMMANDHANDLERRESULTLOGGER = SMTPCommandHandlerResultLogger.class.getName();
private final String CONNECTHANDLERRESULTLOGGER = ConnectHandlerResultLogger.class.getName();
private final String LINEHANDLERRESULTLOGGER = LineHandlerResultLogger.class.getName();
private final String HOOKRESULTLOGGER = HookResultLogger.class.getName();
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1044115&r1=1044114&r2=1044115&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Thu Dec 9 20:15:05 2010
@@ -1232,7 +1232,7 @@
<spring.version>3.0.5.RELEASE</spring.version>
<mailbox.version>0.2-M2-SNAPSHOT</mailbox.version>
<imap.version>0.2-M1</imap.version>
- <protocols.version>1.2</protocols.version>
+ <protocols.version>1.3-SNAPSHOT</protocols.version>
<jsieve.version>0.4</jsieve.version>
<jackrabbit.version>2.1.2</jackrabbit.version>
<commons.logging.version>1.1</commons.logging.version>
Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java?rev=1044115&r1=1044114&r2=1044115&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java Thu Dec 9 20:15:05 2010
@@ -23,6 +23,8 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.james.protocols.api.HandlersPackage;
+import org.apache.james.protocols.impl.log.ConnectHandlerResultLogger;
+import org.apache.james.protocols.impl.log.LineHandlerResultLogger;
public class CoreCmdHandlerLoader implements HandlersPackage{
@@ -42,6 +44,12 @@ public class CoreCmdHandlerLoader implem
private final static String UNKOWNCMDHANDLER = UnknownCmdHandler.class.getName();
private final static String COMMANDDISPATCHER = POP3CommandDispatcherLineHandler.class.getName();
+
+ // logging stuff
+ private final String COMMANDHANDLERRESULTLOGGER = POP3CommandHandlerResultLogger.class.getName();
+ private final String CONNECTHANDLERRESULTLOGGER = ConnectHandlerResultLogger.class.getName();
+ private final String LINEHANDLERRESULTLOGGER = LineHandlerResultLogger.class.getName();
+
private final List<String> commands = new LinkedList<String>();
public CoreCmdHandlerLoader() {
@@ -61,6 +69,12 @@ public class CoreCmdHandlerLoader implem
commands.add(STATCMDHANDLER);
commands.add(QUITCMDHANDLER);
commands.add(UNKOWNCMDHANDLER);
+
+
+ // Add logging stuff
+ commands.add(COMMANDHANDLERRESULTLOGGER);
+ commands.add(CONNECTHANDLERRESULTLOGGER);
+ commands.add(LINEHANDLERRESULTLOGGER);
}
/*
Added: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandHandlerResultLogger.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandHandlerResultLogger.java?rev=1044115&view=auto
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandHandlerResultLogger.java (added)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandHandlerResultLogger.java Thu Dec 9 20:15:05 2010
@@ -0,0 +1,36 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.james.pop3server.core;
+
+import org.apache.james.pop3server.POP3Response;
+import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.impl.log.AbstractCommandHandlerResultLogger;
+
+/**
+ * Log {@link POP3Response} with {@link POP3Response#ERR_RESPONSE} return code to INFO. The rest to DEBUG
+ *
+ */
+public class POP3CommandHandlerResultLogger extends AbstractCommandHandlerResultLogger<POP3Response, POP3Session>{
+
+ @Override
+ protected boolean logWithInfo(String code) {
+ return code.startsWith(POP3Response.ERR_RESPONSE);
+ }
+
+}
Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/NettyRemoteManagerSession.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/NettyRemoteManagerSession.java?rev=1044115&r1=1044114&r2=1044115&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/NettyRemoteManagerSession.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/netty/NettyRemoteManagerSession.java Thu Dec 9 20:15:05 2010
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.net.InetSocketAddress;
import java.util.HashMap;
import java.util.Map;
+import java.util.Random;
import org.apache.commons.logging.Log;
import org.apache.james.protocols.api.LineHandler;
@@ -44,6 +45,8 @@ public class NettyRemoteManagerSession i
private RemoteManagerHandlerConfigurationData config;
private int lineHandlerCount = 0;
private InetSocketAddress socketAddress;
+ private String id;
+ private static Random random = new Random();
public NettyRemoteManagerSession(RemoteManagerHandlerConfigurationData config, Log logger, Channel channel) {
@@ -51,6 +54,8 @@ public class NettyRemoteManagerSession i
this.channel = channel;
this.config = config;
this.socketAddress = (InetSocketAddress) channel.getRemoteAddress();
+ this.id = random.nextInt(1024) + "";
+
}
/*
@@ -146,4 +151,12 @@ public class NettyRemoteManagerSession i
channel.write(new ChunkedStream(stream));
}
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.protocols.api.ProtocolSession#getSessionID()
+ */
+ public String getSessionID() {
+ return id;
+ }
}
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java?rev=1044115&r1=1044114&r2=1044115&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java Thu Dec 9 20:15:05 2010
@@ -24,11 +24,14 @@ package org.apache.james.smtpserver;
import java.util.LinkedList;
import java.util.List;
-import org.apache.james.protocols.api.CommandHandlerResultHandler;
import org.apache.james.protocols.api.HandlersPackage;
+import org.apache.james.protocols.impl.log.ConnectHandlerResultLogger;
+import org.apache.james.protocols.impl.log.LineHandlerResultLogger;
import org.apache.james.protocols.smtp.core.ExpnCmdHandler;
import org.apache.james.protocols.smtp.core.HeloCmdHandler;
import org.apache.james.protocols.smtp.core.HelpCmdHandler;
+import org.apache.james.protocols.smtp.core.log.HookResultLogger;
+
import org.apache.james.protocols.smtp.core.NoopCmdHandler;
import org.apache.james.protocols.smtp.core.PostmasterAbuseRcptHook;
import org.apache.james.protocols.smtp.core.QuitCmdHandler;
@@ -40,10 +43,6 @@ import org.apache.james.protocols.smtp.c
import org.apache.james.protocols.smtp.core.esmtp.EhloCmdHandler;
import org.apache.james.protocols.smtp.core.esmtp.MailSizeEsmtpExtension;
import org.apache.james.protocols.smtp.core.esmtp.StartTlsCmdHandler;
-import org.apache.james.smtpserver.log.CommandHandlerResultLogger;
-import org.apache.james.smtpserver.log.ConnectHandlerResultLogger;
-import org.apache.james.smtpserver.log.HookResultLogger;
-import org.apache.james.smtpserver.log.LineHandlerResultLogger;
/**
* This class represent the base command handlers which are shipped with james.
@@ -78,7 +77,7 @@ public class CoreCmdHandlerLoader implem
private final String SENDMAILHANDLER = SendMailHandler.class.getName();
// logging stuff
- private final String COMMANDHANDLERRESULTLOGGER = CommandHandlerResultLogger.class.getName();
+ private final String COMMANDHANDLERRESULTLOGGER = SMTPCommandHandlerResultLogger.class.getName();
private final String CONNECTHANDLERRESULTLOGGER = ConnectHandlerResultLogger.class.getName();
private final String LINEHANDLERRESULTLOGGER = LineHandlerResultLogger.class.getName();
private final String HOOKRESULTLOGGER = HookResultLogger.class.getName();
Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPCommandHandlerResultLogger.java (from r1044103, james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/SMTPCommandHandlerResultLogger.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPCommandHandlerResultLogger.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPCommandHandlerResultLogger.java&p1=james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/SMTPCommandHandlerResultLogger.java&r1=1044103&r2=1044115&rev=1044115&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/log/SMTPCommandHandlerResultLogger.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SMTPCommandHandlerResultLogger.java Thu Dec 9 20:15:05 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.protocols.smtp.core.log;
+package org.apache.james.smtpserver;
import org.apache.james.protocols.impl.log.AbstractCommandHandlerResultLogger;
import org.apache.james.protocols.smtp.SMTPResponse;
Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java?rev=1044115&r1=1044114&r2=1044115&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java Thu Dec 9 20:15:05 2010
@@ -21,7 +21,6 @@ package org.apache.james.smtpserver.nett
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import java.util.Random;
import javax.net.ssl.SSLEngine;
@@ -41,36 +40,24 @@ import org.jboss.netty.channel.ChannelHa
public class SMTPNettySession extends AbstractSession implements SMTPSession{
public final static String SMTP_SESSION = "SMTP_SESSION";
- private static Random random = new Random();
private boolean relayingAllowed;
- private String smtpID;
private Map<String, Object> connectionState;
private SMTPConfiguration theConfigData;
private int lineHandlerCount = 0;
- private Log log = null;
public SMTPNettySession(SMTPConfiguration theConfigData, Log logger, ChannelHandlerContext handlerContext, SSLEngine engine) {
super(logger, handlerContext, engine);
this.theConfigData = theConfigData;
connectionState = new HashMap<String, Object>();
- smtpID = random.nextInt(1024) + "";
relayingAllowed = theConfigData.isRelayingAllowed(getRemoteIPAddress());
}
- @Override
- public Log getLogger() {
- if (log == null) {
- log = new SMTPSessionLog(super.getLogger());
- }
- return log;
- }
-
public SMTPNettySession(SMTPConfiguration theConfigData, Log logger, ChannelHandlerContext handlerContext) {
this(theConfigData, logger, handlerContext, null);
}
@@ -82,12 +69,6 @@ public class SMTPNettySession extends Ab
return connectionState;
}
- /**
- * @see org.apache.james.protocols.smtp.SMTPSession#getSessionID()
- */
- public String getSessionID() {
- return smtpID;
- }
/**
* @see org.apache.james.protocols.smtp.SMTPSession#getState()
@@ -241,104 +222,4 @@ public class SMTPNettySession extends Ab
return true;
}
}
-
-
- /**
- * A {@link Log} implementation which suffix every log message with the session Id
- *
- *
- */
- private final class SMTPSessionLog implements Log {
- private Log logger;
-
- public SMTPSessionLog(Log logger) {
- this.logger = logger;
- }
-
- private String getText(Object obj) {
- return getSessionID()+ " " + obj.toString();
- }
- public void debug(Object arg0) {
- logger.debug(getText(arg0));
- }
-
- public void debug(Object arg0, Throwable arg1) {
- logger.debug(getText(arg0), arg1);
-
- }
-
- public void error(Object arg0) {
- logger.error(getText(arg0));
-
- }
-
- public void error(Object arg0, Throwable arg1) {
- logger.error(getText(arg0), arg1);
-
- }
-
- public void fatal(Object arg0) {
- logger.fatal(getText(arg0));
-
- }
-
- public void fatal(Object arg0, Throwable arg1) {
- logger.fatal(getText(arg0), arg1);
-
- }
-
- public void info(Object arg0) {
- logger.info(getText(arg0));
-
- }
-
- public void info(Object arg0, Throwable arg1) {
- logger.info(getText(arg0), arg1);
-
- }
-
- public boolean isDebugEnabled() {
- return logger.isDebugEnabled();
- }
-
- public boolean isErrorEnabled() {
- return logger.isErrorEnabled();
- }
-
- public boolean isFatalEnabled() {
- return logger.isFatalEnabled();
- }
-
- public boolean isInfoEnabled() {
- return logger.isInfoEnabled();
- }
-
- public boolean isTraceEnabled() {
- return logger.isTraceEnabled();
- }
-
- public boolean isWarnEnabled() {
- return logger.isWarnEnabled();
- }
-
- public void trace(Object arg0) {
- logger.trace(getText(arg0));
- }
-
- public void trace(Object arg0, Throwable arg1) {
- logger.trace(getText(arg0), arg1);
-
- }
-
- public void warn(Object arg0) {
- logger.warn(getText(arg0));
-
- }
-
- public void warn(Object arg0, Throwable arg1) {
- logger.warn(getText(arg0), arg1);
-
- }
-
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org