Author: ajaquith
Date: Sun Nov 30 14:26:11 2008
New Revision: 721910
URL: http://svn.apache.org/viewvc?rev=721910&view=rev
Log:
Partial merge with trunk...
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/LinkParser.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/preferences/Preferences.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/AbstractFileProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/FileSystemProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/VersioningFileProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/render/CleanTextRenderer.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/render/RenderingManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/rss/RSSGenerator.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/rss/RSSThread.java
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java?rev=721910&r1=721909&r2=721910&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
Sun Nov 30 14:26:11 2008
@@ -31,7 +31,8 @@
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.apache.oro.text.GlobCompiler;
import org.apache.oro.text.regex.*;
import org.jdom.*;
@@ -86,7 +87,7 @@
protected static final int IMAGEWIKILINK = 9;
protected static final int ATTACHMENT = 10;
- private static Logger log = Logger.getLogger( JSPWikiMarkupParser.class );
+ private static Logger log = LoggerFactory.getLogger(
JSPWikiMarkupParser.class );
private boolean m_isbold = false;
private boolean m_isitalic = false;
@@ -300,7 +301,7 @@
}
catch( MalformedPatternException e )
{
- log.fatal("Internal error: Someone put in a faulty
pattern.",e);
+ log.error("Internal error: Someone put in a faulty
pattern.",e);
throw new InternalWikiException("Faulty camelcasepattern in
TranslatorReader");
}
m_engine.setAttribute( CAMELCASE_PATTERN, m_camelCasePattern );
@@ -1173,7 +1174,7 @@
}
catch( IOException e )
{
- log.fatal("CleanTranslator not working", e);
+ log.error("CleanTranslator not working", e);
throw new InternalWikiException("CleanTranslator not working as
expected, when cleaning title"+ e.getMessage() );
}
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/LinkParser.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/LinkParser.java?rev=721910&r1=721909&r2=721910&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/LinkParser.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/parser/LinkParser.java
Sun Nov 30 14:26:11 2008
@@ -23,7 +23,8 @@
import java.util.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.jdom.Attribute;
/**
@@ -150,7 +151,7 @@
*/
public class LinkParser
{
- private static Logger log = Logger.getLogger(LinkParser.class);
+ private static Logger log = LoggerFactory.getLogger(LinkParser.class);
/** Permitted attributes on links. Keep this sorted. */
private static final String[] PERMITTED_ATTRIBUTES = new String[] {
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/preferences/Preferences.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/preferences/Preferences.java?rev=721910&r1=721909&r2=721910&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/preferences/Preferences.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/preferences/Preferences.java
Sun Nov 30 14:26:11 2008
@@ -29,7 +29,8 @@
import javax.servlet.jsp.PageContext;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.json.JSONException;
import org.json.JSONObject;
@@ -56,7 +57,7 @@
*/
public static final String SESSIONPREFS = "prefs";
- private static Logger log = Logger.getLogger( Preferences.class );
+ private static Logger log = LoggerFactory.getLogger( Preferences.class );
/**
* This is an utility method which is called to make sure that the
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/AbstractFileProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/AbstractFileProvider.java?rev=721910&r1=721909&r2=721910&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/AbstractFileProvider.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/AbstractFileProvider.java
Sun Nov 30 14:26:11 2008
@@ -27,7 +27,8 @@
import java.util.TreeSet;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.*;
@@ -46,7 +47,7 @@
public abstract class AbstractFileProvider
implements WikiPageProvider
{
- private static final Logger log =
Logger.getLogger(AbstractFileProvider.class);
+ private static final Logger log =
LoggerFactory.getLogger(AbstractFileProvider.class);
private String m_pageDirectory = "/tmp/";
protected String m_encoding;
@@ -259,7 +260,7 @@
}
catch( Exception e )
{
- log.fatal("Closing failed",e);
+ log.error("Closing failed",e);
}
}
}
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java?rev=721910&r1=721909&r2=721910&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java
Sun Nov 30 14:26:11 2008
@@ -39,7 +39,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.attachment.Attachment;
@@ -101,7 +102,7 @@
/** The default extension for the attachment directory. */
public static final String ATTDIR_EXTENSION = "-dir";
- static final Logger log = Logger.getLogger( BasicAttachmentProvider.class
);
+ static final Logger log = LoggerFactory.getLogger(
BasicAttachmentProvider.class );
/**
* [EMAIL PROTECTED]
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java?rev=721910&r1=721909&r2=721910&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java
Sun Nov 30 14:26:11 2008
@@ -24,7 +24,8 @@
import java.io.InputStream;
import java.util.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.attachment.Attachment;
@@ -52,7 +53,7 @@
public class CachingAttachmentProvider
implements WikiAttachmentProvider
{
- private static final Logger log =
Logger.getLogger(CachingAttachmentProvider.class);
+ private static final Logger log =
LoggerFactory.getLogger(CachingAttachmentProvider.class);
private WikiAttachmentProvider m_provider;
@@ -447,7 +448,7 @@
*/
private static class CachedAttachmentCollector implements
CacheEntryEventListener
{
- private static final Logger log = Logger.getLogger(
CachedAttachmentCollector.class );
+ private static final Logger log = LoggerFactory.getLogger(
CachedAttachmentCollector.class );
private Map<String, Attachment> m_allItems = new HashMap<String,
Attachment>();
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingProvider.java?rev=721910&r1=721909&r2=721910&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingProvider.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/CachingProvider.java
Sun Nov 30 14:26:11 2008
@@ -23,7 +23,8 @@
import java.io.IOException;
import java.util.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.parser.MarkupParser;
@@ -57,7 +58,7 @@
public class CachingProvider
implements WikiPageProvider, VersioningProvider
{
- private static final Logger log = Logger.getLogger(CachingProvider.class);
+ private static final Logger log =
LoggerFactory.getLogger(CachingProvider.class);
private WikiPageProvider m_provider;
// FIXME: Find another way to the search engine to use instead of from
WikiEngine?
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/FileSystemProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/FileSystemProvider.java?rev=721910&r1=721909&r2=721910&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/FileSystemProvider.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/FileSystemProvider.java
Sun Nov 30 14:26:11 2008
@@ -22,7 +22,8 @@
import java.io.*;
import java.util.Properties;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.*;
@@ -37,7 +38,7 @@
public class FileSystemProvider
extends AbstractFileProvider
{
- private static final Logger log =
Logger.getLogger(FileSystemProvider.class);
+ private static final Logger log =
LoggerFactory.getLogger(FileSystemProvider.class);
/**
* All metadata is stored in a file with this extension.
*/
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java?rev=721910&r1=721909&r2=721910&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java
Sun Nov 30 14:26:11 2008
@@ -32,7 +32,8 @@
import java.util.Iterator;
import java.text.SimpleDateFormat;
import java.text.ParseException;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.apache.oro.text.regex.*;
import com.ecyrd.jspwiki.*;
@@ -63,7 +64,7 @@
private String m_checkoutVersionCommand = "co -p -r1.%v %s";
private String m_deleteVersionCommand = "rcs -o1.%v %s";
- private static final Logger log =
Logger.getLogger(RCSFileProvider.class);
+ private static final Logger log =
LoggerFactory.getLogger(RCSFileProvider.class);
/** Property name for the checkin command. Value is <tt>[EMAIL
PROTECTED]</tt>. */
public static final String PROP_CHECKIN =
"jspwiki.rcsFileProvider.checkinCommand";
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/VersioningFileProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/VersioningFileProvider.java?rev=721910&r1=721909&r2=721910&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/VersioningFileProvider.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/providers/VersioningFileProvider.java
Sun Nov 30 14:26:11 2008
@@ -27,7 +27,8 @@
import java.util.Date;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.*;
@@ -61,7 +62,7 @@
extends AbstractFileProvider
implements VersioningProvider
{
- private static final Logger log =
Logger.getLogger(VersioningFileProvider.class);
+ private static final Logger log =
LoggerFactory.getLogger(VersioningFileProvider.class);
/** Name of the directory where the old versions are stored. */
public static final String PAGEDIR = "OLD";
@@ -372,7 +373,7 @@
}
catch( Exception e )
{
- log.fatal("Closing failed",e);
+ log.error("Closing failed",e);
}
}
}
@@ -730,7 +731,7 @@
}
catch( IOException e )
{
- log.fatal("Something wrong with the page directory - you may
have just lost data!",e);
+ log.error("Something wrong with the page directory - you may
have just lost data!",e);
}
finally
{
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/render/CleanTextRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/render/CleanTextRenderer.java?rev=721910&r1=721909&r2=721910&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/render/CleanTextRenderer.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/render/CleanTextRenderer.java
Sun Nov 30 14:26:11 2008
@@ -24,7 +24,8 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.jdom.JDOMException;
import org.jdom.Text;
import org.jdom.xpath.XPath;
@@ -44,7 +45,7 @@
{
private static final String ALL_TEXT_NODES = "//text()";
- protected static final Logger log = Logger.getLogger(
CleanTextRenderer.class );
+ protected static final Logger log = LoggerFactory.getLogger(
CleanTextRenderer.class );
/**
* Create a renderer.
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/render/RenderingManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/render/RenderingManager.java?rev=721910&r1=721909&r2=721910&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/render/RenderingManager.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/render/RenderingManager.java
Sun Nov 30 14:26:11 2008
@@ -27,7 +27,8 @@
import java.util.Iterator;
import java.util.Properties;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.TextUtil;
import com.ecyrd.jspwiki.WikiContext;
@@ -63,7 +64,7 @@
*/
public class RenderingManager implements WikiEventListener, InternalModule
{
- private static Logger log = Logger.getLogger( RenderingManager.class );
+ private static Logger log = LoggerFactory.getLogger(
RenderingManager.class );
private int m_cacheExpiryPeriod = 24*60*60; // This can be
relatively long
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/rss/RSSGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/rss/RSSGenerator.java?rev=721910&r1=721909&r2=721910&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/rss/RSSGenerator.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/rss/RSSGenerator.java
Sun Nov 30 14:26:11 2008
@@ -22,7 +22,8 @@
import java.util.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.attachment.Attachment;
@@ -48,7 +49,7 @@
// FIXME3.0: This class would need a bit of refactoring. Method names, e.g.
are confusing.
public class RSSGenerator
{
- static Logger log = Logger.getLogger( RSSGenerator.class );
+ static Logger log = LoggerFactory.getLogger(
RSSGenerator.class );
private WikiEngine m_engine;
private String m_channelDescription = "";
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/rss/RSSThread.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/rss/RSSThread.java?rev=721910&r1=721909&r2=721910&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/rss/RSSThread.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/rss/RSSThread.java
Sun Nov 30 14:26:11 2008
@@ -32,7 +32,8 @@
import java.io.StringReader;
import java.io.Writer;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.FileUtil;
import com.ecyrd.jspwiki.WikiEngine;
@@ -45,7 +46,7 @@
*/
public class RSSThread extends WikiBackgroundThread
{
- static Logger log = Logger.getLogger( RSSThread.class );
+ static Logger log = LoggerFactory.getLogger( RSSThread.class
);
private final File m_rssFile;
private final int m_rssInterval;
@@ -127,7 +128,7 @@
}
catch( IOException e )
{
- log.fatal("Could not close I/O for RSS", e );
+ log.error("Could not close I/O for RSS", e );
m_generator.setEnabled( false );
}
m_watchdog.exitState();
