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 2008/09/07 15:43:40 UTC
svn commit: r692849 - in /james/protocols/imap/trunk:
api/src/main/java/org/apache/james/api/imap/
codec/src/main/java/org/apache/james/imap/command/imap4rev1/
codec/src/main/java/org/apache/james/imap/message/request/base/
codec/src/main/java/org/apac...
Author: rdonkin
Date: Sun Sep 7 06:43:39 2008
New Revision: 692849
URL: http://svn.apache.org/viewvc?rev=692849&view=rev
Log:
Removed dependency on avalon. Provisionally added a similar AbstractLogEnabled using JCL. Not sure that this will be a permenant solution.
Added:
james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/AbstractLogEnabled.java
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/SimpleMailboxManagerProvider.java
Removed:
james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/impl/DefaultMailboxManagerProvider.java
james/protocols/imap/trunk/stage/org.apache.avalon/
james/protocols/imap/trunk/stage/org.apache.avalon.framework/
james/protocols/imap/trunk/stage/org.apache.avalon.logkit/
Modified:
james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imap/command/imap4rev1/ImapCommandImpl.java
james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imap/message/request/base/AbstractImapRequest.java
james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imap/message/response/base/AbstractImapResponse.java
james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/ImapRequestLineReader.java
james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/base/AbstractImapCommandParser.java
james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/imap4rev1/Imap4Rev1CommandParserFactory.java
james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/imap4rev1/SearchCommandParser.java
james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/main/DefaultImapDecoder.java
james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/base/AbstractChainedImapEncoder.java
james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/base/EndImapEncoder.java
james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/base/ImapResponseComposerImpl.java
james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/FetchResponseEncoder.java
james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/decode/imap4rev1/MockLogger.java
james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/decode/imap4rev1/SearchCommandParserCharsetTest.java
james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/decode/imap4rev1/SearchCommandParserQuotedCharsetTest.java
james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/encode/base/ByteImapResponseWriter.java
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/experimental/imapserver/ExperimentalHostSystem.java
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/experimental/imapserver/MockLogger.java
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractChainedImapProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractImapRequestProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/UnknownRequestImapProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AppendProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AuthenticateProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LSubProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LoginProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SearchProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/StatusProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SubscribeProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/EnvelopeBuilder.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/FetchProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/FetchResponseBuilder.java
james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/ImapRequestHandler.java
james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/ImapSessionImpl.java
james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/encode/writer/ChannelImapResponseWriter.java
james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
Added: james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/AbstractLogEnabled.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/AbstractLogEnabled.java?rev=692849&view=auto
==============================================================================
--- james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/AbstractLogEnabled.java (added)
+++ james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/AbstractLogEnabled.java Sun Sep 7 06:43:39 2008
@@ -0,0 +1,49 @@
+/****************************************************************
+ * 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.api.imap;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Note this is a temporary measure aimed at being a drop in
+ * replacement for the avalon coupling. Usage should be reviewed.
+ */
+public abstract class AbstractLogEnabled {
+
+ private static final Log IMAP_LOG = LogFactory.getLog("org.apache.james.imap");
+
+ private Log log = IMAP_LOG;
+
+ public Log getLog() {
+ return log;
+ }
+
+ public void setLog(Log log) {
+ this.log = log;
+ }
+
+ public void setupLogger(Object object) {
+ if (object instanceof AbstractLogEnabled) {
+ AbstractLogEnabled logEnabled = (AbstractLogEnabled) object;
+ logEnabled.setLog(log);
+ }
+ }
+}
Modified: james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imap/command/imap4rev1/ImapCommandImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imap/command/imap4rev1/ImapCommandImpl.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imap/command/imap4rev1/ImapCommandImpl.java (original)
+++ james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imap/command/imap4rev1/ImapCommandImpl.java Sun Sep 7 06:43:39 2008
@@ -19,7 +19,7 @@
package org.apache.james.imap.command.imap4rev1;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.api.imap.ImapCommand;
import org.apache.james.api.imap.ImapSessionState;
Modified: james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imap/message/request/base/AbstractImapRequest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imap/message/request/base/AbstractImapRequest.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imap/message/request/base/AbstractImapRequest.java (original)
+++ james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imap/message/request/base/AbstractImapRequest.java Sun Sep 7 06:43:39 2008
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.imap.message.request.base;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.api.imap.ImapCommand;
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.api.imap.message.request.ImapRequest;
Modified: james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imap/message/response/base/AbstractImapResponse.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imap/message/response/base/AbstractImapResponse.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imap/message/response/base/AbstractImapResponse.java (original)
+++ james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imap/message/response/base/AbstractImapResponse.java Sun Sep 7 06:43:39 2008
@@ -23,7 +23,7 @@
import java.util.Collections;
import java.util.List;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.api.imap.ImapCommand;
import org.apache.james.api.imap.message.response.ImapResponseMessage;
Modified: james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/ImapRequestLineReader.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/ImapRequestLineReader.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/ImapRequestLineReader.java (original)
+++ james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/ImapRequestLineReader.java Sun Sep 7 06:43:39 2008
@@ -23,7 +23,7 @@
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.imapserver.codec.ProtocolException;
/**
Modified: james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/base/AbstractImapCommandParser.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/base/AbstractImapCommandParser.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/base/AbstractImapCommandParser.java (original)
+++ james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/base/AbstractImapCommandParser.java Sun Sep 7 06:43:39 2008
@@ -33,7 +33,7 @@
import javax.mail.Flags;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.api.imap.ImapCommand;
import org.apache.james.api.imap.ImapConstants;
import org.apache.james.api.imap.ImapMessage;
@@ -114,7 +114,7 @@
result = message;
} catch ( ProtocolException e ) {
- getLogger().debug("Cannot parse protocol ", e);
+ getLog().debug("Cannot parse protocol ", e);
result = messageFactory.taggedBad(tag, command, HumanReadableTextKey.ILLEGAL_ARGUMENTS);
}
return result;
Modified: james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/imap4rev1/Imap4Rev1CommandParserFactory.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/imap4rev1/Imap4Rev1CommandParserFactory.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/imap4rev1/Imap4Rev1CommandParserFactory.java (original)
+++ james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/imap4rev1/Imap4Rev1CommandParserFactory.java Sun Sep 7 06:43:39 2008
@@ -22,9 +22,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.CascadingRuntimeException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.api.imap.ImapConstants;
import org.apache.james.api.imap.imap4rev1.Imap4Rev1CommandFactory;
import org.apache.james.api.imap.imap4rev1.Imap4Rev1MessageFactory;
@@ -121,7 +120,7 @@
private ImapCommandParser createCommand( Class commandClass )
{
- final Logger logger = getLogger();
+ final Log logger = getLog();
try {
ImapCommandParser cmd = ( ImapCommandParser ) commandClass.newInstance();
initialiseParser(commandClass, logger, cmd);
@@ -133,11 +132,11 @@
}
// TODO: would probably be better to manage this in protocol
// TODO: this runtime will produce a nasty disconnect for the client
- throw new CascadingRuntimeException( "Could not create command instance: " + commandClass.getName(), e );
+ throw new RuntimeException( "Could not create command instance: " + commandClass.getName(), e );
}
}
- protected void initialiseParser(Class commandClass, final Logger logger, ImapCommandParser cmd) {
+ protected void initialiseParser(Class commandClass, final Log logger, ImapCommandParser cmd) {
setupLogger(cmd);
if (logger.isDebugEnabled()) {
logger.debug("Created command " + commandClass);
Modified: james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/imap4rev1/SearchCommandParser.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/imap4rev1/SearchCommandParser.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/imap4rev1/SearchCommandParser.java (original)
+++ james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/imap4rev1/SearchCommandParser.java Sun Sep 7 06:43:39 2008
@@ -814,10 +814,10 @@
final ImapMessage result = getMessageFactory().createSearchMessage(command, key, useUids, tag);
return result;
} catch (IllegalCharsetNameException e) {
- getLogger().debug(e.getMessage());
+ getLog().debug(e.getMessage());
return unsupportedCharset(tag, command);
} catch (UnsupportedCharsetException e) {
- getLogger().debug(e.getMessage());
+ getLog().debug(e.getMessage());
return unsupportedCharset(tag, command);
}
}
Modified: james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/main/DefaultImapDecoder.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/main/DefaultImapDecoder.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/main/DefaultImapDecoder.java (original)
+++ james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/decode/main/DefaultImapDecoder.java Sun Sep 7 06:43:39 2008
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.james.imapserver.codec.decode.main;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.api.imap.ImapSessionState;
import org.apache.james.api.imap.display.HumanReadableTextKey;
@@ -43,17 +43,14 @@
this.imapCommands = imapCommands;
}
- /**
- * @see org.apache.avalon.framework.logger.AbstractLogEnabled#enableLogging(org.apache.avalon.framework.logger.Logger)
- */
- public void enableLogging(Logger logger) {
- super.enableLogging(logger);
+ public void setLog(Log logger) {
+ super.setLog(logger);
setupLogger(imapCommands);
}
public ImapMessage decode(ImapRequestLineReader request, ImapSession session) {
ImapMessage message;
- final Logger logger = getLogger();
+ final Log logger = getLog();
try {
final String tag = AbstractImapCommandParser.tag( request );
@@ -70,7 +67,7 @@
return message;
}
- private ImapMessage decodeCommandTagged(final ImapRequestLineReader request, final Logger logger,
+ private ImapMessage decodeCommandTagged(final ImapRequestLineReader request, final Log logger,
final String tag, final ImapSession session) {
ImapMessage message;
if (logger.isDebugEnabled()) {
@@ -100,7 +97,7 @@
}
private ImapMessage decodeCommandNamed(final ImapRequestLineReader request,
- final String tag, String commandName, final Logger logger, final ImapSession session) {
+ final String tag, String commandName, final Log logger, final ImapSession session) {
ImapMessage message;
if (logger.isDebugEnabled()) {
logger.debug( "Got <command>: " + commandName);
Modified: james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/base/AbstractChainedImapEncoder.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/base/AbstractChainedImapEncoder.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/base/AbstractChainedImapEncoder.java (original)
+++ james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/base/AbstractChainedImapEncoder.java Sun Sep 7 06:43:39 2008
@@ -23,8 +23,8 @@
import java.util.Collection;
import java.util.Iterator;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.imapserver.codec.encode.ImapEncoder;
import org.apache.james.imapserver.codec.encode.ImapResponseComposer;
@@ -38,8 +38,8 @@
this.next = next;
}
- public void enableLogging(Logger logger) {
- super.enableLogging(logger);
+ public void setLog(Log logger) {
+ super.setLog(logger);
setupLogger(next);
}
Modified: james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/base/EndImapEncoder.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/base/EndImapEncoder.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/base/EndImapEncoder.java (original)
+++ james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/base/EndImapEncoder.java Sun Sep 7 06:43:39 2008
@@ -21,8 +21,8 @@
import java.io.IOException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.imapserver.codec.encode.ImapEncoder;
import org.apache.james.imapserver.codec.encode.ImapResponseComposer;
@@ -30,7 +30,7 @@
public class EndImapEncoder extends AbstractLogEnabled implements ImapEncoder {
public void encode(ImapMessage message, ImapResponseComposer composer) throws IOException {
- final Logger logger = getLogger();
+ final Log logger = getLog();
logger.warn("Unknown message");
if (logger.isDebugEnabled()) {
logger.debug("Chain end reached for " + message);
Modified: james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/base/ImapResponseComposerImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/base/ImapResponseComposerImpl.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/base/ImapResponseComposerImpl.java (original)
+++ james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/base/ImapResponseComposerImpl.java Sun Sep 7 06:43:39 2008
@@ -26,8 +26,8 @@
import javax.mail.Flags;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.api.imap.ImapCommand;
import org.apache.james.api.imap.ImapConstants;
import org.apache.james.imap.message.response.imap4rev1.Literal;
@@ -105,7 +105,7 @@
message(FAILED);
message(reason);
end();
- final Logger logger = getLogger();
+ final Log logger = getLog();
if (logger != null && logger.isInfoEnabled()) {
logger.info("COMMAND FAILED [" + responseCode + "] - " + reason);
}
@@ -120,7 +120,7 @@
message(BAD);
message(message);
end();
- final Logger logger = getLogger();
+ final Log logger = getLog();
if (logger != null && logger.isInfoEnabled()) {
logger.info("ERROR - " + message);
}
@@ -135,7 +135,7 @@
message(BAD);
message(message);
end();
- final Logger logger = getLogger();
+ final Log logger = getLog();
if (logger != null && logger.isInfoEnabled()) {
logger.info("BAD - " + message);
}
@@ -150,7 +150,7 @@
message(BAD);
message(message);
end();
- final Logger logger = getLogger();
+ final Log logger = getLog();
if (logger != null && logger.isInfoEnabled()) {
logger.info("BAD - " + message);
}
Modified: james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/FetchResponseEncoder.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/FetchResponseEncoder.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/FetchResponseEncoder.java (original)
+++ james/protocols/imap/trunk/codec/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/FetchResponseEncoder.java Sun Sep 7 06:43:39 2008
@@ -30,7 +30,7 @@
import javax.mail.Flags;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
import org.apache.james.api.imap.ImapConstants;
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.imap.message.response.imap4rev1.FetchResponse;
@@ -168,7 +168,7 @@
final String name = (String) iter.next();
final String value = (String) params.get(name);
if (value == null) {
- final Logger logger = getLogger();
+ final Log logger = getLog();
logger.warn("Disposition parameter name has no value.");
if (logger.isDebugEnabled()) {
logger.debug("Disposition parameter " + name + " has no matching value");
Modified: james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/decode/imap4rev1/MockLogger.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/decode/imap4rev1/MockLogger.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/decode/imap4rev1/MockLogger.java (original)
+++ james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/decode/imap4rev1/MockLogger.java Sun Sep 7 06:43:39 2008
@@ -22,35 +22,31 @@
*/
package org.apache.james.imapserver.codec.decode.imap4rev1;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
-final class MockLogger implements Logger {
- public void debug(String arg0) {
+final class MockLogger implements Log {
+ public void debug(Object arg0) {
}
- public void debug(String arg0, Throwable arg1) {
+ public void debug(Object arg0, Throwable arg1) {
}
- public void error(String arg0) {
+ public void error(Object arg0) {
}
- public void error(String arg0, Throwable arg1) {
+ public void error(Object arg0, Throwable arg1) {
}
- public void fatalError(String arg0) {
+ public void fatalError(Object arg0) {
}
- public void fatalError(String arg0, Throwable arg1) {
+ public void fatalError(Object arg0, Throwable arg1) {
}
- public Logger getChildLogger(String arg0) {
- return null;
+ public void info(Object arg0) {
}
- public void info(String arg0) {
- }
-
- public void info(String arg0, Throwable arg1) {
+ public void info(Object arg0, Throwable arg1) {
}
public boolean isDebugEnabled() {
@@ -73,11 +69,31 @@
return false;
}
- public void warn(String arg0) {
+ public void warn(Object arg0) {
}
- public void warn(String arg0, Throwable arg1) {
+ public void warn(Object arg0, Throwable arg1) {
}
+
+ public void fatal(Object arg0) {
+ }
+
+ public void fatal(Object arg0, Throwable arg1) {
+ }
+
+ public boolean isFatalEnabled() {
+ return false;
+ }
+
+ public boolean isTraceEnabled() {
+ return false;
+ }
+
+ public void trace(Object arg0) {
+ }
+
+ public void trace(Object arg0, Throwable arg1) {
+ }
}
\ No newline at end of file
Modified: james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/decode/imap4rev1/SearchCommandParserCharsetTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/decode/imap4rev1/SearchCommandParserCharsetTest.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/decode/imap4rev1/SearchCommandParserCharsetTest.java (original)
+++ james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/decode/imap4rev1/SearchCommandParserCharsetTest.java Sun Sep 7 06:43:39 2008
@@ -73,7 +73,7 @@
parser.init((Imap4Rev1CommandFactory) mockCommandFactory.proxy());
parser.setMessageFactory((Imap4Rev1MessageFactory) mockMessageFactory.proxy());
parser.setStatusResponseFactory((StatusResponseFactory) mockStatusResponseFactory.proxy());
- parser.enableLogging(new MockLogger());
+ parser.setLog(new MockLogger());
}
protected void tearDown() throws Exception {
Modified: james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/decode/imap4rev1/SearchCommandParserQuotedCharsetTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/decode/imap4rev1/SearchCommandParserQuotedCharsetTest.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/decode/imap4rev1/SearchCommandParserQuotedCharsetTest.java (original)
+++ james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/decode/imap4rev1/SearchCommandParserQuotedCharsetTest.java Sun Sep 7 06:43:39 2008
@@ -95,7 +95,7 @@
parser.init((Imap4Rev1CommandFactory) mockCommandFactory.proxy());
parser.setMessageFactory((Imap4Rev1MessageFactory) mockMessageFactory.proxy());
parser.setStatusResponseFactory((StatusResponseFactory) mockStatusResponseFactory.proxy());
- parser.enableLogging(new MockLogger());
+ parser.setLog(new MockLogger());
}
protected void tearDown() throws Exception {
Modified: james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/encode/base/ByteImapResponseWriter.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/encode/base/ByteImapResponseWriter.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/encode/base/ByteImapResponseWriter.java (original)
+++ james/protocols/imap/trunk/codec/src/test/java/org/apache/james/imapserver/codec/encode/base/ByteImapResponseWriter.java Sun Sep 7 06:43:39 2008
@@ -25,7 +25,7 @@
import java.nio.channels.Channels;
import java.nio.channels.WritableByteChannel;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.api.imap.ImapConstants;
import org.apache.james.imap.message.response.imap4rev1.Literal;
import org.apache.james.imapserver.codec.encode.ImapResponseWriter;
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/experimental/imapserver/ExperimentalHostSystem.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/experimental/imapserver/ExperimentalHostSystem.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/experimental/imapserver/ExperimentalHostSystem.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/experimental/imapserver/ExperimentalHostSystem.java Sun Sep 7 06:43:39 2008
@@ -26,10 +26,7 @@
import java.nio.CharBuffer;
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import org.apache.james.api.imap.process.ImapProcessor;
@@ -108,7 +105,7 @@
out = new ByteBufferOutputStream(continuation);
in = new ByteBufferInputStream();
handler = new ImapRequestHandler(decoder, processor, encoder);
- handler.enableLogging(new MockLogger());
+ handler.setLog(new MockLogger());
session = new ImapSessionImpl();
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/experimental/imapserver/MockLogger.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/experimental/imapserver/MockLogger.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/experimental/imapserver/MockLogger.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/experimental/imapserver/MockLogger.java Sun Sep 7 06:43:39 2008
@@ -1,60 +1,96 @@
+/****************************************************************
+ * 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.experimental.imapserver;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
-public class MockLogger implements Logger {
+final class MockLogger implements Log {
+ public void debug(Object arg0) {
+ }
- public void debug(String arg0) {}
+ public void debug(Object arg0, Throwable arg1) {
+ }
- public void debug(String arg0, Throwable arg1) {
- }
+ public void error(Object arg0) {
+ }
- public void error(String arg0) {
- }
+ public void error(Object arg0, Throwable arg1) {
+ }
- public void error(String arg0, Throwable arg1) {
- }
+ public void fatalError(Object arg0) {
+ }
- public void fatalError(String arg0) {
- }
+ public void fatalError(Object arg0, Throwable arg1) {
+ }
- public void fatalError(String arg0, Throwable arg1) {
- }
+ public void info(Object arg0) {
+ }
- public Logger getChildLogger(String arg0) {
- return this;
- }
+ public void info(Object arg0, Throwable arg1) {
+ }
- public void info(String arg0) {
- }
+ public boolean isDebugEnabled() {
+ return false;
+ }
- public void info(String arg0, Throwable arg1) {
- }
+ public boolean isErrorEnabled() {
+ return false;
+ }
- public boolean isDebugEnabled() {
- return false;
- }
+ public boolean isFatalErrorEnabled() {
+ return false;
+ }
- public boolean isErrorEnabled() {
- return false;
+ public boolean isInfoEnabled() {
+ return false;
+ }
+
+ public boolean isWarnEnabled() {
+ return false;
+ }
+
+ public void warn(Object arg0) {
+
+ }
+
+ public void warn(Object arg0, Throwable arg1) {
+
+ }
+
+ public void fatal(Object arg0) {
}
- public boolean isFatalErrorEnabled() {
- return false;
+ public void fatal(Object arg0, Throwable arg1) {
}
- public boolean isInfoEnabled() {
+ public boolean isFatalEnabled() {
return false;
}
- public boolean isWarnEnabled() {
+ public boolean isTraceEnabled() {
return false;
}
- public void warn(String arg0) {
+ public void trace(Object arg0) {
}
- public void warn(String arg0, Throwable arg1) {
+ public void trace(Object arg0, Throwable arg1) {
}
-
-}
+}
\ No newline at end of file
Added: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/SimpleMailboxManagerProvider.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/SimpleMailboxManagerProvider.java?rev=692849&view=auto
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/SimpleMailboxManagerProvider.java (added)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/SimpleMailboxManagerProvider.java Sun Sep 7 06:43:39 2008
@@ -0,0 +1,39 @@
+/****************************************************************
+ * 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.mailboxmanager.mock;
+
+import org.apache.james.mailboxmanager.MailboxManagerException;
+import org.apache.james.mailboxmanager.manager.MailboxManager;
+import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
+
+public class SimpleMailboxManagerProvider implements MailboxManagerProvider {
+
+ private MailboxManager manager;
+
+ public void setMailboxManager(MailboxManager manager) {
+ this.manager = manager;
+ }
+
+
+ public MailboxManager getMailboxManager() throws MailboxManagerException {
+ return manager;
+ }
+
+}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java Sun Sep 7 06:43:39 2008
@@ -27,7 +27,6 @@
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.james.experimental.imapserver.ExperimentalHostSystem;
-import org.apache.james.mailboxmanager.impl.DefaultMailboxManagerProvider;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
import org.apache.james.mailboxmanager.torque.TorqueMailboxManager;
import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
@@ -175,16 +174,16 @@
private static TorqueMailboxManager torqueMailboxManager;
private static SimpleUserManager userManager;
- private static DefaultMailboxManagerProvider defaultMailboxManagerProvider;
+ private static SimpleMailboxManagerProvider provider;
public static final ExperimentalHostSystem host = new ExperimentalHostSystem();
public synchronized static MailboxManagerProvider getTorqueMailboxManagerProviderInstance() throws Exception {
- if (defaultMailboxManagerProvider==null) {
+ if (provider==null) {
getMailboxManager();
- defaultMailboxManagerProvider=new DefaultMailboxManagerProvider();
- defaultMailboxManagerProvider.setMailboxManagerInstance(torqueMailboxManager);
+ provider=new SimpleMailboxManagerProvider();
+ provider.setMailboxManager(torqueMailboxManager);
}
- return defaultMailboxManagerProvider;
+ return provider;
}
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractChainedImapProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractChainedImapProcessor.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractChainedImapProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractChainedImapProcessor.java Sun Sep 7 06:43:39 2008
@@ -19,8 +19,8 @@
package org.apache.james.imapserver.processor.base;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
@@ -40,8 +40,8 @@
this.next = next;
}
- public void enableLogging(Logger logger) {
- super.enableLogging(logger);
+ public void setLog(Log logger) {
+ super.setLog(logger);
setupLogger(next);
}
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractImapRequestProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractImapRequestProcessor.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractImapRequestProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/AbstractImapRequestProcessor.java Sun Sep 7 06:43:39 2008
@@ -23,7 +23,7 @@
import javax.mail.MessagingException;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
import org.apache.james.api.imap.ImapCommand;
import org.apache.james.api.imap.ImapConstants;
import org.apache.james.api.imap.ImapMessage;
@@ -61,7 +61,7 @@
}
protected void no(final ImapCommand command, final String tag, final Responder responder, final MessagingException e) {
- final Logger logger = getLogger();
+ final Log logger = getLog();
final ImapResponseMessage response;
if (e instanceof MailboxExistsException) {
response = factory.taggedNo(tag, command, HumanReadableTextKey.FAILURE_MAILBOX_EXISTS);
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/SelectedMailboxSessionImpl.java Sun Sep 7 06:43:39 2008
@@ -28,7 +28,7 @@
import javax.mail.Flags;
import javax.mail.MessagingException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.api.imap.process.SelectedImapMailbox;
import org.apache.james.imap.message.response.imap4rev1.ExistsResponse;
import org.apache.james.imap.message.response.imap4rev1.ExpungeResponse;
@@ -187,8 +187,8 @@
}
private void handleResponseException(final List responses, MessagingException e, final String message) {
- getLogger().info(message);
- getLogger().debug(message, e);
+ getLog().info(message);
+ getLog().debug(message, e);
// TODO: consider whether error message should be passed to the user
UntaggedNoResponse response = new UntaggedNoResponse(message, null);
responses.add(response);
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/UnknownRequestImapProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/UnknownRequestImapProcessor.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/UnknownRequestImapProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/base/UnknownRequestImapProcessor.java Sun Sep 7 06:43:39 2008
@@ -19,8 +19,8 @@
package org.apache.james.imapserver.processor.base;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.api.imap.ImapCommand;
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.api.imap.display.HumanReadableTextKey;
@@ -40,7 +40,7 @@
}
public ImapResponseMessage process(ImapMessage message, ImapSession session) {
- Logger logger = getLogger();
+ Log logger = getLog();
if (logger != null && logger.isDebugEnabled()) {
logger.debug("Unknown message: " + message);
}
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AppendProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AppendProcessor.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AppendProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AppendProcessor.java Sun Sep 7 06:43:39 2008
@@ -25,7 +25,7 @@
import javax.mail.Flags.Flag;
import javax.mail.internet.MimeMessage;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
import org.apache.james.api.imap.ImapCommand;
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.api.imap.display.HumanReadableTextKey;
@@ -80,7 +80,7 @@
// assume that
// TODO: improved API should communicate when this operation
// TODO: fails whether the mailbox exists
- Logger logger = getLogger();
+ Log logger = getLog();
if (logger.isInfoEnabled()) {
logger.info(mme.getMessage());
}
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AuthenticateProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AuthenticateProcessor.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AuthenticateProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AuthenticateProcessor.java Sun Sep 7 06:43:39 2008
@@ -43,7 +43,7 @@
ImapSession session, String tag, ImapCommand command, Responder responder) {
final AuthenticateRequest request = (AuthenticateRequest) message;
final String authType = request.getAuthType();
- getLogger().info("Unsupported authentication mechanism '" + authType + "'");
+ getLog().info("Unsupported authentication mechanism '" + authType + "'");
no(command, tag, responder, HumanReadableTextKey.UNSUPPORTED_AUTHENTICATION_MECHANISM);
}
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LSubProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LSubProcessor.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LSubProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LSubProcessor.java Sun Sep 7 06:43:39 2008
@@ -69,7 +69,7 @@
okComplete(command, tag, responder);
} catch (SubscriptionException e) {
- getLogger().debug("Subscription failed", e);
+ getLog().debug("Subscription failed", e);
final HumanReadableTextKey exceptionKey = e.getKey();
final HumanReadableTextKey displayTextKey;
if (exceptionKey == null) {
@@ -79,7 +79,7 @@
}
no(command, tag, responder, displayTextKey);
} catch (MailboxManagerException e) {
- getLogger().debug("Subscription failed", e);
+ getLog().debug("Subscription failed", e);
final HumanReadableTextKey displayTextKey = HumanReadableTextKey.GENERIC_LSUB_FAILURE;
no(command, tag, responder, displayTextKey);
}
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LoginProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LoginProcessor.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LoginProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/LoginProcessor.java Sun Sep 7 06:43:39 2008
@@ -81,7 +81,7 @@
}
}
} catch (MailboxManagerException e) {
- getLogger().debug("Login failed", e);
+ getLog().debug("Login failed", e);
final HumanReadableTextKey displayTextKey = HumanReadableTextKey.INVALID_LOGIN;
no(command, tag, responder, displayTextKey);
}
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SearchProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SearchProcessor.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SearchProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SearchProcessor.java Sun Sep 7 06:43:39 2008
@@ -170,7 +170,7 @@
case SearchKey.TYPE_UNKEYWORD: return SearchQuery.flagIsUnSet(key.getValue());
case SearchKey.TYPE_UNSEEN: return SearchQuery.flagIsUnSet(Flag.SEEN);
default:
- getLogger().warn("Ignoring unknown search key.");
+ getLog().warn("Ignoring unknown search key.");
return SearchQuery.all();
}
}
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/StatusProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/StatusProcessor.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/StatusProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/StatusProcessor.java Sun Sep 7 06:43:39 2008
@@ -19,7 +19,7 @@
package org.apache.james.imapserver.processor.imap4rev1;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
import org.apache.james.api.imap.ImapCommand;
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.api.imap.message.StatusDataItems;
@@ -53,7 +53,7 @@
final StatusRequest request = (StatusRequest) message;
final String mailboxName = request.getMailboxName();
final StatusDataItems statusDataItems = request.getStatusDataItems();
- final Logger logger = getLogger();
+ final Log logger = getLog();
final MailboxSession mailboxSession = ImapSessionUtils.getMailboxSession(session);
try {
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SubscribeProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SubscribeProcessor.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SubscribeProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SubscribeProcessor.java Sun Sep 7 06:43:39 2008
@@ -58,7 +58,7 @@
okComplete(command, tag, responder);
} catch (SubscriptionException e) {
- getLogger().debug("Subscription failed", e);
+ getLog().debug("Subscription failed", e);
unsolicitedResponses(session, responder, false);
final HumanReadableTextKey exceptionKey = e.getKey();
@@ -70,7 +70,7 @@
}
no(command, tag, responder, displayTextKey);
} catch (MailboxManagerException e) {
- getLogger().debug("Subscription failed", e);
+ getLog().debug("Subscription failed", e);
unsolicitedResponses(session, responder, false);
final HumanReadableTextKey displayTextKey = HumanReadableTextKey.GENERIC_SUBSCRIPTION_FAILURE;
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/UnsubscribeProcessor.java Sun Sep 7 06:43:39 2008
@@ -58,7 +58,7 @@
okComplete(command, tag, responder);
} catch (SubscriptionException e) {
- getLogger().debug("Subscription failed", e);
+ getLog().debug("Subscription failed", e);
unsolicitedResponses(session, responder, false);
final HumanReadableTextKey exceptionKey = e.getKey();
@@ -70,7 +70,7 @@
}
no(command, tag, responder, displayTextKey);
} catch (MailboxManagerException e) {
- getLogger().debug("Subscription failed", e);
+ getLog().debug("Subscription failed", e);
unsolicitedResponses(session, responder, false);
final HumanReadableTextKey displayTextKey = HumanReadableTextKey.GENERIC_SUBSCRIPTION_FAILURE;
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/EnvelopeBuilder.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/EnvelopeBuilder.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/EnvelopeBuilder.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/EnvelopeBuilder.java Sun Sep 7 06:43:39 2008
@@ -27,7 +27,7 @@
import javax.mail.MessagingException;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
import org.apache.james.api.imap.ImapConstants;
import org.apache.james.imap.message.response.imap4rev1.FetchResponse;
import org.apache.james.mailboxmanager.Headers;
@@ -43,9 +43,9 @@
import org.apache.james.mime4j.field.address.parser.ParseException;
final class EnvelopeBuilder {
- private final Logger logger;
+ private final Log logger;
- public EnvelopeBuilder(final Logger logger) {
+ public EnvelopeBuilder(final Log logger) {
super();
this.logger = logger;
}
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/FetchProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/FetchProcessor.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/FetchProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/FetchProcessor.java Sun Sep 7 06:43:39 2008
@@ -71,7 +71,7 @@
FetchGroup resultToFetch = getFetchGroup(fetch);
Mailbox mailbox = ImapSessionUtils.getMailbox(session);
for (int i = 0; i < idSet.length; i++) {
- final FetchResponseBuilder builder = new FetchResponseBuilder(getLogger(), new EnvelopeBuilder(getLogger()));
+ final FetchResponseBuilder builder = new FetchResponseBuilder(getLog(), new EnvelopeBuilder(getLog()));
final long highVal;
final long lowVal;
if (useUids) {
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/FetchResponseBuilder.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/FetchResponseBuilder.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/FetchResponseBuilder.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/FetchResponseBuilder.java Sun Sep 7 06:43:39 2008
@@ -31,7 +31,7 @@
import javax.mail.Flags;
import javax.mail.MessagingException;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
import org.apache.james.api.imap.message.BodyFetchElement;
import org.apache.james.api.imap.message.FetchData;
import org.apache.james.api.imap.process.ImapSession;
@@ -49,7 +49,7 @@
import org.apache.james.mime4j.field.address.parser.ParseException;
final class FetchResponseBuilder {
- private final Logger logger;
+ private final Log logger;
private final EnvelopeBuilder envelopeBuilder;
private int msn;
@@ -62,7 +62,7 @@
private FetchResponse.Structure body;
private FetchResponse.Structure bodystructure;
- public FetchResponseBuilder(final Logger logger,final EnvelopeBuilder envelopeBuilder) {
+ public FetchResponseBuilder(final Log logger,final EnvelopeBuilder envelopeBuilder) {
super();
this.logger = logger;
this.envelopeBuilder = envelopeBuilder;
Modified: james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/ImapRequestHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/ImapRequestHandler.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/ImapRequestHandler.java (original)
+++ james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/ImapRequestHandler.java Sun Sep 7 06:43:39 2008
@@ -23,8 +23,8 @@
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.api.imap.ImapSessionState;
import org.apache.james.api.imap.message.response.ImapResponseMessage;
@@ -65,8 +65,8 @@
/**
* @see org.apache.avalon.framework.logger.AbstractLogEnabled#enableLogging(org.apache.avalon.framework.logger.Logger)
*/
- public void enableLogging(Logger logger) {
- super.enableLogging(logger);
+ public void setLog(Log logger) {
+ super.setLog(logger);
setupLogger(decoder);
setupLogger(processor);
}
@@ -93,7 +93,7 @@
ImapRequestLineReader request = new ImapRequestLineReader( input, output );
setupLogger(request);
- final Logger logger = getLogger();
+ final Log logger = getLog();
try {
request.nextChar();
}
@@ -103,7 +103,7 @@
}
ImapResponseComposerImpl response = new ImapResponseComposerImpl( new OutputStreamImapResponseWriter( output ));
- response.enableLogging(logger);
+ response.setLog(logger);
if (doProcessRequest( request, response, session )) {
@@ -135,8 +135,8 @@
try {
output.write(MAILBOX_DELETED_SIGNOFF);
} catch (IOException e) {
- getLogger().warn("Failed to write signoff");
- getLogger().debug("Failed to write signoff:", e);
+ getLog().warn("Failed to write signoff");
+ getLog().debug("Failed to write signoff:", e);
}
}
@@ -155,7 +155,7 @@
try {
out.write(ABANDON_SIGNOFF);
} catch (Throwable t) {
- getLogger().debug("Failed to write ABANDON_SIGNOFF", t);
+ getLog().debug("Failed to write ABANDON_SIGNOFF", t);
}
}
@@ -172,7 +172,7 @@
result = true;
} else {
result = false;
- final Logger logger = getLogger();
+ final Log logger = getLog();
logger.info(failure.getMessage());
if (logger.isDebugEnabled()) {
logger.debug("Failed to write " + message, failure);
Modified: james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/ImapSessionImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/ImapSessionImpl.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/ImapSessionImpl.java (original)
+++ james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/ImapSessionImpl.java Sun Sep 7 06:43:39 2008
@@ -23,8 +23,8 @@
import java.util.List;
import java.util.Map;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.commons.collections.ListUtils;
+import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.api.imap.ImapConstants;
import org.apache.james.api.imap.ImapSessionState;
import org.apache.james.api.imap.process.ImapSession;
Modified: james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/encode/writer/ChannelImapResponseWriter.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/encode/writer/ChannelImapResponseWriter.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/encode/writer/ChannelImapResponseWriter.java (original)
+++ james/protocols/imap/trunk/seda/src/main/java/org/apache/james/experimental/imapserver/encode/writer/ChannelImapResponseWriter.java Sun Sep 7 06:43:39 2008
@@ -24,7 +24,7 @@
import java.nio.channels.WritableByteChannel;
import java.nio.charset.Charset;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.api.imap.ImapConstants;
import org.apache.james.imap.message.response.imap4rev1.Literal;
import org.apache.james.imapserver.codec.encode.ImapResponseWriter;
Modified: james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java?rev=692849&r1=692848&r2=692849&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java (original)
+++ james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java Sun Sep 7 06:43:39 2008
@@ -35,12 +35,9 @@
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.commons.collections.IteratorUtils;
import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.impl.AvalonLogger;
+import org.apache.james.api.imap.AbstractLogEnabled;
import org.apache.james.mailboxmanager.MailboxListener;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MailboxSession;
@@ -696,22 +693,10 @@
}
public void setLog(Log log) {
+ super.setLog(log);
this.log = log;
searches.setLog(log);
}
-
- private Log getLog() {
- // Note opt to accept double calls to avoid synchronisation
- if (log == null) {
- log = LogFactory.getLog(TorqueMailbox.class);
- }
- return log;
- }
-
- public void enableLogging(Logger logger) {
- super.enableLogging(logger);
- setLog(new AvalonLogger(logger));
- }
public void copyTo(MessageRange set, TorqueMailbox toMailbox, MailboxSession session) throws MailboxManagerException {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org