james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r756676 - in /james/protocols/imap/trunk: decode/src/main/java/org/apache/james/imap/decode/ decode/src/main/java/org/apache/james/imap/decode/parser/ message/src/main/java/org/apache/james/imap/encode/base/ message/src/test/java/org/apache...
Date Fri, 20 Mar 2009 17:38:06 GMT
Author: rdonkin
Date: Fri Mar 20 17:38:06 2009
New Revision: 756676

URL: http://svn.apache.org/viewvc?rev=756676&view=rev
Log:
AbstractLogEnabled not used. IMAP-75 https://issues.apache.org/jira/browse/IMAP-75

Modified:
    james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
    james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java
    james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
    james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java
    james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ChannelImapResponseWriter.java
    james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ImapRequestHandler.java

Modified: james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java?rev=756676&r1=756675&r2=756676&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
(original)
+++ james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/ImapRequestLineReader.java
Fri Mar 20 17:38:06 2009
@@ -23,8 +23,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.apache.james.imap.api.AbstractLogEnabled;
-
 /**
  * Wraps the client input reader with a bunch of convenience methods, allowing
  * lookahead=1 on the underlying character stream. TODO need to look at
@@ -32,7 +30,7 @@
  * 
  * @version $Revision: 109034 $
  */
-public class ImapRequestLineReader extends AbstractLogEnabled {
+public class ImapRequestLineReader {
     private InputStream input;
 
     private OutputStream output;

Modified: james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java?rev=756676&r1=756675&r2=756676&view=diff
==============================================================================
--- james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java
(original)
+++ james/protocols/imap/trunk/decode/src/main/java/org/apache/james/imap/decode/parser/Imap4Rev1CommandParserFactory.java
Fri Mar 20 17:38:06 2009
@@ -22,8 +22,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.james.imap.api.AbstractLogEnabled;
 import org.apache.james.imap.api.Imap4Rev1CommandFactory;
 import org.apache.james.imap.api.Imap4Rev1MessageFactory;
 import org.apache.james.imap.api.ImapConstants;
@@ -40,7 +38,7 @@
  * 
  * @version $Revision: 109034 $
  */
-public class Imap4Rev1CommandParserFactory extends AbstractLogEnabled implements
+public class Imap4Rev1CommandParserFactory implements
         ImapCommandParserFactory {
     private Map<String, Class> _imapCommands;
 
@@ -145,16 +143,12 @@
     }
 
     private ImapCommandParser createCommand(Class commandClass) {
-        final Log logger = getLog();
         try {
             ImapCommandParser cmd = (ImapCommandParser) commandClass
                     .newInstance();
-            initialiseParser(commandClass, logger, cmd);
+            initialiseParser(commandClass, cmd);
             return cmd;
         } catch (Exception e) {
-            if (logger.isWarnEnabled()) {
-                logger.warn("Create command instance failed: ", e);
-            }
             // TODO: would probably be better to manage this in protocol
             // TODO: this runtime will produce a nasty disconnect for the client
             throw new RuntimeException("Could not create command instance: "
@@ -162,13 +156,8 @@
         }
     }
 
-    protected void initialiseParser(Class commandClass, final Log logger,
-            ImapCommandParser cmd) {
-        setupLogger(cmd);
-        if (logger.isDebugEnabled()) {
-            logger.debug("Created command " + commandClass);
-        }
-
+    protected void initialiseParser(Class commandClass, ImapCommandParser cmd) {
+        
         if (cmd instanceof DelegatingImapCommandParser) {
             ((DelegatingImapCommandParser) cmd).setParserFactory(this);
         }

Modified: james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java?rev=756676&r1=756675&r2=756676&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
(original)
+++ james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/ImapResponseComposerImpl.java
Fri Mar 20 17:38:06 2009
@@ -26,7 +26,6 @@
 
 import javax.mail.Flags;
 
-import org.apache.james.imap.api.AbstractLogEnabled;
 import org.apache.james.imap.api.ImapCommand;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.encode.ImapResponseComposer;
@@ -37,8 +36,7 @@
  * Class providing methods to send response messages from the server to the
  * client.
  */
-public class ImapResponseComposerImpl extends AbstractLogEnabled implements
-        ImapConstants, ImapResponseComposer {
+public class ImapResponseComposerImpl implements ImapConstants, ImapResponseComposer {
 
     public static final String ENVELOPE = "ENVELOPE";
 

Modified: james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java?rev=756676&r1=756675&r2=756676&view=diff
==============================================================================
--- james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java
(original)
+++ james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/base/ByteImapResponseWriter.java
Fri Mar 20 17:38:06 2009
@@ -25,7 +25,6 @@
 import java.nio.channels.Channels;
 import java.nio.channels.WritableByteChannel;
 
-import org.apache.james.imap.api.AbstractLogEnabled;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.encode.ImapResponseWriter;
 import org.apache.james.imap.message.response.Literal;
@@ -34,8 +33,7 @@
  * Class providing methods to send response messages from the server to the
  * client.
  */
-public class ByteImapResponseWriter extends AbstractLogEnabled implements
-        ImapConstants, ImapResponseWriter {
+public class ByteImapResponseWriter implements ImapConstants, ImapResponseWriter {
 
     private static final int LOWER_CASE_OFFSET = 'a' - 'A';
 

Modified: james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ChannelImapResponseWriter.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ChannelImapResponseWriter.java?rev=756676&r1=756675&r2=756676&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ChannelImapResponseWriter.java
(original)
+++ james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ChannelImapResponseWriter.java
Fri Mar 20 17:38:06 2009
@@ -24,7 +24,6 @@
 import java.nio.channels.WritableByteChannel;
 import java.nio.charset.Charset;
 
-import org.apache.james.imap.api.AbstractLogEnabled;
 import org.apache.james.imap.api.ImapConstants;
 import org.apache.james.imap.encode.ImapResponseWriter;
 import org.apache.james.imap.message.response.Literal;
@@ -33,8 +32,7 @@
  * Class providing methods to send response messages from the server to the
  * client.
  */
-public class ChannelImapResponseWriter extends AbstractLogEnabled implements
-        ImapConstants, ImapResponseWriter {
+public class ChannelImapResponseWriter implements ImapConstants, ImapResponseWriter {
 
     private static final int LOWER_CASE_OFFSET = 'a' - 'A';
 

Modified: james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ImapRequestHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ImapRequestHandler.java?rev=756676&r1=756675&r2=756676&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ImapRequestHandler.java
(original)
+++ james/protocols/imap/trunk/seda/src/main/java/org/apache/james/imap/main/ImapRequestHandler.java
Fri Mar 20 17:38:06 2009
@@ -106,7 +106,6 @@
 
             ImapResponseComposerImpl response = new ImapResponseComposerImpl(
                     new OutputStreamImapResponseWriter(output));
-            response.setLog(logger);
 
             if (doProcessRequest(request, response, session)) {
 



---------------------------------------------------------------------
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