You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2008/11/30 23:24:27 UTC
svn commit: r721909 - in
/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH: etc/
etc/i18n/templates/ lib/ src/com/ecyrd/jspwiki/ src/com/ecyrd/jspwiki/dav/
src/com/ecyrd/jspwiki/event/ src/com/ecyrd/jspwiki/forms/
src/com/ecyrd/jspwiki/log/
Author: ajaquith
Date: Sun Nov 30 14:24:27 2008
New Revision: 721909
URL: http://svn.apache.org/viewvc?rev=721909&view=rev
Log:
Partial merge with trunk...
Added:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/log4j.properties
- copied, changed from r721902, incubator/jspwiki/trunk/etc/log4j.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/jcl-over-slf4j-1.5.6.jar (props changed)
- copied unchanged from r721902, incubator/jspwiki/trunk/lib/jcl-over-slf4j-1.5.6.jar
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/jul-to-slf4j-1.5.6.jar (props changed)
- copied unchanged from r721902, incubator/jspwiki/trunk/lib/jul-to-slf4j-1.5.6.jar
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/slf4j-api-1.5.6.jar (props changed)
- copied unchanged from r721902, incubator/jspwiki/trunk/lib/slf4j-api-1.5.6.jar
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/slf4j-log4j12-1.5.6.jar (props changed)
- copied unchanged from r721902, incubator/jspwiki/trunk/lib/slf4j-log4j12-1.5.6.jar
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/log/
- copied from r721902, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/log/Logger.java
- copied unchanged from r721902, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/Logger.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/log/LoggerFactory.java
- copied unchanged from r721902, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerFactory.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/log/LoggerImpl.java
- copied unchanged from r721902, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/LoggerImpl.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/log/package.html
- copied unchanged from r721902, incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/log/package.html
Removed:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/commons-logging-api.jar
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/slf4j-api-1.5.5.jar
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/slf4j-log4j12-1.5.5.jar
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_de.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/jspwiki.properties.tmpl
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/FileUtil.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/PageManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiServlet.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiSession.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/event/WikiEventManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/event/WikiSecurityEvent.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/forms/FormOpen.java
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default.properties?rev=721909&r1=721908&r2=721909&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default.properties Sun Nov 30 14:24:27 2008
@@ -623,8 +623,8 @@
javascript.edit.areyousure=Without clicking the Save button, your changes will be lost. \
Are you sure you want to exit this page?
-javascript.favs.show=Click to show Favorites
-javascript.favs.hide=Click to hide Favorites
+javascript.favorites.show=Click to show the Favorites
+javascript.favorites.hide=Click to hide the Favorites
javascript.quick.edit=[Edit]
javascript.quick.edit.title=Edit section {0}...
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_de.properties?rev=721909&r1=721908&r2=721909&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_de.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_de.properties Sun Nov 30 14:24:27 2008
@@ -615,8 +615,8 @@
javascript.edit.areyousure=Wenn du nicht speicherst, werden deine Änderungen verloren gehen. Bist du sicher, \
dass du die Seite verlassen willst?
-javascript.favs.show=Favoriten einblenden
-javascript.favs.hide=Favoriten ausblenden
+javascript.favorites.show=Klicke, um die Favoriten einzublenden.
+javascript.favorites.hide=Klicke, um die Favoriten auszublenden.
javascript.quick.edit=[Abschnitt bearbeiten]
javascript.quick.edit.title=Abschnitt \'{0}\' bearbeiten...
@@ -671,4 +671,7 @@
Seiten, deren Zugangsberechtigungslisten (ACLs) diese Gruppe enthalten, nicht mehr zugreifen.\\n\\n \
Wenn du auf OK klickst, wird diese Gruppe sofort gelöscht!
# seit v2.7.0-alpha-12
-prefs.user.editorareaheight=Höhe des Editorbereichs
\ No newline at end of file
+prefs.user.editorareaheight=Höhe des Editorbereichs
+# seit v3.0.0-svn-14
+javascript.favs.show=Favoriten einblenden
+javascript.favs.hide=Favoriten ausblenden
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/jspwiki.properties.tmpl
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/jspwiki.properties.tmpl?rev=721909&r1=721908&r2=721909&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/jspwiki.properties.tmpl (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/jspwiki.properties.tmpl Sun Nov 30 14:24:27 2008
@@ -748,85 +748,8 @@
###########################################################################
#
-# Configure logs. See log4j documentation for more information
-# on how you can configure the logs.
+# all log4j configuration statements have been moved to a separate file, log4j.properties
#
-# Log4j is available at http://jakarta.apache.org/log4j
-#
-# WARNING WARNING WILL ROBINSON: If you turn on DEBUG logging, be aware
-# that some security-sensitive information will be logged (such as session IDs).
-# Please be careful.
-#
-# Send mail to root on all problems containing warnings.
-#
-#log4j.appender.mail = org.apache.log4j.net.SMTPAppender
-#log4j.appender.mail.Threshold = WARN
-#log4j.appender.mail.To = root@localhost
-#log4j.appender.mail.From = JSPWiki@localhost
-#log4j.appender.mail.Subject = Problem with JSPWiki!
-#log4j.appender.mail.SMTPHost = mail
-
-#log4j.appender.mail.layout = org.apache.log4j.PatternLayout
-#log4j.appender.mail.layout.ConversionPattern =%d [%t] %p %c %x - %m%n
-
-#
-# Log everything into a file, roll it over every 10 MB, keep
-# only 14 latest ones.
-#
-log4j.appender.FileLog = org.apache.log4j.RollingFileAppender
-log4j.appender.FileLog.MaxFileSize = 10MB
-log4j.appender.FileLog.MaxBackupIndex = 14
-log4j.appender.FileLog.File = @logfile@
-log4j.appender.FileLog.layout = org.apache.log4j.PatternLayout
-log4j.appender.FileLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
-
-#
-# If you want to use some other logging system (such as JBoss, which uses
-# log4j already, comment this line out. If you just don't want any logs
-# at all, you can set it to be empty. However, I suggest that you do
-# at least to a level of WARN.
-#
-log4j.rootCategory=INFO,FileLog
-
-# Enable if you're using mailing, above.
-#log4j.rootCategory=INFO,FileLog,mail
-
-#
-# Uncomment these lines if you want to see detailed security event logging.
-# The logging levels are as follows:
-# ERROR: login errors (other than failed/expired logins)
-# WARN: access denied, failed login (account expired, password/credential expired)
-# INFO: login, logout
-# DEBUG: add/remove group, add/remove group member, clear groups/group members, access allowed
-#
-#log4j.logger.SecurityLog=INFO, SecurityAppender
-#log4j.appender.SecurityAppender = org.apache.log4j.RollingFileAppender
-#log4j.appender.SecurityAppender.MaxFileSize = 10MB
-#log4j.appender.SecurityAppender.MaxBackupIndex = 14
-#log4j.appender.SecurityAppender.File = @securitylog@
-#log4j.appender.SecurityAppender.layout = org.apache.log4j.PatternLayout
-#log4j.appender.SecurityAppender.layout.ConversionPattern=%d %p - %m%n
-
-# Enable this if you want to debug the Stripes framework
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
-log4j.rootLogger=INFO, stdout
-log4j.logger.net.sourceforge.stripes=DEBUG
-
-#
-# Uncomment these lines if you wish to receive detailed spam
-# filter logging.
-#
-#log4j.logger.SpamLog=INFO,SpamAppender
-#log4j.appender.SpamAppender = org.apache.log4j.RollingFileAppender
-#log4j.appender.SpamAppender.MaxFileSize = 10MB
-#log4j.appender.SpamAppender.MaxBackupIndex = 14
-#log4j.appender.SpamAppender.File = @spamlog@
-#log4j.appender.SpamAppender.layout = org.apache.log4j.PatternLayout
-#log4j.appender.SpamAppender.layout.ConversionPattern=%d{ISO8601} %m%n
-
###########################################################################
#
# Workflow configuration
Copied: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/log4j.properties (from r721902, incubator/jspwiki/trunk/etc/log4j.properties)
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/log4j.properties?p2=incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/log4j.properties&p1=incubator/jspwiki/trunk/etc/log4j.properties&r1=721902&r2=721909&rev=721909&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/log4j.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/log4j.properties Sun Nov 30 14:24:27 2008
@@ -75,3 +75,11 @@
#log4j.appender.SpamAppender.File = @spamlog@
#log4j.appender.SpamAppender.layout = org.apache.log4j.PatternLayout
#log4j.appender.SpamAppender.layout.ConversionPattern=%d{ISO8601} %m%n
+
+# Enable this if you want to debug the Stripes framework
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+log4j.rootLogger=INFO, stdout
+log4j.logger.net.sourceforge.stripes=DEBUG
Propchange: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/jcl-over-slf4j-1.5.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/jul-to-slf4j-1.5.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/slf4j-api-1.5.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/lib/slf4j-log4j12-1.5.6.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/FileUtil.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/FileUtil.java?rev=721909&r1=721908&r2=721909&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/FileUtil.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/FileUtil.java Sun Nov 30 14:24:27 2008
@@ -28,7 +28,8 @@
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CodingErrorAction;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
/**
* Generic utilities related to file and stream handling.
@@ -38,7 +39,7 @@
{
/** Size of the buffer used when copying large chunks of data. */
private static final int BUFFER_SIZE = 4096;
- private static final Logger log = Logger.getLogger(FileUtil.class);
+ private static final Logger log = LoggerFactory.getLogger(FileUtil.class);
/**
* Private constructor prevents instantiation.
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/PageManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/PageManager.java?rev=721909&r1=721908&r2=721909&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/PageManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/PageManager.java Sun Nov 30 14:24:27 2008
@@ -26,7 +26,8 @@
import java.util.*;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.auth.WikiPrincipal;
import com.ecyrd.jspwiki.auth.WikiSecurityException;
@@ -109,7 +110,7 @@
/** Fact name for storing whether the user is authenticated or not. Value is {@value}. */
public static final String FACT_IS_AUTHENTICATED = "fact.isAuthenticated";
- static Logger log = Logger.getLogger( PageManager.class );
+ static Logger log = LoggerFactory.getLogger( PageManager.class );
private WikiPageProvider m_provider;
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java?rev=721909&r1=721908&r2=721909&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java Sun Nov 30 14:24:27 2008
@@ -35,8 +35,9 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.time.StopWatch;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
+//import org.apache.log4j.PropertyConfigurator;
import com.ecyrd.jspwiki.action.WikiActionBeanContext;
import com.ecyrd.jspwiki.action.WikiContextFactory;
@@ -93,12 +94,12 @@
{
private static final String ATTR_WIKIENGINE = "com.ecyrd.jspwiki.WikiEngine";
- private static final Logger log = Logger.getLogger(WikiEngine.class);
+ private static final Logger log = LoggerFactory.getLogger(WikiEngine.class);
/** True, if log4j has been configured. */
// FIXME: If you run multiple applications, the first application
// to run defines where the log goes. Not what we want.
- private static boolean c_configured = false;
+// private static boolean c_configured = false;
/** Stores properties. */
private Properties m_properties;
@@ -427,14 +428,14 @@
// the property file, we do not do any property setting
// either.q
//
- if( !c_configured )
- {
- if( props.getProperty("log4j.rootCategory") != null )
- {
- PropertyConfigurator.configure( props );
- }
- c_configured = true;
- }
+// if( !c_configured )
+// {
+// if( props.getProperty("log4j.rootCategory") != null )
+// {
+// PropertyConfigurator.configure( props );
+// }
+// c_configured = true;
+// }
log.info("*******************************************");
log.info(Release.APPNAME+" "+Release.getVersionString()+" starting. Whee!");
@@ -485,7 +486,7 @@
}
catch( SecurityException e )
{
- log.fatal("Unable to find or create the working directory: "+m_workDir,e);
+ log.error("Unable to find or create the working directory: "+m_workDir,e);
throw new IllegalArgumentException("Unable to find or create the working dir: "+m_workDir);
}
@@ -599,29 +600,29 @@
catch( RuntimeException e )
{
// RuntimeExceptions may occur here, even if they shouldn't.
- log.fatal( "Failed to start managers.", e );
+ log.error( "Failed to start managers.", e );
throw new WikiException( "Failed to start managers: "+e.getMessage() );
}
catch (ClassNotFoundException e)
{
- log.fatal( "JSPWiki could not start, URLConstructor was not found: ",e );
+ log.error( "JSPWiki could not start, URLConstructor was not found: ",e );
throw new WikiException(e.getMessage());
}
catch (InstantiationException e)
{
- log.fatal( "JSPWiki could not start, URLConstructor could not be instantiated: ",e );
+ log.error( "JSPWiki could not start, URLConstructor could not be instantiated: ",e );
throw new WikiException(e.getMessage());
}
catch (IllegalAccessException e)
{
- log.fatal( "JSPWiki could not start, URLConstructor cannot be accessed: ",e );
+ log.error( "JSPWiki could not start, URLConstructor cannot be accessed: ",e );
throw new WikiException(e.getMessage());
}
catch( Exception e )
{
// Final catch-all for everything
- log.fatal( "JSPWiki could not start, due to an unknown exception when starting.",e );
+ log.error( "JSPWiki could not start, due to an unknown exception when starting.",e );
throw new WikiException("Failed to start; please check log files for better information.");
}
@@ -699,7 +700,7 @@
}
catch( ProviderException e )
{
- log.fatal("PageProvider is unable to list pages: ", e);
+ log.error("PageProvider is unable to list pages: ", e);
}
}
@@ -946,7 +947,7 @@
}
catch( UnsupportedEncodingException e )
{
- log.fatal( "Unsupported encoding", e );
+ log.error( "Unsupported encoding", e );
return "";
}
@@ -998,7 +999,7 @@
}
catch( UnsupportedEncodingException e )
{
- log.fatal( "Unsupported encoding", e );
+ log.error( "Unsupported encoding", e );
return "";
}
}
@@ -2327,7 +2328,7 @@
}
catch ( WikiException we )
{
- log.fatal( "unable to instantiate class for AclManager: " + we.getMessage() );
+ log.error( "unable to instantiate class for AclManager: " + we.getMessage() );
throw new InternalWikiException("Cannot instantiate AclManager, please check logs.");
}
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiServlet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiServlet.java?rev=721909&r1=721908&r2=721909&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiServlet.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiServlet.java Sun Nov 30 14:24:27 2008
@@ -24,7 +24,8 @@
import javax.servlet.http.*;
import java.io.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
import com.ecyrd.jspwiki.url.DefaultURLConstructor;
@@ -41,7 +42,7 @@
{
private static final long serialVersionUID = 3258410651167633973L;
private WikiEngine m_engine;
- static final Logger log = Logger.getLogger(WikiServlet.class.getName());
+ static final Logger log = LoggerFactory.getLogger(WikiServlet.class.getName());
/**
* {@inheritDoc}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiSession.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiSession.java?rev=721909&r1=721908&r2=721909&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiSession.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiSession.java Sun Nov 30 14:24:27 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.auth.*;
import com.ecyrd.jspwiki.auth.authorize.Group;
@@ -102,7 +103,7 @@
private static final int DOT = 46;
- private static final Logger log = Logger.getLogger( WikiSession.class );
+ private static final Logger log = LoggerFactory.getLogger( WikiSession.class );
private static final String ALL = "*";
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java?rev=721909&r1=721908&r2=721909&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/dav/AttachmentDavProvider.java Sun Nov 30 14:24:27 2008
@@ -25,7 +25,8 @@
import java.util.Collections;
import java.util.Iterator;
-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;
@@ -39,7 +40,7 @@
public class AttachmentDavProvider implements DavProvider
{
protected WikiEngine m_engine;
- protected static final Logger log = Logger.getLogger( AttachmentDavProvider.class );
+ protected static final Logger log = LoggerFactory.getLogger( AttachmentDavProvider.class );
public AttachmentDavProvider( WikiEngine engine )
{
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/event/WikiEventManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/event/WikiEventManager.java?rev=721909&r1=721908&r2=721909&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/event/WikiEventManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/event/WikiEventManager.java Sun Nov 30 14:24:27 2008
@@ -24,7 +24,8 @@
import java.lang.ref.WeakReference;
import java.util.*;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
/**
* A singleton class that manages the addition and removal of WikiEvent
@@ -145,7 +146,7 @@
*/
public final class WikiEventManager
{
- private static final Logger log = Logger.getLogger(WikiEventManager.class);
+ private static final Logger log = LoggerFactory.getLogger(WikiEventManager.class);
/* If true, permits a WikiEventMonitor to be set. */
private static boolean c_permitMonitor = false;
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/event/WikiSecurityEvent.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/event/WikiSecurityEvent.java?rev=721909&r1=721908&r2=721909&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/event/WikiSecurityEvent.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/event/WikiSecurityEvent.java Sun Nov 30 14:24:27 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/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/forms/FormOpen.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/forms/FormOpen.java?rev=721909&r1=721908&r2=721909&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/forms/FormOpen.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/forms/FormOpen.java Sun Nov 30 14:24:27 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";