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:27:24 UTC
svn commit: r721911 - in
/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki:
ui/ ui/admin/ ui/admin/beans/ ui/progress/ util/
Author: ajaquith
Date: Sun Nov 30 14:27:23 2008
New Revision: 721911
URL: http://svn.apache.org/viewvc?rev=721911&view=rev
Log:
Partial merge with trunk...
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/EditorManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/TemplateManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/admin/beans/PluginBean.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/admin/beans/SearchManagerBean.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/ClassUtil.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/HttpUtil.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/MailUtil.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/UtilJ2eeCompat.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/WatchDog.java
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/EditorManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/EditorManager.java?rev=721911&r1=721910&r2=721911&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/EditorManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/EditorManager.java Sun Nov 30 14:27:23 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/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/TemplateManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/TemplateManager.java?rev=721911&r1=721910&r2=721911&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/TemplateManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/TemplateManager.java Sun Nov 30 14:27:23 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;
@@ -117,7 +118,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";
@@ -290,7 +291,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/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java?rev=721911&r1=721910&r2=721911&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiJSPFilter.java Sun Nov 30 14:27:23 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;
@@ -151,8 +151,7 @@
finally
{
w.exitState();
- NDC.pop();
- NDC.remove();
+ MDC.remove( m_engine.getApplicationName() + ":" + ((HttpServletRequest) request).getRequestURI() );
}
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java?rev=721911&r1=721910&r2=721911&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java Sun Nov 30 14:27:23 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/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java?rev=721911&r1=721910&r2=721911&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java Sun Nov 30 14:27:23 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/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/admin/beans/PluginBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/admin/beans/PluginBean.java?rev=721911&r1=721910&r2=721911&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/admin/beans/PluginBean.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/admin/beans/PluginBean.java Sun Nov 30 14:27:23 2008
@@ -62,7 +62,6 @@
return CORE;
}
- @SuppressWarnings("unchecked")
public String doGet(WikiContext context)
{
Collection<WikiPluginInfo> plugins = m_engine.getPluginManager().modules();
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/admin/beans/SearchManagerBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/admin/beans/SearchManagerBean.java?rev=721911&r1=721910&r2=721911&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/admin/beans/SearchManagerBean.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/admin/beans/SearchManagerBean.java Sun Nov 30 14:27:23 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/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java?rev=721911&r1=721910&r2=721911&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java Sun Nov 30 14:27:23 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/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/ClassUtil.java?rev=721911&r1=721910&r2=721911&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/ClassUtil.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/ClassUtil.java Sun Nov 30 14:27:23 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/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/HttpUtil.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/HttpUtil.java?rev=721911&r1=721910&r2=721911&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/HttpUtil.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/HttpUtil.java Sun Nov 30 14:27:23 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/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/MailUtil.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/MailUtil.java?rev=721911&r1=721910&r2=721911&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/MailUtil.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/MailUtil.java Sun Nov 30 14:27:23 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;
}
}
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/UtilJ2eeCompat.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/UtilJ2eeCompat.java?rev=721911&r1=721910&r2=721911&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/UtilJ2eeCompat.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/UtilJ2eeCompat.java Sun Nov 30 14:27:23 2008
@@ -20,14 +20,15 @@
*/
package com.ecyrd.jspwiki.util;
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
/**
* Misc J2EE Compatibility Utility Functions
*/
public class UtilJ2eeCompat
{
- private static Logger log = Logger.getLogger( UtilJ2eeCompat.class.getName() );
+ private static Logger log = LoggerFactory.getLogger( UtilJ2eeCompat.class.getName() );
public static final String TOMCAT = "Apache Tomcat";
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/WatchDog.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/WatchDog.java?rev=721911&r1=721910&r2=721911&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/WatchDog.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/WatchDog.java Sun Nov 30 14:27:23 2008
@@ -23,7 +23,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;
import com.ecyrd.jspwiki.WikiEngine;
@@ -54,7 +55,7 @@
private boolean m_enabled = true;
private WikiEngine m_engine;
- private Logger log = Logger.getLogger(WatchDog.class.getName());
+ private static final Logger log = LoggerFactory.getLogger(WatchDog.class.getName());
private static HashMap<Integer,WeakReference<WatchDog>> c_kennel =
new HashMap<Integer,WeakReference<WatchDog>>();