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 rd...@apache.org on 2009/09/17 12:47:24 UTC
svn commit: r816134 - in
/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server:
POP3Handler.java POP3Session.java PassCmdHandler.java QuitCmdHandler.java
RsetCmdHandler.java
Author: rdonkin
Date: Thu Sep 17 10:47:24 2009
New Revision: 816134
URL: http://svn.apache.org/viewvc?rev=816134&view=rev
Log:
JAMES-922 Switch handlers to use context sensitive logging https://issues.apache.org/jira/browse/JAMES-922
Modified:
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/PassCmdHandler.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/QuitCmdHandler.java
james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RsetCmdHandler.java
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java?rev=816134&r1=816133&r2=816134&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Handler.java Thu Sep 17 10:47:24 2009
@@ -22,6 +22,7 @@
package org.apache.james.pop3server;
import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.commons.logging.Log;
import org.apache.james.Constants;
import org.apache.james.core.MailImpl;
import org.apache.james.services.MailRepository;
@@ -495,4 +496,8 @@
public OutputStream getOutputStream() {
return context.getOutputStream();
}
+
+ public Log getLogger() {
+ return context.getLogger();
+ }
}
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.java?rev=816134&r1=816133&r2=816134&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.java (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/POP3Session.java Thu Sep 17 10:47:24 2009
@@ -22,6 +22,7 @@
package org.apache.james.pop3server;
+import org.apache.commons.logging.Log;
import org.apache.james.services.MailRepository;
import org.apache.james.socket.Watchdog;
import org.apache.mailet.Mail;
@@ -206,5 +207,10 @@
*/
OutputStream getOutputStream();
+ /**
+ * Gets the context sensitive logger for this session.
+ * @return context sensitive log, not null
+ */
+ Log getLogger();
}
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/PassCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/PassCmdHandler.java?rev=816134&r1=816133&r2=816134&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/PassCmdHandler.java (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/PassCmdHandler.java Thu Sep 17 10:47:24 2009
@@ -21,14 +21,13 @@
package org.apache.james.pop3server;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.james.services.MailRepository;
import org.apache.james.util.POP3BeforeSMTPHelper;
/**
* Handles PASS command
*/
-public class PassCmdHandler extends AbstractLogEnabled implements CommandHandler {
+public class PassCmdHandler implements CommandHandler {
/**
* @see org.apache.james.pop3server.CommandHandler#onCommand(POP3Session)
@@ -54,7 +53,7 @@
throw new IllegalStateException("MailServer returned a null inbox for "+session.getUser());
}
session.setUserInbox(inbox);
- RsetCmdHandler.stat(session, getLogger());
+ RsetCmdHandler.stat(session);
// Store the ipAddress to use it later for pop before smtp
POP3BeforeSMTPHelper.addIPAddress(session.getRemoteIPAddress());
@@ -68,7 +67,7 @@
session.setHandlerState(POP3Handler.TRANSACTION);
session.writeResponse(responseString);
} catch (RuntimeException e) {
- getLogger().error("Unexpected error accessing mailbox for "+session.getUser(),e);
+ session.getLogger().error("Unexpected error accessing mailbox for "+session.getUser(),e);
responseString = POP3Handler.ERR_RESPONSE + " Unexpected error accessing mailbox";
session.setHandlerState(POP3Handler.AUTHENTICATION_READY);
session.writeResponse(responseString);
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/QuitCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/QuitCmdHandler.java?rev=816134&r1=816133&r2=816134&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/QuitCmdHandler.java (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/QuitCmdHandler.java Thu Sep 17 10:47:24 2009
@@ -21,16 +21,15 @@
package org.apache.james.pop3server;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import java.util.List;
+
import org.apache.commons.collections.ListUtils;
import org.apache.mailet.Mail;
-import java.util.List;
-
/**
* Handles QUIT command
*/
-public class QuitCmdHandler extends AbstractLogEnabled implements CommandHandler {
+public class QuitCmdHandler implements CommandHandler {
/**
* @see org.apache.james.pop3server.CommandHandler#onCommand(POP3Session)
@@ -66,7 +65,7 @@
} catch (Exception ex) {
responseString = POP3Handler.ERR_RESPONSE + " Some deleted messages were not removed";
session.writeResponse(responseString);
- getLogger().error("Some deleted messages were not removed: " + ex.getMessage());
+ session.getLogger().error("Some deleted messages were not removed: " + ex.getMessage());
}
session.endSession();
}
Modified: james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RsetCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RsetCmdHandler.java?rev=816134&r1=816133&r2=816134&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RsetCmdHandler.java (original)
+++ james/server/trunk/pop3server-function/src/main/java/org/apache/james/pop3server/RsetCmdHandler.java Thu Sep 17 10:47:24 2009
@@ -21,21 +21,19 @@
package org.apache.james.pop3server;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.mailet.Mail;
-
-import javax.mail.MessagingException;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import javax.mail.MessagingException;
+
+import org.apache.mailet.Mail;
+
/**
* Handles RSET command
*/
-public class RsetCmdHandler extends AbstractLogEnabled implements CommandHandler {
+public class RsetCmdHandler implements CommandHandler {
/**
* @see org.apache.james.pop3server.CommandHandler#onCommand(POP3Session)
@@ -53,7 +51,7 @@
private void doRSET(POP3Session session,String argument) {
String responseString = null;
if (session.getHandlerState() == POP3Handler.TRANSACTION) {
- stat(session, getLogger());
+ stat(session);
responseString = POP3Handler.OK_RESPONSE;
} else {
responseString = POP3Handler.ERR_RESPONSE;
@@ -72,7 +70,7 @@
*
*/
@SuppressWarnings("unchecked")
- public static void stat(POP3Session session, Logger logger) {
+ public static void stat(POP3Session session) {
ArrayList<Mail> userMailbox = new ArrayList<Mail>();
userMailbox.add(POP3Handler.DELETED);
try {
@@ -88,7 +86,7 @@
}
} catch(MessagingException e) {
// In the event of an exception being thrown there may or may not be anything in userMailbox
- logger.error("Unable to STAT mail box ", e);
+ session.getLogger().error("Unable to STAT mail box ", e);
}
finally {
session.setUserMailbox(userMailbox);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org