jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject svn commit: r721700 [3/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/...
Date Sat, 29 Nov 2008 18:32:06 GMT
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/UtilJ2eeCompat.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/UtilJ2eeCompat.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/UtilJ2eeCompat.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/UtilJ2eeCompat.java Sat Nov 29 10:31:48 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/trunk/src/com/ecyrd/jspwiki/util/WatchDog.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/WatchDog.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/WatchDog.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/WatchDog.java Sat Nov 29 10:31:48 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 Logger log = LoggerFactory.getLogger(WatchDog.class.getName());
 
     private static HashMap<Integer,WeakReference<WatchDog>> c_kennel = 
         new HashMap<Integer,WeakReference<WatchDog>>();

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/MetaWeblogHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/MetaWeblogHandler.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/MetaWeblogHandler.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/MetaWeblogHandler.java Sat Nov 29 10:31:48 2008
@@ -23,7 +23,8 @@
 import java.io.ByteArrayInputStream;
 import java.util.*;
 
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
 import org.apache.xmlrpc.XmlRpcException;
 
 import com.ecyrd.jspwiki.PageTimeComparator;
@@ -55,7 +56,7 @@
 public class MetaWeblogHandler
     implements WikiRPCHandler
 {
-    private static Logger log = Logger.getLogger( MetaWeblogHandler.class ); 
+    private static Logger log = LoggerFactory.getLogger( MetaWeblogHandler.class ); 
 
     private WikiContext m_context;
     

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java Sat Nov 29 10:31:48 2008
@@ -23,7 +23,8 @@
 import java.io.UnsupportedEncodingException;
 import java.util.*;
 
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
 import org.apache.xmlrpc.XmlRpcException;
 
 import com.ecyrd.jspwiki.*;
@@ -42,7 +43,7 @@
 public class RPCHandler
     extends AbstractRPCHandler
 {
-    private static Logger log = Logger.getLogger( RPCHandler.class ); 
+    private static Logger log = LoggerFactory.getLogger( RPCHandler.class ); 
 
     /**
      *  {@inheritDoc}
@@ -84,7 +85,7 @@
             //  use UTF-8.  We revert to platform default, so that the other
             //  end might have a chance of getting something.
             //
-            log.fatal("Platform does not support UTF-8, reverting to platform default");
+            log.error("Platform does not support UTF-8, reverting to platform default");
             return src.getBytes();
         }
     }

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCServlet.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCServlet.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCServlet.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCServlet.java Sat Nov 29 10:31:48 2008
@@ -32,7 +32,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
 import org.apache.xmlrpc.*;
 
 import com.ecyrd.jspwiki.WikiContext;
@@ -61,7 +62,7 @@
     private WikiEngine       m_engine;
     private XmlRpcServer     m_xmlrpcServer = new XmlRpcServer();
 
-    static Logger log = Logger.getLogger( RPCServlet.class );
+    static Logger log = LoggerFactory.getLogger( RPCServlet.class );
 
     public void initHandler( String prefix, String handlerName )
         throws ClassNotFoundException,
@@ -104,7 +105,7 @@
         }
         catch( Exception e )
         {
-            log.fatal("Unable to start RPC interface: ", e);
+            log.error("Unable to start RPC interface: ", e);
             throw new ServletException( "No RPC interface", e );
         }
     }

Modified: incubator/jspwiki/trunk/src/webdocs/Captcha.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Captcha.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Captcha.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Captcha.jsp Sat Nov 29 10:31:48 2008
@@ -1,17 +1,19 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="org.apache.commons.httpclient.*" %>
 <%@ page import="org.apache.commons.httpclient.methods.*" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.util.*" %>
 <%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
 <%@ page import="org.apache.commons.lang.time.StopWatch" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <fmt:setBundle basename="CoreResources"/>
 
 <%!
-    Logger log = Logger.getLogger("JSPWiki");
+    Logger log = LoggerFactory.getLogger("JSPWiki");
 %>
 <%
     WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );

Modified: incubator/jspwiki/trunk/src/webdocs/Comment.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Comment.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Comment.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Comment.jsp Sat Nov 29 10:31:48 2008
@@ -1,4 +1,5 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.filters.*" %>
 <%@ page import="java.util.*" %>
@@ -16,7 +17,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%!
-    Logger log = Logger.getLogger("JSPWiki");
+    Logger log = LoggerFactory.getLogger("JSPWiki");
 
 	String findParam( PageContext ctx, String key )
 	{

Modified: incubator/jspwiki/trunk/src/webdocs/Delete.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Delete.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Delete.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Delete.jsp Sat Nov 29 10:31:48 2008
@@ -1,4 +1,5 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="java.util.*" %>
 <%@ page import="com.ecyrd.jspwiki.attachment.Attachment" %>
@@ -6,7 +7,7 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 
 <%! 
-    Logger log = Logger.getLogger("JSPWiki");
+    Logger log = LoggerFactory.getLogger("JSPWiki");
 %>
 
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp Sat Nov 29 10:31:48 2008
@@ -1,4 +1,5 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.NoSuchPrincipalException" %>
 <%@ page import="com.ecyrd.jspwiki.auth.WikiSecurityException" %>
@@ -7,7 +8,7 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 
 <%! 
-    Logger log = Logger.getLogger("JSPWiki");
+    Logger log = LoggerFactory.getLogger("JSPWiki");
 %>
 
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/Diff.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Diff.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Diff.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Diff.jsp Sat Nov 29 10:31:48 2008
@@ -1,4 +1,5 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.util.*" %>
 <%@ page import="com.ecyrd.jspwiki.tags.InsertDiffTag" %>
@@ -6,7 +7,7 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 
 <%! 
-    Logger log = Logger.getLogger("JSPWiki"); 
+    Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>
 
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/Edit.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Edit.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Edit.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Edit.jsp Sat Nov 29 10:31:48 2008
@@ -1,4 +1,5 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.filters.*" %>
 <%@ page import="java.util.*" %>
@@ -9,7 +10,7 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 
 <%!
-    Logger log = Logger.getLogger("JSPWiki");
+    Logger log = LoggerFactory.getLogger("JSPWiki");
 
     String findParam( PageContext ctx, String key )
     {

Modified: incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp Sat Nov 29 10:31:48 2008
@@ -1,4 +1,5 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.WikiSecurityException" %>
 <%@ page import="com.ecyrd.jspwiki.auth.authorize.Group" %>
@@ -6,7 +7,7 @@
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%! 
-    Logger log = Logger.getLogger("JSPWiki"); 
+    Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>
 
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/Error.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Error.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Error.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Error.jsp Sat Nov 29 10:31:48 2008
@@ -1,9 +1,10 @@
 <%@ page isErrorPage="true" %>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%! 
-    Logger log = Logger.getLogger("JSPWiki"); 
+    Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>
 <%
     WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );

Modified: incubator/jspwiki/trunk/src/webdocs/Group.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Group.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Group.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Group.jsp Sat Nov 29 10:31:48 2008
@@ -1,4 +1,5 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.NoSuchPrincipalException" %>
 <%@ page import="com.ecyrd.jspwiki.auth.WikiSecurityException" %>
@@ -7,7 +8,7 @@
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%! 
-    Logger log = Logger.getLogger("JSPWiki"); 
+    Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>
 
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/Install.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Install.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Install.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Install.jsp Sat Nov 29 10:31:48 2008
@@ -3,14 +3,15 @@
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.AuthenticationManager" %>
 <%@ page import="com.ecyrd.jspwiki.ui.Installer" %>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="java.util.ResourceBundle" %>
 <%@ page import="java.text.MessageFormat" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <fmt:setBundle basename="CoreResources"/>
 
 <%!
-    Logger log = Logger.getLogger("JSPWiki"); 
+    Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>
 
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/Login.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Login.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Login.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Login.jsp Sat Nov 29 10:31:48 2008
@@ -1,4 +1,5 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="java.security.Principal" %>
 <%@ page import="com.ecyrd.jspwiki.auth.*" %>
@@ -12,7 +13,7 @@
 <%@ page import="java.util.*" %>
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%!
-    Logger log = Logger.getLogger("JSPWiki");
+    Logger log = LoggerFactory.getLogger("JSPWiki");
 %>
 <%
     WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );

Modified: incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp Sat Nov 29 10:31:48 2008
@@ -1,4 +1,5 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.tags.WikiTagBase" %>
 <%@ page errorPage="/Error.jsp" %>
@@ -12,7 +13,7 @@
        container-managed authentication is in force, the container
        will prevent direct access to it.
      */
-    Logger log = Logger.getLogger("JSPWiki"); 
+    Logger log = LoggerFactory.getLogger("JSPWiki"); 
 
 %>
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp Sat Nov 29 10:31:48 2008
@@ -1,4 +1,5 @@
-<%@ page import="org.apache.log4j.*"%>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*"%>
 <%@ page import="java.util.*"%>
 <%@ page import="java.text.*"%>
@@ -11,7 +12,7 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki"%>
 <%@ page import="com.ecyrd.jspwiki.tags.WikiTagBase"%>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*"%>
-<%!Logger log = Logger.getLogger( "JSPWiki" );
+<%!Logger log = LoggerFactory.getLogger( "JSPWiki" );
 
     String message = null;
 

Modified: incubator/jspwiki/trunk/src/webdocs/Message.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Message.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Message.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Message.jsp Sat Nov 29 10:31:48 2008
@@ -1,10 +1,11 @@
 <%@ page isErrorPage="true" %>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.tags.WikiTagBase" %>
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%! 
-    Logger log = Logger.getLogger("JSPWiki"); 
+    Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>
 <%
     WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );

Modified: incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp Sat Nov 29 10:31:48 2008
@@ -1,10 +1,11 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.plugin.*" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%! 
-    Logger log = Logger.getLogger("JSPWiki"); 
+    Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>
 
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp Sat Nov 29 10:31:48 2008
@@ -1,4 +1,5 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.NoSuchPrincipalException" %>
 <%@ page import="com.ecyrd.jspwiki.auth.WikiSecurityException" %>
@@ -9,7 +10,7 @@
 <%@ page import="java.util.*" %>
 <%@ page import="java.text.*" %>
 <%! 
-    Logger log = Logger.getLogger("JSPWiki"); 
+    Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>
 
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp Sat Nov 29 10:31:48 2008
@@ -1,11 +1,12 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.util.*" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 
 <%! 
-    Logger log = Logger.getLogger("JSPWiki"); 
+    Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>
 
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/PageModified.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/PageModified.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/PageModified.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/PageModified.jsp Sat Nov 29 10:31:48 2008
@@ -1,4 +1,5 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="org.apache.commons.lang.*" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
@@ -6,7 +7,7 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 
 <%! 
-    Logger log = Logger.getLogger("JSPWiki");
+    Logger log = LoggerFactory.getLogger("JSPWiki");
 %>
 
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/Preview.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Preview.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Preview.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Preview.jsp Sat Nov 29 10:31:48 2008
@@ -1,4 +1,5 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.filters.*" %>
 <%@ page import="java.util.Date" %>
@@ -6,7 +7,7 @@
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%! 
-    Logger log = Logger.getLogger("JSPWiki"); 
+    Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>
 
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/Rename.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Rename.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Rename.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Rename.jsp Sat Nov 29 10:31:48 2008
@@ -1,4 +1,5 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
@@ -7,7 +8,7 @@
 <%@ page import="java.text.*" %>
 <fmt:setBundle basename="CoreResources"/>
 <%!
-    Logger log = Logger.getLogger("JSPWiki");
+    Logger log = LoggerFactory.getLogger("JSPWiki");
 %>
 
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/Search.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Search.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Search.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Search.jsp Sat Nov 29 10:31:48 2008
@@ -1,4 +1,5 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.permissions.*" %>
@@ -7,7 +8,7 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 
 <%! 
-    Logger log = Logger.getLogger("JSPWikiSearch");
+    Logger log = LoggerFactory.getLogger("JSPWikiSearch");
 %>
 
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp Sat Nov 29 10:31:48 2008
@@ -1,11 +1,12 @@
 <%@ page import="java.util.*,com.ecyrd.jspwiki.*" %>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="java.text.*" %>
 <%@ page import="com.ecyrd.jspwiki.rss.*" %>
 <%@ page import="com.ecyrd.jspwiki.util.*" %>
 <%@ taglib uri="/WEB-INF/oscache.tld" prefix="oscache" %>
 <%!
-    Logger log = Logger.getLogger("JSPWiki");
+    Logger log = LoggerFactory.getLogger("JSPWiki");
 %>
 <%
     /*

Modified: incubator/jspwiki/trunk/src/webdocs/Upload.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Upload.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Upload.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Upload.jsp Sat Nov 29 10:31:48 2008
@@ -1,11 +1,12 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 
 
 <%! 
-    Logger log = Logger.getLogger("JSPWiki"); 
+    Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>
 
 <% 

Modified: incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp Sat Nov 29 10:31:48 2008
@@ -1,4 +1,5 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.VariableManager" %>
 <%@ page import="com.ecyrd.jspwiki.WikiContext" %>
 <%@ page import="com.ecyrd.jspwiki.WikiSession" %>
@@ -16,7 +17,7 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 
 <%! 
-    Logger log = Logger.getLogger("JSPWiki"); 
+    Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>
 
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/Wiki.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Wiki.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Wiki.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Wiki.jsp Sat Nov 29 10:31:48 2008
@@ -1,11 +1,12 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.util.*" %>
 <%@ page import="org.apache.commons.lang.time.StopWatch" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%! 
-    Logger log = Logger.getLogger("JSPWiki"); 
+    Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>
 
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/Workflow.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Workflow.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Workflow.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Workflow.jsp Sat Nov 29 10:31:48 2008
@@ -1,6 +1,7 @@
 <%@ page import="java.util.Collection" %>
 <%@ page import="java.util.Iterator" %>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.WikiContext" %>
 <%@ page import="com.ecyrd.jspwiki.WikiSession" %>
 <%@ page import="com.ecyrd.jspwiki.WikiEngine" %>
@@ -13,7 +14,7 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 
 <%! 
-    Logger log = Logger.getLogger("JSPWiki"); 
+    Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>
 
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/admin/Admin.jsp Sat Nov 29 10:31:48 2008
@@ -1,4 +1,5 @@
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.ui.admin.*" %>
 <%@page import="com.ecyrd.jspwiki.ui.TemplateManager"%>
@@ -6,7 +7,7 @@
 <%@ page errorPage="/Error.jsp" %>
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%! 
-    Logger log = Logger.getLogger("JSPWiki"); 
+    Logger log = LoggerFactory.getLogger("JSPWiki"); 
 %>
 <%
     String bean = request.getParameter("bean");

Modified: incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/admin/SecurityConfig.jsp Sat Nov 29 10:31:48 2008
@@ -1,6 +1,7 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%@ page import="java.security.Principal" %>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.*" %>
 <%@ page errorPage="/Error.jsp" %>
@@ -9,7 +10,7 @@
   {
     wiki = WikiEngine.getInstance( getServletConfig() );
   }
-  Logger log = Logger.getLogger("JSPWiki"); 
+  Logger log = LoggerFactory.getLogger("JSPWiki"); 
   WikiEngine wiki;
   SecurityVerifier verifier;
 %>

Modified: incubator/jspwiki/trunk/src/webdocs/rss.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/rss.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/rss.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/rss.jsp Sat Nov 29 10:31:48 2008
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <%@ page import="java.util.*,com.ecyrd.jspwiki.*" %>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="java.text.*" %>
 <%@ page import="com.ecyrd.jspwiki.rss.*" %>
 <%@ page import="com.ecyrd.jspwiki.util.*" %>
@@ -9,7 +9,7 @@
 <%@ taglib uri="/WEB-INF/oscache.tld" prefix="oscache" %>
 
 <%!
-    Logger log = Logger.getLogger("JSPWiki");
+    Logger log = LoggerFactory.getLogger("JSPWiki");
     Cache m_cache = new Cache( true, false, false, true, 
                                "com.opensymphony.oscache.base.algorithm.LRUCache", 256 );
 %>

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp Sat Nov 29 10:31:48 2008
@@ -1,6 +1,7 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%@ page language="java" pageEncoding="UTF-8"%>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.*" %>
 <%@ page import="com.ecyrd.jspwiki.auth.permissions.*" %>
@@ -11,7 +12,7 @@
   {
     wiki = WikiEngine.getInstance( getServletConfig() );
   }
-  Logger log = Logger.getLogger("JSPWikiSearch");
+  Logger log = LoggerFactory.getLogger("JSPWikiSearch");
   WikiEngine wiki;
 %>
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXSearch.jsp Sat Nov 29 10:31:48 2008
@@ -1,6 +1,7 @@
 <%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
 <%@ page language="java" pageEncoding="UTF-8"%>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
 <%@ page import="com.ecyrd.jspwiki.ui.*" %>
 <%@ page import="java.util.*" %>
@@ -19,7 +20,7 @@
   {
     wiki = WikiEngine.getInstance( getServletConfig() );
   }
-  Logger log = Logger.getLogger("JSPWikiSearch");
+  Logger log = LoggerFactory.getLogger("JSPWikiSearch");
   WikiEngine wiki;
 %>
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditGroupContent.jsp Sat Nov 29 10:31:48 2008
@@ -5,13 +5,14 @@
 <%@ page import="com.ecyrd.jspwiki.auth.PrincipalComparator" %>
 <%@ page import="com.ecyrd.jspwiki.auth.authorize.Group" %>
 <%@ page import="com.ecyrd.jspwiki.*" %>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%@ page errorPage="/Error.jsp" %>
 <fmt:setLocale value="${prefs.Language}" />
 <fmt:setBundle basename="templates.default"/>
 <%!
-    Logger log = Logger.getLogger("JSPWiki");
+    Logger log = LoggerFactory.getLogger("JSPWiki");
 %>
 
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/GroupContent.jsp Sat Nov 29 10:31:48 2008
@@ -7,13 +7,14 @@
 <%@ page import="com.ecyrd.jspwiki.auth.authorize.Group" %>
 <%@ page import="com.ecyrd.jspwiki.auth.authorize.GroupManager" %>
 <%@ page import="com.ecyrd.jspwiki.preferences.Preferences" %>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <fmt:setLocale value="${prefs.Language}" />
 <fmt:setBundle basename="templates.default"/>
 <%!
-  Logger log = Logger.getLogger("JSPWiki");
+  Logger log = LoggerFactory.getLogger("JSPWiki");
 %>
 
 <%

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/GroupTab.jsp Sat Nov 29 10:31:48 2008
@@ -8,7 +8,8 @@
 <%@ page import="com.ecyrd.jspwiki.auth.authorize.Group" %>
 <%@ page import="com.ecyrd.jspwiki.auth.authorize.GroupManager" %>
 <%@ page import="com.ecyrd.jspwiki.preferences.Preferences" %>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
+<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
 <%@ page errorPage="/Error.jsp" %>
 <%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/AllTests.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/AllTests.java Sat Nov 29 10:31:48 2008
@@ -1,40 +1,13 @@
 
 package com.ecyrd.jspwiki;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.log4j.PropertyConfigurator;
-
 public class AllTests extends TestCase
 {
-    //
-    //  Ensure everything runs properly and that we can locate all necessary
-    //  thingies.
-    //
-    static
-    {
-        Properties props = new Properties();
-        try
-        {
-            InputStream pin = TestEngine.findTestProperties();
-            if( pin == null )
-            {
-                fail( "No property file found!" );
-            }
-            props.load( pin );
-            PropertyConfigurator.configure(props);
-        }
-        catch( IOException e ) 
-        {
-        }
-    }
-
+ 
     public AllTests( String s )
     {
         super( s );

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/FileUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/FileUtilTest.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/FileUtilTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/FileUtilTest.java Sat Nov 29 10:31:48 2008
@@ -3,23 +3,13 @@
 
 import junit.framework.*;
 import java.io.*;
-import java.util.*;
-import org.apache.log4j.*;
 
 public class FileUtilTest extends TestCase
 {
     public FileUtilTest( String s )
     {
         super( s );
-        Properties props = new Properties();
-        try
-        {
-            props.load( TestEngine.findTestProperties() );
-            PropertyConfigurator.configure(props);
-        }
-        catch( IOException e ) {}
     }
-
     public void setUp()
         throws Exception
     {

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageManagerTest.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/PageManagerTest.java Sat Nov 29 10:31:48 2008
@@ -7,8 +7,6 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.log4j.PropertyConfigurator;
-
 import com.ecyrd.jspwiki.PageManager;
 import com.ecyrd.jspwiki.providers.CachingProvider;
 
@@ -27,7 +25,6 @@
         throws Exception
     {
         props.load( TestEngine.findTestProperties() );
-        PropertyConfigurator.configure(props);
         engine = new TestEngine(props);
     }
 

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/ReferenceManagerTest.java Sat Nov 29 10:31:48 2008
@@ -199,8 +199,6 @@
         assertTrue( "Foobar unreferenced", c.size()==1 && ((String) c.iterator().next()).equals("TestPage") );
 
         c = mgr.findReferrers( "Foobar" );
-        Iterator it = c.iterator();
-        String s1 = (String)it.next();
         assertTrue( "Foobar referrers", 
                     c.size()==2 );
     }
@@ -239,9 +237,6 @@
         Collection c = mgr.findReferrers( "Foobars" );
         assertEquals( "Foobars referrers count", 2, c.size() );
 
-        Iterator i = c.iterator();
-        String first = (String) i.next();
-
         assertTrue( "Foobars referrers", 
                     c.contains("TestPage") && c.contains("Foobar"));
     }

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestEngine.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestEngine.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestEngine.java Sat Nov 29 10:31:48 2008
@@ -10,7 +10,8 @@
 import net.sourceforge.stripes.mock.MockHttpSession;
 import net.sourceforge.stripes.mock.MockServletContext;
 
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
 
 import com.ecyrd.jspwiki.attachment.Attachment;
 import com.ecyrd.jspwiki.auth.AuthenticationManager;
@@ -24,7 +25,7 @@
  */
 public class TestEngine extends WikiEngine
 {
-    static Logger log = Logger.getLogger( TestEngine.class );
+    static Logger log = LoggerFactory.getLogger( TestEngine.class );
 
     private WikiSession m_adminWikiSession = null;
     private WikiSession m_janneWikiSession = null;

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/VariableManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/VariableManagerTest.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/VariableManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/VariableManagerTest.java Sat Nov 29 10:31:48 2008
@@ -4,7 +4,6 @@
 import junit.framework.*;
 import java.io.*;
 import java.util.*;
-import org.apache.log4j.*;
 
 public class VariableManagerTest extends TestCase
 {
@@ -25,7 +24,6 @@
         try
         {
             props.load( TestEngine.findTestProperties() );
-            PropertyConfigurator.configure(props);
 
             m_variableManager = new VariableManager( props );
             TestEngine testEngine = new TestEngine( props );

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/attachment/AttachmentManagerTest.java Sat Nov 29 10:31:48 2008
@@ -64,8 +64,8 @@
         TestEngine.deleteTestPage( NAME1 );
         TestEngine.deleteTestPage( NAMEU );
 
-        m_engine.deleteAttachments(NAME1);
-        m_engine.deleteAttachments(NAMEU);
+        TestEngine.deleteAttachments(NAME1);
+        TestEngine.deleteAttachments(NAMEU);
 
         TestEngine.emptyWorkDir();
     }

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/user/UserProfileTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/user/UserProfileTest.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/user/UserProfileTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/user/UserProfileTest.java Sat Nov 29 10:31:48 2008
@@ -7,8 +7,6 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.log4j.PropertyConfigurator;
-
 import com.ecyrd.jspwiki.TestEngine;
 import com.ecyrd.jspwiki.WikiEngine;
 
@@ -25,7 +23,6 @@
     {
             Properties props = new Properties();
             props.load( TestEngine.findTestProperties() );
-            PropertyConfigurator.configure(props);
             WikiEngine engine  = new TestEngine(props);
             m_db = engine.getUserManager().getUserDatabase();
     }

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/AttachmentDavProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/AttachmentDavProviderTest.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/AttachmentDavProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/dav/AttachmentDavProviderTest.java Sat Nov 29 10:31:48 2008
@@ -30,7 +30,7 @@
 
     protected void tearDown() throws Exception
     {
-        engine.deleteAttachments( "TestPage" );
+        TestEngine.deleteAttachments( "TestPage" );
         TestEngine.deleteTestPage("TestPage");
     }
 

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/diff/ContextualDiffProviderTest.java Sat Nov 29 10:31:48 2008
@@ -7,8 +7,6 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.log4j.PropertyConfigurator;
-
 import com.ecyrd.jspwiki.*;
 
 public class ContextualDiffProviderTest extends TestCase
@@ -179,7 +177,6 @@
         diff.initialize(null, props);
 
         props.load( TestEngine.findTestProperties() );
-        PropertyConfigurator.configure(props);
         TestEngine engine = new TestEngine(props);
         
         WikiContext ctx = new WikiContext( engine, new WikiPage(engine,"Dummy") );

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/filters/FilterManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/filters/FilterManagerTest.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/filters/FilterManagerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/filters/FilterManagerTest.java Sat Nov 29 10:31:48 2008
@@ -4,8 +4,6 @@
 import junit.framework.*;
 import java.util.*;
 
-import org.apache.log4j.*;
-
 import com.ecyrd.jspwiki.*;
 
 public class FilterManagerTest extends TestCase
@@ -23,7 +21,6 @@
         throws Exception
     {
         props.load( TestEngine.findTestProperties() );
-        PropertyConfigurator.configure(props);
         engine = new TestEngine(props);
     }
 

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java Sat Nov 29 10:31:48 2008
@@ -65,7 +65,7 @@
             String name = (String) i.next();
 
             TestEngine.deleteTestPage(name);
-            testEngine.deleteAttachments(name);
+            TestEngine.deleteAttachments(name);
         }
 
         created.clear();

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CachingProviderTest.java Sat Nov 29 10:31:48 2008
@@ -9,8 +9,6 @@
 import java.io.StringReader;
 import java.util.*;
 
-import org.apache.log4j.*;
-
 import com.ecyrd.jspwiki.*;
 
 public class CachingProviderTest extends TestCase
@@ -24,11 +22,6 @@
         throws Exception
     {
         TestEngine.emptyWorkDir();
-
-        Properties props2 = new Properties();
-
-        props2.load( TestEngine.findTestProperties() );
-        PropertyConfigurator.configure(props2);
     }
 
     public void tearDown()

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CounterProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CounterProvider.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CounterProvider.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CounterProvider.java Sat Nov 29 10:31:48 2008
@@ -22,7 +22,8 @@
 
 import java.util.*;
 
-import org.apache.log4j.*;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
 
 import com.ecyrd.jspwiki.*;
 
@@ -38,7 +39,7 @@
     public int m_getAllPagesCalls = 0;
     public int m_initCalls        = 0;
 
-    static Logger log = Logger.getLogger( CounterProvider.class );
+    static Logger log = LoggerFactory.getLogger( CounterProvider.class );
 
     WikiPage[]    m_pages         = new WikiPage[0];
     

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/FileSystemProviderTest.java Sat Nov 29 10:31:48 2008
@@ -5,8 +5,6 @@
 import java.io.*;
 import java.util.*;
 
-import org.apache.log4j.*;
-
 import com.ecyrd.jspwiki.*;
 
 public class FileSystemProviderTest extends TestCase
@@ -28,15 +26,10 @@
     {
         m_pagedir = System.getProperties().getProperty("java.io.tmpdir");
 
-        Properties props2 = new Properties();
-
         props.setProperty( PageManager.PROP_PAGEPROVIDER, "FileSystemProvider" );
         props.setProperty( FileSystemProvider.PROP_PAGEDIR, 
                            m_pagedir );
 
-        props2.load( TestEngine.findTestProperties() );
-        PropertyConfigurator.configure(props2);
-        
         m_engine = new TestEngine(props);
 
         m_provider = new FileSystemProvider();

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/MailUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/MailUtilTest.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/MailUtilTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/MailUtilTest.java Sat Nov 29 10:31:48 2008
@@ -10,8 +10,6 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.log4j.PropertyConfigurator;
-
 import com.ecyrd.jspwiki.TestEngine;
 import com.ecyrd.jspwiki.WikiContext;
 import com.ecyrd.jspwiki.WikiPage;
@@ -51,7 +49,6 @@
         throws Exception
     {
         m_props.load( TestEngine.findTestProperties() );
-        PropertyConfigurator.configure(m_props);
         
         TestEngine testEngine = new TestEngine( m_props );
         

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/web/TestContainer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/web/TestContainer.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/web/TestContainer.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/web/TestContainer.java Sat Nov 29 10:31:48 2008
@@ -29,7 +29,8 @@
 import javax.naming.InitialContext;
 import javax.naming.NameNotFoundException;
 
-import org.apache.log4j.Logger;
+import com.ecyrd.jspwiki.log.Logger;
+import com.ecyrd.jspwiki.log.LoggerFactory;
 import org.hsqldb.jdbc.jdbcDataSource;
 import org.mortbay.http.*;
 import org.mortbay.http.handler.SecurityHandler;
@@ -75,7 +76,7 @@
     /** Number of jetty threads for the server. */
     private static int jettyThreads = DEFAULT_JETTY_THREADS;
 
-    private static final Logger log = Logger.getLogger( TestContainer.class );
+    private static final Logger log = LoggerFactory.getLogger( TestContainer.class );
 
     /**
      * Starts up a test server for a particular web application on the specified

Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java?rev=721700&r1=721699&r2=721700&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java Sat Nov 29 10:31:48 2008
@@ -37,7 +37,7 @@
     public void tearDown()
     {
         TestEngine.deleteTestPage( NAME1 );
-        m_engine.deleteAttachments( NAME1 );
+        TestEngine.deleteAttachments( NAME1 );
         TestEngine.emptyWorkDir();
     }
 



Mime
View raw message