svn commit: r656354 - in /james/server/trunk: core-library/src/main/java/org/apache/james/mailboxmanager/util/ torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/

[rdonkin]

Author: rdonkin
Date: Wed May 14 11:45:06 2008
New Revision: 656354

URL: http://svn.apache.org/viewvc?rev=656354&view=rev
Log:
Simplify logging.

Removed:
    
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/AbstractLogFactoryAware.java
    
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/AvalonLogFactory.java
    
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/LogAware.java
    
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/LogFactoryAware.java
    
james/server/trunk/core-library/src/main/java/org/apache/james/mailboxmanager/util/MyLogFactory.java
Modified:
    
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java

Modified: 
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java?rev=656354&r1=656353&r2=656354&view=diff
==============================================================================
--- 
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
 (original)
+++ 
james/server/trunk/torque-mailboxmanager-function/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
 Wed May 14 11:45:06 2008
@@ -35,8 +35,12 @@
 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.mailboxmanager.GeneralMessageSet;
 import org.apache.james.mailboxmanager.MailboxListener;
 import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -58,7 +62,6 @@
 import org.apache.james.mailboxmanager.torque.om.MessageRowPeer;
 import org.apache.james.mailboxmanager.tracking.UidChangeTracker;
 import org.apache.james.mailboxmanager.tracking.UidRange;
-import org.apache.james.mailboxmanager.util.AbstractLogFactoryAware;
 import org.apache.torque.NoRowsException;
 import org.apache.torque.TooManyRowsException;
 import org.apache.torque.TorqueException;
@@ -69,8 +72,10 @@
 import com.sun.mail.util.CRLFOutputStream;
 import com.workingdogs.village.DataSetException;
 
-public class TorqueMailbox extends AbstractLogFactoryAware implements Mailbox {
+public class TorqueMailbox extends AbstractLogEnabled implements Mailbox {
 
+    private Log log;
+    
     private boolean open = true;
 
     private MailboxRow mailboxRow;
@@ -702,7 +707,22 @@
     }
 
     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));
+    }
+    
+    
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]