You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2008/11/29 19:32:06 UTC
svn commit: r721700 [2/3] - in /incubator/jspwiki/trunk: ./ etc/ lib/
src/com/ecyrd/jspwiki/ src/com/ecyrd/jspwiki/attachment/
src/com/ecyrd/jspwiki/auth/ src/com/ecyrd/jspwiki/auth/acl/
src/com/ecyrd/jspwiki/auth/authorize/ src/com/ecyrd/jspwiki/auth/...
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/WikiSecurityEvent.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/WikiSecurityEvent.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/WikiSecurityEvent.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/event/WikiSecurityEvent.java Sat Nov 29 10:31:48 2008
@@ -23,8 +23,9 @@
import java.security.Principal;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+//import org.apache.log4j.Level;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.event.WikiEvent;
@@ -118,7 +119,7 @@
public static final int PROFILE_NAME_CHANGED = 54;
/** The security logging service. */
- protected static final Logger log = Logger.getLogger( "SecurityLog" );
+ protected static final Logger log = LoggerFactory.getLogger( "SecurityLog" );
private final Principal m_principal;
@@ -152,19 +153,19 @@
}
this.m_principal = principal;
this.m_target = target;
- if ( log.isEnabledFor( Level.ERROR ) && ArrayUtils.contains( ERROR_EVENTS, type ) )
+ if ( log.isErrorEnabled() && ArrayUtils.contains( ERROR_EVENTS, type ) )
{
- log.error( this );
+ log.error( this.toString() );
}
- else if ( log.isEnabledFor( Level.WARN ) && ArrayUtils.contains( WARN_EVENTS, type ) )
+ else if ( log.isWarnEnabled() && ArrayUtils.contains( WARN_EVENTS, type ) )
{
- log.warn( this );
+ log.warn( this.toString() );
}
- else if ( log.isEnabledFor( Level.INFO ) && ArrayUtils.contains( INFO_EVENTS, type ) )
+ else if ( log.isInfoEnabled() && ArrayUtils.contains( INFO_EVENTS, type ) )
{
- log.info( this );
+ log.info( this.toString() );
}
- log.debug( this );
+ log.debug( this.toString() );
}
/**
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/FilterManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/FilterManager.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/FilterManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/FilterManager.java Sat Nov 29 10:31:48 2008
@@ -24,12 +24,12 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import java.util.*;
import net.sourceforge.stripes.util.ResolverUtil;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
@@ -43,8 +43,6 @@
import com.ecyrd.jspwiki.event.WikiPageEvent;
import com.ecyrd.jspwiki.modules.ModuleManager;
import com.ecyrd.jspwiki.modules.WikiModuleInfo;
-import com.ecyrd.jspwiki.plugin.WikiPlugin;
-import com.ecyrd.jspwiki.plugin.PluginManager.WikiPluginInfo;
import com.ecyrd.jspwiki.util.ClassUtil;
import com.ecyrd.jspwiki.util.PriorityList;
@@ -101,7 +99,7 @@
private HashMap<String, PageFilterInfo> m_filterClassMap = new HashMap<String,PageFilterInfo>();
- private static final Logger log = Logger.getLogger(WikiEngine.class);
+ private static final Logger log = LoggerFactory.getLogger(WikiEngine.class);
/** Property name for setting the filter XML property file. Value is <tt>{@value}</tt>. */
public static final String PROP_FILTERXML = "jspwiki.filterConfig";
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/PingWeblogsComFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/PingWeblogsComFilter.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/PingWeblogsComFilter.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/PingWeblogsComFilter.java Sat Nov 29 10:31:48 2008
@@ -26,7 +26,8 @@
import java.net.URL;
import java.net.MalformedURLException;
import java.util.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
/**
* A very dumb class that pings weblogs.com on each save. INTERNAL USE ONLY SO FAR!
@@ -39,7 +40,7 @@
public class PingWeblogsComFilter
extends BasicPageFilter
{
- static Logger log = Logger.getLogger( PingWeblogsComFilter.class );
+ static Logger log = LoggerFactory.getLogger( PingWeblogsComFilter.class );
private String m_pingURL;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/ProfanityFilter.java Sat Nov 29 10:31:48 2008
@@ -27,7 +27,8 @@
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.TextUtil;
import com.ecyrd.jspwiki.WikiContext;
@@ -42,7 +43,7 @@
@Deprecated
public class ProfanityFilter extends BasicPageFilter
{
- private static Logger log = Logger.getLogger(ProfanityFilter.class);
+ private static Logger log = LoggerFactory.getLogger(ProfanityFilter.class);
private static final String PROPERTYFILE = "com/ecyrd/jspwiki/filters/profanity.properties";
private static String[] c_profanities = new String[0];
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java Sat Nov 29 10:31:48 2008
@@ -33,7 +33,8 @@
import org.apache.commons.jrcs.diff.myers.MyersDiff;
import org.apache.commons.lang.time.StopWatch;
import org.apache.jspwiki.api.ModuleData;
-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.*;
@@ -146,8 +147,8 @@
private Date m_lastRebuild = new Date( 0L );
- private static Logger c_spamlog = Logger.getLogger( "SpamLog" );
- private static Logger log = Logger.getLogger( SpamFilter.class );
+ private static Logger c_spamlog = LoggerFactory.getLogger( "SpamLog" );
+ private static Logger log = LoggerFactory.getLogger( SpamFilter.class );
private Vector<Host> m_temporaryBanList = new Vector<Host>();
@@ -240,7 +241,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 pattern.");
}
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormOpen.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormOpen.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormOpen.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/forms/FormOpen.java Sat Nov 29 10:31:48 2008
@@ -68,8 +68,8 @@
public class FormOpen
extends FormElement
{
- private static org.apache.log4j.Logger log =
- org.apache.log4j.Logger.getLogger( FormOpen.class );
+ private static com.ecyrd.jspwiki.log.Logger log =
+ com.ecyrd.jspwiki.log.LoggerFactory.getLogger( FormOpen.class );
/** Parameter name for setting the method (GET or POST). Value is <tt>{@value}</tt>. */
public static final String PARAM_METHOD = "method";
Added: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/Logger.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/Logger.java?rev=721700&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/Logger.java (added)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/Logger.java Sat Nov 29 10:31:48 2008
@@ -0,0 +1,56 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ 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 com.ecyrd.jspwiki.log;
+
+/**
+ * This is just a plain wrapper around the slf4j logging interface.
+ *
+ * @author Harry Metske
+ * @since 3.0
+ */
+public interface Logger
+{
+
+ void error( String string );
+
+ void warn( String string );
+
+ void info( String string );
+
+ void debug( String string );
+
+ void error( String string, Throwable t );
+
+ void warn( String string, Throwable t );
+
+ void info( String string, Throwable t );
+
+ void debug( String string, Throwable t );
+
+ boolean isErrorEnabled();
+
+ boolean isWarnEnabled();
+
+ boolean isInfoEnabled();
+
+ boolean isDebugEnabled();
+
+}
Added: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerFactory.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerFactory.java?rev=721700&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerFactory.java (added)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerFactory.java Sat Nov 29 10:31:48 2008
@@ -0,0 +1,145 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ 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 com.ecyrd.jspwiki.log;
+
+import java.lang.management.ManagementFactory;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+
+import javax.management.ObjectName;
+
+import org.slf4j.bridge.SLF4JBridgeHandler;
+
+import com.ecyrd.jspwiki.Release;
+
+/**
+ * <p>
+ * Factory class for {@link com.ecyrd.jspwiki.log.Logger} objects
+ * </p>
+ * JSPWiki uses the slf4j facade for logging. See the <a
+ * href='http://www.slf4j.org'>slf4j website<a/> for details.
+ * <p>
+ * You can decide at runtime which logging framework to use by placing one of
+ * the slf4j wrapped implementations in WEB-INF/lib. By default, JSPWiki ships
+ * with a log4j implementation. The factory keeps a HashMap of all registered
+ * loggers to a maximum of 1000 Loggers. The static initializer calls the
+ * SLF4JBridgeHandler.install() which is a jul handler, that routes all incoming
+ * jul records to the slf4j API.
+ * </p>
+ *
+ * @author Harry Metske
+ * @since 3.0
+ */
+public class LoggerFactory
+{
+ private static boolean log4jPresent = true;
+
+ public static final String SLF4J_LOG4J_ADAPTER_CLASS = "org.slf4j.impl.Log4jLoggerAdapter";
+
+ public static final String LOG4J_LOGGER_CLASS = "org.apache.log4j.Logger";
+
+ private static HashMap<String, LoggerImpl> registeredLoggers = new HashMap<String, LoggerImpl>( 1000 );
+
+ static
+ {
+ SLF4JBridgeHandler.install();
+ }
+
+ /**
+ * @param loggerName
+ * @return <code>
+ */
+ public static final synchronized Logger getLogger( String loggerName )
+ {
+ if( registeredLoggers.get( loggerName ) == null )
+ {
+ LoggerImpl logger = new LoggerImpl( loggerName );
+ registeredLoggers.put( loggerName, logger );
+ if( log4jPresent )
+ {
+ registerLoggerMBean( loggerName );
+ }
+ return logger;
+ }
+ return registeredLoggers.get( loggerName );
+ }
+
+ /**
+ * Registers the Logger instance the the Platform MBeanServer. This gives
+ * the option of dynamically setting the loglevel for each individual logger
+ * using java's jconsole. It is only available if log4j is used as the
+ * logging implementation.
+ *
+ * @TODO It would be nice if we also had access to this from the Admin.jsp
+ * @param loggerName
+ */
+ private static void registerLoggerMBean( String loggerName )
+ {
+ // This is a real kludge, slf4j offers no programmatic access to the
+ // loglevels and no DynamicMBeans. log4j has them, so if the log4j adapter is on the
+ // classpath we use the log4j DynamicMBeans.
+ // At compile time we don't have log4j, so we use reflection to do the job.
+ //
+ try
+ {
+ // first instantiate the logger: Logger.getLogger(loggerName)
+ //
+ @SuppressWarnings("unused")
+ Object slf4j_log4j_Impl = Class.forName( SLF4J_LOG4J_ADAPTER_CLASS);
+ //
+ Object log4jLogger = Class.forName(LOG4J_LOGGER_CLASS );
+ Class loggerClass = Class.forName(LOG4J_LOGGER_CLASS );
+ Class[] parms = new Class[1];
+ parms[0] = new String().getClass();
+ Method getLoggerMethod = loggerClass.getMethod( "getLogger", parms );
+ log4jLogger = getLoggerMethod.invoke( log4jLogger, loggerName );
+ //
+ // then register the logger to the mbeanServer :
+ //
+ // mbeanServer.registerMBean( new LoggerDynamicMBean( logger ), mbeanName );
+ //
+ Object[] arglist = new Object[1];
+ arglist[0] = log4jLogger;
+ Class mbeanClass = Class.forName( "org.apache.log4j.jmx.LoggerDynamicMBean" );
+ Constructor constr = mbeanClass.getConstructor( loggerClass );
+ Object dynMBean = constr.newInstance( arglist );
+ ObjectName mbeanName = new ObjectName( Release.APPNAME + ":component=Loggers,name=" + loggerName );
+ ManagementFactory.getPlatformMBeanServer().registerMBean( dynMBean, mbeanName );
+ }
+ catch( ClassNotFoundException cnfe )
+ {
+ // apparently we cannot find the slf4j log4j adapter, so we assume there is no log4j
+ // available, so there is no use in registering MBeans
+ log4jPresent = false;
+ System.out.println( "Could not find class " +SLF4J_LOG4J_ADAPTER_CLASS + ", so no dynamic log configuration here :-(" );
+ }
+ catch( Exception e )
+ {
+ e.printStackTrace();
+ }
+ }
+
+ public static final Logger getLogger( Class clazz )
+ {
+ return getLogger( clazz.getName() );
+ }
+}
Added: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerImpl.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerImpl.java?rev=721700&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerImpl.java (added)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerImpl.java Sat Nov 29 10:31:48 2008
@@ -0,0 +1,102 @@
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ 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 com.ecyrd.jspwiki.log;
+
+import org.slf4j.Logger;
+
+/**
+ * An adapter class for slf4j Logging.
+ *
+ * @author Harry Metske
+ * @since 3.0
+ */
+public class LoggerImpl implements com.ecyrd.jspwiki.log.Logger
+{
+ Logger slf4jLogger = null;
+
+ /**
+ * @param loggerName
+ */
+ protected LoggerImpl( String loggerName )
+ {
+ slf4jLogger = org.slf4j.LoggerFactory.getLogger( loggerName );
+ }
+
+ public void error( String string )
+ {
+ slf4jLogger.error( string );
+ }
+
+ public void warn( String string )
+ {
+ slf4jLogger.warn( string );
+ }
+
+ public void info( String string )
+ {
+ slf4jLogger.info( string );
+ }
+
+ public void debug( String arg0 )
+ {
+ slf4jLogger.debug( arg0 );
+ }
+
+ public void error( String string, Throwable t )
+ {
+ slf4jLogger.error( string, t );
+ }
+
+ public void warn( String string, Throwable t )
+ {
+ slf4jLogger.warn( string, t );
+ }
+
+ public void info( String string, Throwable t )
+ {
+ slf4jLogger.info( string, t );
+ }
+
+ public void debug( String string, Throwable t )
+ {
+ slf4jLogger.debug( string, t );
+ }
+
+ public boolean isErrorEnabled()
+ {
+ return slf4jLogger.isErrorEnabled();
+ }
+
+ public boolean isWarnEnabled()
+ {
+ return slf4jLogger.isWarnEnabled();
+ }
+
+ public boolean isInfoEnabled()
+ {
+ return slf4jLogger.isInfoEnabled();
+ }
+
+ public boolean isDebugEnabled()
+ {
+ return slf4jLogger.isDebugEnabled();
+ }
+}
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/modules/ModuleManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/modules/ModuleManager.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/modules/ModuleManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/modules/ModuleManager.java Sat Nov 29 10:31:48 2008
@@ -23,7 +23,8 @@
import java.net.URL;
import java.util.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.jdom.Attribute;
import org.jdom.Document;
import org.jdom.JDOMException;
@@ -52,7 +53,7 @@
protected WikiEngine m_engine;
- private static Logger log = Logger.getLogger( ModuleManager.class );
+ private static Logger log = LoggerFactory.getLogger( ModuleManager.class );
private boolean m_loadIncompatibleModules = false;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java Sat Nov 29 10:31:48 2008
@@ -30,7 +30,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.*;
@@ -85,7 +86,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;
@@ -299,7 +300,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 );
@@ -1171,7 +1172,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/trunk/src/com/ecyrd/jspwiki/parser/LinkParser.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/LinkParser.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/LinkParser.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/LinkParser.java Sat Nov 29 10:31:48 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/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/AbstractReferralPlugin.java Sat Nov 29 10:31:48 2008
@@ -25,7 +25,8 @@
import java.util.*;
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.*;
@@ -56,7 +57,7 @@
public abstract class AbstractReferralPlugin
implements WikiPlugin
{
- private static Logger log = Logger.getLogger( AbstractReferralPlugin.class );
+ private static Logger log = LoggerFactory.getLogger( AbstractReferralPlugin.class );
/** Magic value for rendering all items. */
public static final int ALL_ITEMS = -1;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/BugReportHandler.java Sat Nov 29 10:31:48 2008
@@ -27,7 +27,8 @@
import java.text.SimpleDateFormat;
import java.util.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
@@ -52,7 +53,7 @@
public class BugReportHandler
implements WikiPlugin
{
- private static Logger log = Logger.getLogger( BugReportHandler.class );
+ private static Logger log = LoggerFactory.getLogger( BugReportHandler.class );
/** Parameter name for setting the title. Value is <tt>{@value}</tt>. */
public static final String PARAM_TITLE = "title";
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java Sat Nov 29 10:31:48 2008
@@ -40,7 +40,7 @@
public class Counter
implements WikiPlugin
{
- // private static Logger log = Logger.getLogger( Counter.class );
+ // private static Logger log = LoggerFactory.getLogger( Counter.class );
/** Parameter name for setting the name. Value is <tt>{@value}</tt>. */
public static final String PARAM_NAME = "name";
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java Sat Nov 29 10:31:48 2008
@@ -41,7 +41,7 @@
public class CurrentTimePlugin
implements WikiPlugin
{
- // private static Logger log = Logger.getLogger( CurrentTimePlugin.class );
+ // private static Logger log = LoggerFactory.getLogger( CurrentTimePlugin.class );
/**
* {@inheritDoc}
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Denounce.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Denounce.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Denounce.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Denounce.java Sat Nov 29 10:31:48 2008
@@ -23,7 +23,8 @@
package com.ecyrd.jspwiki.plugin;
import com.ecyrd.jspwiki.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.apache.oro.text.*;
import org.apache.oro.text.regex.*;
@@ -47,7 +48,7 @@
*/
public class Denounce implements WikiPlugin
{
- private static Logger log = Logger.getLogger(Denounce.class);
+ private static Logger log = LoggerFactory.getLogger(Denounce.class);
/** Parameter name for setting the link. Value is <tt>{@value}</tt>. */
public static final String PARAM_LINK = "link";
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java Sat Nov 29 10:31:48 2008
@@ -26,7 +26,8 @@
import org.apache.ecs.Element;
import org.apache.ecs.xhtml.div;
import org.apache.ecs.xhtml.span;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.providers.ProviderException;
@@ -44,7 +45,7 @@
*/
public class IndexPlugin extends AbstractReferralPlugin implements WikiPlugin
{
- private static Logger log = Logger.getLogger( IndexPlugin.class );
+ private static Logger log = LoggerFactory.getLogger( IndexPlugin.class );
/**
* {@inheritDoc}
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java Sat Nov 29 10:31:48 2008
@@ -29,9 +29,9 @@
import org.apache.commons.lang.ClassUtils;
import org.apache.ecs.xhtml.*;
import org.apache.jspwiki.api.ModuleData;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.apache.oro.text.regex.*;
-import org.jdom.Element;
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.modules.ModuleManager;
@@ -140,7 +140,7 @@
{
private static final String PLUGIN_INSERT_PATTERN = "\\{?(INSERT)?\\s*([\\w\\._]+)[ \\t]*(WHERE)?[ \\t]*";
- private static Logger log = Logger.getLogger( PluginManager.class );
+ private static Logger log = LoggerFactory.getLogger( PluginManager.class );
/**
* This is the default package to try in case the instantiation
@@ -212,7 +212,7 @@
}
catch( MalformedPatternException e )
{
- log.fatal("Internal error: someone messed with pluginmanager patterns.", e );
+ log.error("Internal error: someone messed with pluginmanager patterns.", e );
throw new InternalWikiException( "PluginManager patterns are broken" );
}
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RecentChangesPlugin.java Sat Nov 29 10:31:48 2008
@@ -25,7 +25,8 @@
import java.util.*;
import org.apache.ecs.xhtml.*;
-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,8 +64,7 @@
public static final String DEFAULT_TIME_FORMAT ="HH:mm:ss";
public static final String DEFAULT_DATE_FORMAT ="dd.MM.yyyy";
- private static Logger log = Logger.getLogger( RecentChangesPlugin.class );
-
+ private static Logger log = LoggerFactory.getLogger( RecentChangesPlugin.class );
private boolean isSameDay( Date a, Date b )
{
Calendar aa = Calendar.getInstance(); aa.setTime(a);
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java Sat Nov 29 10:31:48 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 org.apache.oro.text.regex.*;
import com.ecyrd.jspwiki.*;
@@ -45,7 +46,7 @@
*/
public class ReferredPagesPlugin implements WikiPlugin
{
- private static Logger log = Logger.getLogger( ReferredPagesPlugin.class );
+ private static Logger log = LoggerFactory.getLogger( ReferredPagesPlugin.class );
private WikiEngine m_engine;
private int m_depth;
private HashSet<String> m_exists = new HashSet<String>();
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java Sat Nov 29 10:31:48 2008
@@ -20,7 +20,8 @@
*/
package com.ecyrd.jspwiki.plugin;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.*;
import java.text.MessageFormat;
@@ -46,7 +47,7 @@
public class ReferringPagesPlugin
extends AbstractReferralPlugin
{
- private static Logger log = Logger.getLogger( ReferringPagesPlugin.class );
+ private static Logger log = LoggerFactory.getLogger( ReferringPagesPlugin.class );
/** Parameter name for setting the maximum items to show. Value is <tt>{@value}</tt>. */
public static final String PARAM_MAX = "max";
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Search.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Search.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Search.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Search.java Sat Nov 29 10:31:48 2008
@@ -26,7 +26,8 @@
import java.util.Map;
import org.apache.ecs.xhtml.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.SearchResult;
import com.ecyrd.jspwiki.WikiContext;
@@ -47,7 +48,7 @@
*/
public class Search implements WikiPlugin
{
- static Logger log = Logger.getLogger(Search.class);
+ static Logger log = LoggerFactory.getLogger(Search.class);
/** Parameter name for setting the query string. Value is <tt>{@value}</tt>. */
public static final String PARAM_QUERY = "query";
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/TableOfContents.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/TableOfContents.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/TableOfContents.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/TableOfContents.java Sat Nov 29 10:31:48 2008
@@ -20,7 +20,8 @@
*/
package com.ecyrd.jspwiki.plugin;
-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.Heading;
import com.ecyrd.jspwiki.parser.HeadingListener;
@@ -45,7 +46,7 @@
public class TableOfContents
implements WikiPlugin, HeadingListener
{
- private static Logger log = Logger.getLogger( TableOfContents.class );
+ private static Logger log = LoggerFactory.getLogger( TableOfContents.class );
/** Parameter name for setting the title. */
public static final String PARAM_TITLE = "title";
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java Sat Nov 29 10:31:48 2008
@@ -22,7 +22,8 @@
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.providers.ProviderException;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -39,7 +40,7 @@
*/
public class WeblogArchivePlugin implements WikiPlugin
{
- private static Logger log = Logger.getLogger(WeblogArchivePlugin.class);
+ private static Logger log = LoggerFactory.getLogger(WeblogArchivePlugin.class);
/** Parameter name for setting the page. Value is <tt>{@value}</tt>. */
public static final String PARAM_PAGE = "page";
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogEntryPlugin.java Sat Nov 29 10:31:48 2008
@@ -22,7 +22,8 @@
import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.providers.ProviderException;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -40,7 +41,7 @@
*/
public class WeblogEntryPlugin implements WikiPlugin
{
- private static Logger log = Logger.getLogger(WeblogEntryPlugin.class);
+ private static Logger log = LoggerFactory.getLogger(WeblogEntryPlugin.class);
private static final int MAX_BLOG_ENTRIES = 10000; // Just a precaution.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java Sat Nov 29 10:31:48 2008
@@ -35,7 +35,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.auth.AuthorizationManager;
@@ -77,7 +78,7 @@
public class WeblogPlugin
implements WikiPlugin, ParserStagePlugin
{
- private static Logger log = Logger.getLogger(WeblogPlugin.class);
+ private static Logger log = LoggerFactory.getLogger(WeblogPlugin.class);
private static final Pattern HEADINGPATTERN;
/** How many days are considered by default. Default value is {@value} */
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/preferences/Preferences.java Sat Nov 29 10:31:48 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;
@@ -55,7 +56,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/trunk/src/com/ecyrd/jspwiki/providers/AbstractFileProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/AbstractFileProvider.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/AbstractFileProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/AbstractFileProvider.java Sat Nov 29 10:31:48 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/trunk/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/BasicAttachmentProvider.java Sat Nov 29 10:31:48 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 );
/**
* {@inheritDoc}
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingAttachmentProvider.java Sat Nov 29 10:31:48 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/trunk/src/com/ecyrd/jspwiki/providers/CachingProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingProvider.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/CachingProvider.java Sat Nov 29 10:31:48 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/trunk/src/com/ecyrd/jspwiki/providers/FileSystemProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/FileSystemProvider.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/FileSystemProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/FileSystemProvider.java Sat Nov 29 10:31:48 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/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/RCSFileProvider.java Sat Nov 29 10:31:48 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>{@value}</tt>. */
public static final String PROP_CHECKIN = "jspwiki.rcsFileProvider.checkinCommand";
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/VersioningFileProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/VersioningFileProvider.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/VersioningFileProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/providers/VersioningFileProvider.java Sat Nov 29 10:31:48 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/trunk/src/com/ecyrd/jspwiki/render/CleanTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/CleanTextRenderer.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/CleanTextRenderer.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/CleanTextRenderer.java Sat Nov 29 10:31:48 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/trunk/src/com/ecyrd/jspwiki/render/RenderingManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/RenderingManager.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/RenderingManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/RenderingManager.java Sat Nov 29 10:31:48 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/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/atom/AtomAPIServlet.java Sat Nov 29 10:31:48 2008
@@ -30,7 +30,8 @@
import java.util.Date;
import java.util.Collection;
import java.util.Iterator;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.intabulas.sandler.*;
import org.intabulas.sandler.exceptions.*;
import org.intabulas.sandler.elements.*;
@@ -51,7 +52,7 @@
// FIXME: Rewrite using some other library
public class AtomAPIServlet extends HttpServlet
{
- static final Logger log = Logger.getLogger( AtomAPIServlet.class );
+ static final Logger log = LoggerFactory.getLogger( AtomAPIServlet.class );
private static final long serialVersionUID = 0L;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/json/JSONRPCManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/json/JSONRPCManager.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/json/JSONRPCManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rpc/json/JSONRPCManager.java Sat Nov 29 10:31:48 2008
@@ -29,7 +29,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
@@ -173,7 +174,7 @@
static class WikiJSONAccessor implements InvocationCallback
{
private static final long serialVersionUID = 1L;
- private static final Logger log = Logger.getLogger( WikiJSONAccessor.class );
+ private static final Logger log = LoggerFactory.getLogger( WikiJSONAccessor.class );
/**
* Create an accessor.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java Sat Nov 29 10:31:48 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/trunk/src/com/ecyrd/jspwiki/rss/RSSThread.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSThread.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSThread.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSThread.java Sat Nov 29 10:31:48 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();
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/BasicSearchProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/BasicSearchProvider.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/BasicSearchProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/BasicSearchProvider.java Sat Nov 29 10:31:48 2008
@@ -27,7 +27,8 @@
import java.util.StringTokenizer;
import java.util.TreeSet;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.NoRequiredPropertyException;
import com.ecyrd.jspwiki.QueryItem;
@@ -48,7 +49,7 @@
*/
public class BasicSearchProvider implements SearchProvider
{
- private static final Logger log = Logger.getLogger(BasicSearchProvider.class);
+ private static final Logger log = LoggerFactory.getLogger(BasicSearchProvider.class);
private WikiEngine m_engine;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java Sat Nov 29 10:31:48 2008
@@ -24,7 +24,8 @@
import java.util.*;
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.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.document.Document;
@@ -64,7 +65,7 @@
*/
public class LuceneSearchProvider implements SearchProvider
{
- protected static final Logger log = Logger.getLogger(LuceneSearchProvider.class);
+ protected static final Logger log = LoggerFactory.getLogger(LuceneSearchProvider.class);
private WikiEngine m_engine;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java Sat Nov 29 10:31:48 2008
@@ -24,7 +24,8 @@
import java.util.*;
import org.apache.commons.lang.time.StopWatch;
-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.event.WikiEvent;
@@ -51,7 +52,7 @@
extends BasicPageFilter
implements InternalModule, WikiEventListener
{
- private static final Logger log = Logger.getLogger(SearchManager.class);
+ private static final Logger log = LoggerFactory.getLogger(SearchManager.class);
private static final String DEFAULT_SEARCHPROVIDER = "com.ecyrd.jspwiki.search.LuceneSearchProvider";
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AttachmentsIteratorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AttachmentsIteratorTag.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AttachmentsIteratorTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AttachmentsIteratorTag.java Sat Nov 29 10:31:48 2008
@@ -25,7 +25,8 @@
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.WikiEngine;
import com.ecyrd.jspwiki.WikiContext;
@@ -51,7 +52,7 @@
{
private static final long serialVersionUID = 0L;
- static Logger log = Logger.getLogger( AttachmentsIteratorTag.class );
+ static Logger log = LoggerFactory.getLogger( AttachmentsIteratorTag.class );
/**
* {@inheritDoc}
@@ -114,7 +115,7 @@
}
catch( ProviderException e )
{
- log.fatal("Provider failed while trying to iterator through history",e);
+ log.error("Provider failed while trying to iterator through history",e);
// FIXME: THrow something.
}
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/BreadcrumbsTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/BreadcrumbsTag.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/BreadcrumbsTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/BreadcrumbsTag.java Sat Nov 29 10:31:48 2008
@@ -25,7 +25,8 @@
import javax.servlet.http.HttpSession;
import javax.servlet.jsp.JspWriter;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import java.io.IOException;
import java.io.Serializable;
@@ -52,7 +53,7 @@
{
private static final long serialVersionUID = 0L;
- private static final Logger log = Logger.getLogger(BreadcrumbsTag.class);
+ private static final Logger log = LoggerFactory.getLogger(BreadcrumbsTag.class);
private static final String BREADCRUMBTRAIL_KEY = "breadCrumbTrail";
private int m_maxQueueSize = 11;
private String m_separator = ", ";
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CookieTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CookieTag.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CookieTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CookieTag.java Sat Nov 29 10:31:48 2008
@@ -34,7 +34,8 @@
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
/**
@@ -99,7 +100,7 @@
{
private static final long serialVersionUID = 0L;
- private static Logger log = Logger.getLogger( CookieTag.class );
+ private static Logger log = LoggerFactory.getLogger( CookieTag.class );
/** Name of the cookie value. Required. */
private String m_name;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/EditorIteratorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/EditorIteratorTag.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/EditorIteratorTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/EditorIteratorTag.java Sat Nov 29 10:31:48 2008
@@ -23,7 +23,8 @@
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
@@ -42,7 +43,7 @@
{
private static final long serialVersionUID = 0L;
- static Logger log = Logger.getLogger( EditorIteratorTag.class );
+ static Logger log = LoggerFactory.getLogger( EditorIteratorTag.class );
public final int doStartTag()
{
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/HasAttachmentsTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/HasAttachmentsTag.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/HasAttachmentsTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/HasAttachmentsTag.java Sat Nov 29 10:31:48 2008
@@ -56,7 +56,7 @@
}
catch( ProviderException e )
{
- log.fatal("Provider failed while trying to check for attachements",e);
+ log.error("Provider failed while trying to check for attachements",e);
// FIXME: THrow something.
}
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/HistoryIteratorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/HistoryIteratorTag.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/HistoryIteratorTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/HistoryIteratorTag.java Sat Nov 29 10:31:48 2008
@@ -25,7 +25,8 @@
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.WikiEngine;
import com.ecyrd.jspwiki.WikiContext;
@@ -49,7 +50,7 @@
{
private static final long serialVersionUID = 0L;
- static Logger log = Logger.getLogger( HistoryIteratorTag.class );
+ static Logger log = LoggerFactory.getLogger( HistoryIteratorTag.class );
public final int doStartTag()
{
@@ -95,7 +96,7 @@
}
catch( ProviderException e )
{
- log.fatal("Provider failed while trying to iterator through history",e);
+ log.error("Provider failed while trying to iterator through history",e);
// FIXME: THrow something.
}
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/IteratorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/IteratorTag.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/IteratorTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/IteratorTag.java Sat Nov 29 10:31:48 2008
@@ -29,7 +29,8 @@
import javax.servlet.jsp.tagext.TryCatchFinally;
import javax.servlet.jsp.PageContext;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiPage;
@@ -53,7 +54,7 @@
protected Iterator m_iterator;
protected WikiContext m_wikiContext;
- private static Logger log = Logger.getLogger( IteratorTag.class );
+ private static Logger log = LoggerFactory.getLogger( IteratorTag.class );
/**
* Sets the collection that is used to form the iteration.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SearchResultIteratorTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SearchResultIteratorTag.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SearchResultIteratorTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SearchResultIteratorTag.java Sat Nov 29 10:31:48 2008
@@ -27,7 +27,8 @@
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.PageContext;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.SearchResult;
import com.ecyrd.jspwiki.WikiContext;
@@ -56,7 +57,7 @@
private int m_count = 0;
private int m_start = 0;
- static Logger log = Logger.getLogger(SearchResultIteratorTag.class);
+ static Logger log = LoggerFactory.getLogger(SearchResultIteratorTag.class);
public void release()
{
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/TranslateTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/TranslateTag.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/TranslateTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/TranslateTag.java Sat Nov 29 10:31:48 2008
@@ -26,9 +26,9 @@
import javax.servlet.jsp.tagext.BodyTagSupport;
import com.ecyrd.jspwiki.WikiContext;
-import com.ecyrd.jspwiki.WikiPage;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
/**
* Converts the body text into HTML content.
@@ -40,7 +40,7 @@
{
private static final long serialVersionUID = 0L;
- static Logger log = Logger.getLogger( TranslateTag.class );
+ static Logger log = LoggerFactory.getLogger( TranslateTag.class );
public final int doAfterBody()
throws JspException
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/WikiBodyTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/WikiBodyTag.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/WikiBodyTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/WikiBodyTag.java Sat Nov 29 10:31:48 2008
@@ -27,7 +27,8 @@
import javax.servlet.jsp.tagext.BodyTagSupport;
import javax.servlet.jsp.tagext.TryCatchFinally;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.WikiContext;
@@ -41,7 +42,7 @@
implements TryCatchFinally
{
protected WikiContext m_wikiContext;
- static Logger log = Logger.getLogger( WikiBodyTag.class );
+ static Logger log = LoggerFactory.getLogger( WikiBodyTag.class );
public int doStartTag() throws JspException
{
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/WikiTagBase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/WikiTagBase.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/WikiTagBase.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/WikiTagBase.java Sat Nov 29 10:31:48 2008
@@ -25,7 +25,8 @@
import javax.servlet.jsp.tagext.TagSupport;
import javax.servlet.jsp.tagext.TryCatchFinally;
-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;
@@ -45,7 +46,7 @@
{
public static final String ATTR_CONTEXT = "jspwiki.context";
- static Logger log = Logger.getLogger( WikiTagBase.class );
+ static Logger log = LoggerFactory.getLogger( WikiTagBase.class );
protected WikiContext m_wikiContext;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/CommandResolver.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/CommandResolver.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/CommandResolver.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/CommandResolver.java Sat Nov 29 10:31:48 2008
@@ -28,7 +28,8 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.InternalWikiException;
import com.ecyrd.jspwiki.TextUtil;
@@ -95,7 +96,7 @@
}
}
- private final Logger m_log = Logger.getLogger( CommandResolver.class );
+ private final Logger m_log = LoggerFactory.getLogger( CommandResolver.class );
private final WikiEngine m_engine;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/EditorManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/EditorManager.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/EditorManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/EditorManager.java Sat Nov 29 10:31:48 2008
@@ -25,7 +25,8 @@
import javax.servlet.jsp.PageContext;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
@@ -85,7 +86,7 @@
private Map<String, WikiEditorInfo> m_editors;
- private static Logger log = Logger.getLogger( EditorManager.class );
+ private static Logger log = LoggerFactory.getLogger( EditorManager.class );
public EditorManager( WikiEngine engine )
{
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/TemplateManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/TemplateManager.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/TemplateManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/TemplateManager.java Sat Nov 29 10:31:48 2008
@@ -33,7 +33,8 @@
import javax.servlet.jsp.jstl.fmt.LocaleSupport;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.InternalWikiException;
import com.ecyrd.jspwiki.WikiContext;
@@ -116,7 +117,7 @@
// private Cache m_propertyCache;
- protected static final Logger log = Logger.getLogger(TemplateManager.class);
+ protected static final Logger log = LoggerFactory.getLogger(TemplateManager.class);
/** Requests a HTTP header. Value is {@value}. */
public static final String RESOURCE_HTTPHEADER = "httpheader";
@@ -289,7 +290,7 @@
{
if( name == null || template == null )
{
- log.fatal("findJSP() was asked to find a null template or name ("+template+","+name+")."+
+ log.error("findJSP() was asked to find a null template or name ("+template+","+name+")."+
" JSP page '"+
((HttpServletRequest)pageContext.getRequest()).getRequestURI()+"'");
throw new InternalWikiException("Illegal arguments to findJSP(); please check logs.");
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java Sat Nov 29 10:31:48 2008
@@ -27,7 +27,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
-import org.apache.log4j.NDC;
+import org.slf4j.MDC;
import com.ecyrd.jspwiki.TextUtil;
import com.ecyrd.jspwiki.WikiContext;
@@ -86,7 +86,7 @@
WatchDog w = m_engine.getCurrentWatchDog();
try
{
- NDC.push( m_engine.getApplicationName()+":"+((HttpServletRequest)request).getRequestURI() );
+ MDC.put( m_engine.getApplicationName() + ":" + ((HttpServletRequest) request).getRequestURI(), "WikiJSPFilter" );
w.enterState("Filtering for URL "+((HttpServletRequest)request).getRequestURI(), 90 );
HttpServletResponseWrapper responseWrapper;
@@ -148,8 +148,7 @@
finally
{
w.exitState();
- NDC.pop();
- NDC.remove();
+ MDC.remove( m_engine.getApplicationName() + ":" + ((HttpServletRequest) request).getRequestURI() );
}
}
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java Sat Nov 29 10:31:48 2008
@@ -27,8 +27,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
-import org.apache.log4j.Logger;
-import org.apache.log4j.NDC;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
+import org.slf4j.MDC;
import com.ecyrd.jspwiki.WikiContext;
import com.ecyrd.jspwiki.WikiEngine;
@@ -56,7 +57,7 @@
*/
public class WikiServletFilter implements Filter
{
- protected static final Logger log = Logger.getLogger( WikiServletFilter.class );
+ protected static final Logger log = LoggerFactory.getLogger( WikiServletFilter.class );
protected WikiEngine m_engine = null;
/**
@@ -169,14 +170,13 @@
try
{
- NDC.push( m_engine.getApplicationName()+":"+httpRequest.getRequestURL() );
+ MDC.put( m_engine.getApplicationName() + ":" + ((HttpServletRequest) request).getRequestURI(), "WikiServletFilter" );
chain.doFilter( httpRequest, response );
}
finally
{
- NDC.pop();
- NDC.remove();
+ MDC.remove( m_engine.getApplicationName() + ":" + ((HttpServletRequest) request).getRequestURI() );
}
}
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java Sat Nov 29 10:31:48 2008
@@ -28,7 +28,8 @@
import javax.management.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.Release;
import com.ecyrd.jspwiki.WikiEngine;
@@ -54,7 +55,7 @@
private MBeanServer m_mbeanServer = null;
- private static Logger log = Logger.getLogger(AdminBeanManager.class);
+ private static Logger log = LoggerFactory.getLogger(AdminBeanManager.class);
public AdminBeanManager( WikiEngine engine )
{
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/beans/PluginBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/beans/PluginBean.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/beans/PluginBean.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/beans/PluginBean.java Sat Nov 29 10:31:48 2008
@@ -62,7 +62,6 @@
return CORE;
}
- @SuppressWarnings("unchecked")
public String doGet(WikiContext context)
{
Collection<WikiPluginInfo> plugins = m_engine.getPluginManager().modules();
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/beans/SearchManagerBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/beans/SearchManagerBean.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/beans/SearchManagerBean.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/beans/SearchManagerBean.java Sat Nov 29 10:31:48 2008
@@ -45,7 +45,7 @@
private static final String[] METHODS = { "reload" };
- // private static Logger log = Logger.getLogger( SearchManagerBean.class );
+ // private static Logger log = LoggerFactory.getLogger( SearchManagerBean.class );
private WikiBackgroundThread m_updater;
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java Sat Nov 29 10:31:48 2008
@@ -24,7 +24,8 @@
import java.util.Map;
import java.util.UUID;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.rpc.RPCCallable;
import com.ecyrd.jspwiki.rpc.json.JSONRPCManager;
@@ -47,7 +48,7 @@
*/
public static final String JSON_PROGRESSTRACKER = "progressTracker";
- private static Logger log = Logger.getLogger( ProgressManager.class );
+ private static Logger log = LoggerFactory.getLogger( ProgressManager.class );
/**
* Creates a new ProgressManager.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java Sat Nov 29 10:31:48 2008
@@ -25,7 +25,8 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.InternalWikiException;
import com.ecyrd.jspwiki.TextUtil;
@@ -44,7 +45,7 @@
{
private static final String DEFAULT_PREFIX = "wiki/";
- static Logger log = Logger.getLogger( ShortURLConstructor.class );
+ static Logger log = LoggerFactory.getLogger( ShortURLConstructor.class );
/**
* Contains the path part after the JSPWiki base URL
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java Sat Nov 29 10:31:48 2008
@@ -25,7 +25,8 @@
import java.lang.reflect.InvocationTargetException;
import java.util.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.input.SAXBuilder;
@@ -41,7 +42,7 @@
*/
public final class ClassUtil
{
- private static final Logger log = Logger.getLogger(ClassUtil.class);
+ private static final Logger log = LoggerFactory.getLogger(ClassUtil.class);
/**
* The location of the classmappings.xml document. It will be searched for
* in the classpath. It's value is "{@value}".
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/HttpUtil.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/HttpUtil.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/HttpUtil.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/HttpUtil.java Sat Nov 29 10:31:48 2008
@@ -28,7 +28,8 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.WikiPage;
@@ -39,7 +40,7 @@
*/
public final class HttpUtil
{
- static Logger log = Logger.getLogger( HttpUtil.class );
+ static Logger log = LoggerFactory.getLogger( HttpUtil.class );
/**
* Private constructor to prevent direct instantiation.
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/MailUtil.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/MailUtil.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/MailUtil.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/MailUtil.java Sat Nov 29 10:31:48 2008
@@ -31,7 +31,8 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-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.WikiEngine;
@@ -203,7 +204,7 @@
private static final String PROP_MAIL_AUTH = "mail.smtp.auth";
- protected static final Logger log = Logger.getLogger(MailUtil.class);
+ protected static final Logger log = LoggerFactory.getLogger(MailUtil.class);
protected static final String DEFAULT_MAIL_JNDI_NAME = "mail/Session";
@@ -296,7 +297,7 @@
}
catch (MessagingException e)
{
- log.error(e);
+ log.error(e.toString());
throw e;
}
}