You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jc...@apache.org on 2007/04/26 21:01:15 UTC
svn commit: r532837 [2/3] - in /incubator/wicket/trunk: ./
jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/
jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/
jdk-1.4/wick...
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java Thu Apr 26 12:01:10 2007
@@ -43,8 +43,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.IPageMap;
@@ -63,6 +61,8 @@
import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.upload.ServletFileUpload;
import org.apache.wicket.util.value.ValueMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -149,7 +149,7 @@
}
/** Logging object */
- private static final Log log = LogFactory.getLog(MockHttpServletRequest.class);
+ private static final Logger log = LoggerFactory.getLogger(MockHttpServletRequest.class);
/** The application */
private final Application application;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockServletContext.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockServletContext.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockServletContext.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockServletContext.java Thu Apr 26 12:01:10 2007
@@ -35,10 +35,10 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.util.value.ValueMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -58,7 +58,7 @@
*/
public class MockServletContext implements ServletContext
{
- private static final Log log = LogFactory.getLog(MockServletContext.class);
+ private static final Logger log = LoggerFactory.getLogger(MockServletContext.class);
private Application application;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java Thu Apr 26 12:01:10 2007
@@ -25,8 +25,6 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.IRequestCycleFactory;
@@ -41,6 +39,8 @@
import org.apache.wicket.session.DefaultPageFactory;
import org.apache.wicket.settings.IRequestCycleSettings;
import org.apache.wicket.util.file.WebApplicationPath;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -84,7 +84,7 @@
public class MockWebApplication
{
/** Logging */
- private static final Log log = LogFactory.getLog(MockWebApplication.class);
+ private static final Logger log = LoggerFactory.getLogger(MockWebApplication.class);
/** The last rendered page. */
private Page lastRenderedPage;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java Thu Apr 26 12:01:10 2007
@@ -24,8 +24,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.IClusterable;
import org.apache.wicket.IPageMap;
@@ -39,6 +37,8 @@
import org.apache.wicket.util.concurrent.ConcurrentHashMap;
import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.string.AppendingStringBuffer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -62,7 +62,7 @@
public class RequestLogger implements IRequestLogger
{
/** log. */
- protected static Log log = LogFactory.getLog(RequestLogger.class);
+ protected static Logger log = LoggerFactory.getLogger(RequestLogger.class);
/**
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java Thu Apr 26 12:01:10 2007
@@ -352,8 +352,7 @@
{
// currently it is not supported to jump over 2
// pages....
- log
- .error("trying to rollback to many versions, jumping over 2 page versions is not supported yet.");
+ log.error("trying to rollback to many versions, jumping over 2 page versions is not supported yet.");
return null;
}
return store.getPage(sessionId, page.getPageMap().getName(), page
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java Thu Apr 26 12:01:10 2007
@@ -24,13 +24,13 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.Page;
import org.apache.wicket.protocol.http.SecondLevelCacheSessionStore.IPageStore;
import org.apache.wicket.util.concurrent.ConcurrentHashMap;
import org.apache.wicket.util.lang.Objects;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -45,7 +45,7 @@
public class TestFilePageStore implements IPageStore
{
/** log. */
- protected static Log log = LogFactory.getLog(TestFilePageStore.class);
+ protected static Logger log = LoggerFactory.getLogger(TestFilePageStore.class);
private Map map = new ConcurrentHashMap();
@@ -186,7 +186,7 @@
}
catch (Exception e)
{
- log.error(e);
+ log.error("Error", e);
}
}
return null;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java Thu Apr 26 12:01:10 2007
@@ -24,8 +24,6 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.IRequestCycleFactory;
import org.apache.wicket.IRequestTarget;
@@ -50,6 +48,8 @@
import org.apache.wicket.util.file.WebApplicationPath;
import org.apache.wicket.util.lang.PackageName;
import org.apache.wicket.util.watch.ModificationWatcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -101,7 +101,7 @@
public abstract class WebApplication extends Application implements ISessionFactory
{
/** Log. */
- private static final Log log = LogFactory.getLog(WebApplication.class);
+ private static final Logger log = LoggerFactory.getLogger(WebApplication.class);
/**
* The cached application key. Will be set in
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java Thu Apr 26 12:01:10 2007
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.protocol.http;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.AbortException;
import org.apache.wicket.IRedirectListener;
import org.apache.wicket.MetaDataKey;
@@ -31,6 +29,8 @@
import org.apache.wicket.request.ClientInfo;
import org.apache.wicket.request.IRequestCycleProcessor;
import org.apache.wicket.settings.IRequestCycleSettings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* RequestCycle implementation for HTTP protocol. Holds the application,
@@ -49,7 +49,7 @@
public class WebRequestCycle extends RequestCycle
{
/** Logging object */
- private static final Log log = LogFactory.getLog(WebRequestCycle.class);
+ private static final Logger log = LoggerFactory.getLogger(WebRequestCycle.class);
private static final MetaDataKey BROWSER_WAS_POLLED_KEY = new MetaDataKey(Boolean.class)
{
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java Thu Apr 26 12:01:10 2007
@@ -18,8 +18,6 @@
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.AccessStackPageMap;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
@@ -35,6 +33,8 @@
import org.apache.wicket.request.IRequestCodingStrategy;
import org.apache.wicket.request.RequestParameters;
import org.apache.wicket.util.string.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Default request processor implementation for normal web applications.
@@ -43,7 +43,7 @@
*/
public class WebRequestCycleProcessor extends AbstractRequestCycleProcessor
{
- private static final Log log = LogFactory.getLog(WebRequestCycleProcessor.class);
+ private static final Logger log = LoggerFactory.getLogger(WebRequestCycleProcessor.class);
/**
* Construct.
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponse.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponse.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponse.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponse.java Thu Apr 26 12:01:10 2007
@@ -23,13 +23,13 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Response;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Time;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -45,7 +45,7 @@
public class WebResponse extends Response
{
/** Log. */
- private static final Log log = LogFactory.getLog(WebResponse.class);
+ private static final Logger log = LoggerFactory.getLogger(WebResponse.class);
/** True if response is a redirect. */
protected boolean redirect;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponseWithCryptedUrl.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponseWithCryptedUrl.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponseWithCryptedUrl.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponseWithCryptedUrl.java Thu Apr 26 12:01:10 2007
@@ -21,13 +21,13 @@
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.protocol.http.request.WebRequestCodingStrategy;
import org.apache.wicket.util.crypt.ICrypt;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -41,7 +41,7 @@
public class WebResponseWithCryptedUrl extends WebResponse
{
/** Logger */
- private static final Log log = LogFactory.getLog(WebResponseWithCryptedUrl.class);
+ private static final Logger log = LoggerFactory.getLogger(WebResponseWithCryptedUrl.class);
/**
* Constructor.
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java Thu Apr 26 12:01:10 2007
@@ -30,8 +30,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.AbortException;
import org.apache.wicket.Application;
import org.apache.wicket.RequestCycle;
@@ -46,6 +44,8 @@
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Time;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -68,7 +68,7 @@
public static final String FILTER_MAPPING_PARAM = "filterMappingUrlPattern";
/** Log. */
- private static final Log log = LogFactory.getLog(WicketFilter.class);
+ private static final Logger log = LoggerFactory.getLogger(WicketFilter.class);
/**
* The servlet path holder when the WicketSerlvet is used. So that the
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java Thu Apr 26 12:01:10 2007
@@ -26,8 +26,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -104,7 +104,7 @@
private static final long serialVersionUID = 1L;
/** Log. */
- private static final Log log = LogFactory.getLog(WicketServlet.class);
+ private static final Logger log = LoggerFactory.getLogger(WicketServlet.class);
/** The WicketFilter where all the handling is done */
protected WicketFilter wicketFilter;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java Thu Apr 26 12:01:10 2007
@@ -19,9 +19,9 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.util.string.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -33,7 +33,7 @@
*/
public class HtmlDocumentParser
{
- private static final Log log = LogFactory.getLog(HtmlDocumentParser.class);
+ private static final Logger log = LoggerFactory.getLogger(HtmlDocumentParser.class);
/** Constant for close tag token. */
public static final int CLOSE_TAG = 4;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentValidator.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentValidator.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentValidator.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentValidator.java Thu Apr 26 12:01:10 2007
@@ -21,9 +21,9 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.util.collections.ArrayListStack;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -38,7 +38,7 @@
*/
public class HtmlDocumentValidator
{
- private static final Log log = LogFactory.getLog(HtmlDocumentValidator.class);
+ private static final Logger log = LoggerFactory.getLogger(HtmlDocumentValidator.class);
private final List elements = new ArrayList();
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java Thu Apr 26 12:01:10 2007
@@ -24,8 +24,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.IRequestTarget;
import org.apache.wicket.Request;
@@ -39,6 +37,8 @@
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.value.ValueMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -73,7 +73,7 @@
public class CryptedUrlWebRequestCodingStrategy implements IRequestCodingStrategy
{
/** log. */
- private static final Log log = LogFactory.getLog(CryptedUrlWebRequestCodingStrategy.class);
+ private static final Logger log = LoggerFactory.getLogger(CryptedUrlWebRequestCodingStrategy.class);
/** The default request coding strategy most of the methods are delegated to */
private final IRequestCodingStrategy defaultStrategy;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java Thu Apr 26 12:01:10 2007
@@ -18,11 +18,11 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.protocol.http.ClientProperties;
import org.apache.wicket.protocol.http.WebRequestCycle;
import org.apache.wicket.request.ClientInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -35,7 +35,7 @@
private static final long serialVersionUID = 1L;
/** log. */
- private static final Log log = LogFactory.getLog(WebClientInfo.class);
+ private static final Logger log = LoggerFactory.getLogger(WebClientInfo.class);
/**
* The user agent string from the User-Agent header, app. Theoretically,
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java Thu Apr 26 12:01:10 2007
@@ -16,11 +16,11 @@
*/
package org.apache.wicket.protocol.http.request;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.request.target.resource.ResourceStreamRequestTarget;
import org.apache.wicket.util.resource.WebExternalResourceStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -40,7 +40,7 @@
public class WebExternalResourceRequestTarget extends ResourceStreamRequestTarget
{
/** log. */
- private static final Log log = LogFactory.getLog(WebExternalResourceRequestTarget.class);
+ private static final Logger log = LoggerFactory.getLogger(WebExternalResourceRequestTarget.class);
/** the relative url of the external resource. */
private final String uri;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java Thu Apr 26 12:01:10 2007
@@ -28,8 +28,6 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.IPageMap;
@@ -58,6 +56,8 @@
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.PrependingStringBuffer;
import org.apache.wicket.util.string.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -136,7 +136,7 @@
}
/** log. */
- private static final Log log = LogFactory.getLog(WebRequestCodingStrategy.class);
+ private static final Logger log = LoggerFactory.getLogger(WebRequestCodingStrategy.class);
/**
* map of path mounts for mount encoders on paths.
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java Thu Apr 26 12:01:10 2007
@@ -22,8 +22,6 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.IRedirectListener;
import org.apache.wicket.RequestListenerInterface;
@@ -34,6 +32,8 @@
import org.apache.wicket.util.string.StringValueConversionException;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.upload.FileUploadException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -44,7 +44,7 @@
public class ServletWebRequest extends WebRequest
{
/** Log */
- private static final Log log = LogFactory.getLog(ServletWebRequest.class);
+ private static final Logger log = LoggerFactory.getLogger(ServletWebRequest.class);
/** Servlet request information. */
private final HttpServletRequest httpServletRequest;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java Thu Apr 26 12:01:10 2007
@@ -27,9 +27,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Session;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -99,7 +99,7 @@
public class WicketSessionFilter implements Filter
{
/** log. */
- private static final Log log = LogFactory.getLog(WicketSessionFilter.class);
+ private static final Logger log = LoggerFactory.getLogger(WicketSessionFilter.class);
/** the servlet path. */
private String servletPath;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java Thu Apr 26 12:01:10 2007
@@ -24,13 +24,13 @@
import java.util.TreeMap;
import java.util.Map.Entry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.protocol.http.UnitTestSettings;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.value.ValueMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -45,7 +45,7 @@
IMountableRequestTargetUrlCodingStrategy
{
/** log. */
- private static final Log log = LogFactory.getLog(AbstractRequestTargetUrlCodingStrategy.class);
+ private static final Logger log = LoggerFactory.getLogger(AbstractRequestTargetUrlCodingStrategy.class);
/** mounted path. */
private final String mountPath;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategy.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategy.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategy.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategy.java Thu Apr 26 12:01:10 2007
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.request.target.coding;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.IRequestTarget;
import org.apache.wicket.PageParameters;
import org.apache.wicket.Session;
@@ -28,6 +26,8 @@
import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.lang.PackageName;
import org.apache.wicket.util.string.AppendingStringBuffer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -38,7 +38,7 @@
*/
public class PackageRequestTargetUrlCodingStrategy extends AbstractRequestTargetUrlCodingStrategy
{
- private static final Log log = LogFactory.getLog(PackageRequestTargetUrlCodingStrategy.class);
+ private static final Logger log = LoggerFactory.getLogger(PackageRequestTargetUrlCodingStrategy.class);
/** package for this mount. */
private final PackageName packageName;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/ComponentResourceRequestTarget.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/ComponentResourceRequestTarget.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/ComponentResourceRequestTarget.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/ComponentResourceRequestTarget.java Thu Apr 26 12:01:10 2007
@@ -18,8 +18,6 @@
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Component;
import org.apache.wicket.IRequestTarget;
import org.apache.wicket.Page;
@@ -28,6 +26,8 @@
import org.apache.wicket.Response;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.protocol.http.WebResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -38,7 +38,7 @@
*/
public final class ComponentResourceRequestTarget implements IRequestTarget
{
- private static final Log log = LogFactory.getLog(ComponentResourceRequestTarget.class);
+ private static final Logger log = LoggerFactory.getLogger(ComponentResourceRequestTarget.class);
private final Page page;
private final Component component;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestTarget.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestTarget.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestTarget.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestTarget.java Thu Apr 26 12:01:10 2007
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.request.target.resource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.IRequestTarget;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.Response;
@@ -25,6 +23,8 @@
import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -35,7 +35,7 @@
public class ResourceStreamRequestTarget implements IRequestTarget
{
/** Logger */
- private static final Log log = LogFactory.getLog(ResourceStreamRequestTarget.class);
+ private static final Logger log = LoggerFactory.getLogger(ResourceStreamRequestTarget.class);
/**
* Optional filename, used to set the content disposition header. Only
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java Thu Apr 26 12:01:10 2007
@@ -18,8 +18,6 @@
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.Resource;
@@ -30,6 +28,8 @@
import org.apache.wicket.markup.html.PackageResource;
import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.request.RequestParameters;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -41,7 +41,7 @@
public class SharedResourceRequestTarget implements ISharedResourceRequestTarget
{
/** Logging object */
- private static final Log log = LogFactory.getLog(SharedResourceRequestTarget.class);
+ private static final Logger log = LoggerFactory.getLogger(SharedResourceRequestTarget.class);
private final RequestParameters requestParameters;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/PropertiesFactory.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/PropertiesFactory.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/PropertiesFactory.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/PropertiesFactory.java Thu Apr 26 12:01:10 2007
@@ -24,8 +24,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.settings.IResourceSettings;
import org.apache.wicket.util.concurrent.ConcurrentHashMap;
@@ -38,6 +36,8 @@
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.value.ValueMap;
import org.apache.wicket.util.watch.ModificationWatcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -56,7 +56,7 @@
public class PropertiesFactory implements IPropertiesFactory
{
/** Log. */
- private static final Log log = LogFactory.getLog(PropertiesFactory.class);
+ private static final Logger log = LoggerFactory.getLogger(PropertiesFactory.class);
/** Cache for all property files loaded */
private final Map propertiesCache = new ConcurrentHashMap();
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java Thu Apr 26 12:01:10 2007
@@ -20,8 +20,6 @@
import java.util.List;
import java.util.Locale;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
@@ -33,6 +31,8 @@
import org.apache.wicket.resource.PropertiesFactory;
import org.apache.wicket.util.resource.locator.ResourceNameIterator;
import org.apache.wicket.util.string.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -107,7 +107,7 @@
public class ComponentStringResourceLoader implements IStringResourceLoader
{
/** Log. */
- private static final Log log = LogFactory.getLog(ComponentStringResourceLoader.class);
+ private static final Logger log = LoggerFactory.getLogger(ComponentStringResourceLoader.class);
/**
* Create and initialise the resource loader.
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java Thu Apr 26 12:01:10 2007
@@ -21,9 +21,9 @@
import javax.crypto.Cipher;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.WicketRuntimeException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -40,7 +40,7 @@
private static final String CHARACTER_ENCODING = "UTF-8";
/** Log. */
- private static final Log log = LogFactory.getLog(AbstractCrypt.class);
+ private static final Logger log = LoggerFactory.getLogger(AbstractCrypt.class);
/** Key used to de-/encrypt the data */
private String encryptionKey = DEFAULT_ENCRYPTION_KEY;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java Thu Apr 26 12:01:10 2007
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.util.crypt;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -28,7 +28,7 @@
*/
public class ClassCryptFactory implements ICryptFactory
{
- private static final Log log = LogFactory.getLog(ClassCryptFactory.class);
+ private static final Logger log = LoggerFactory.getLogger(ClassCryptFactory.class);
private Class cryptClass;
private String encryptionKey;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java Thu Apr 26 12:01:10 2007
@@ -24,14 +24,14 @@
import junit.framework.Assert;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.markup.Markup;
import org.apache.wicket.markup.MarkupParser;
import org.apache.wicket.markup.parser.XmlPullParser;
import org.apache.wicket.util.io.Streams;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.string.StringList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This is a utility class. It serves two purposes.
@@ -47,7 +47,7 @@
*/
public final class DiffUtil
{
- private static final Log log = LogFactory.getLog(DiffUtil.class);
+ private static final Logger log = LoggerFactory.getLogger(DiffUtil.class);
/**
* Replace the expected result file with the current output.
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java Thu Apr 26 12:01:10 2007
@@ -23,12 +23,12 @@
import javax.servlet.ServletContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.util.resource.FileResourceStream;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.UrlResourceStream;
import org.apache.wicket.util.string.StringList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -39,7 +39,7 @@
*/
public final class WebApplicationPath implements IResourcePath
{
- private final static Log log = LogFactory.getLog(WebApplicationPath.class);
+ private final static Logger log = LoggerFactory.getLogger(WebApplicationPath.class);
/** The list of urls in the path */
private final List webappPaths = new ArrayList();
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java Thu Apr 26 12:01:10 2007
@@ -36,10 +36,10 @@
import java.util.LinkedList;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Component;
import org.apache.wicket.WicketRuntimeException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -195,7 +195,7 @@
private static final NoopOutputStream DUMMY_OUTPUT_STREAM = new NoopOutputStream();
/** log. */
- private static final Log log = LogFactory.getLog(SerializableChecker.class);
+ private static final Logger log = LoggerFactory.getLogger(SerializableChecker.class);
/** Whether we can execute the tests. If false, check will just return. */
private static boolean available = true;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java Thu Apr 26 12:01:10 2007
@@ -29,8 +29,6 @@
import java.math.BigInteger;
import java.util.HashMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.WicketRuntimeException;
@@ -41,6 +39,8 @@
import org.apache.wicket.util.io.WicketObjectStreamFactory;
import org.apache.wicket.util.io.IObjectStreamFactory.DefaultObjectStreamFactory;
import org.apache.wicket.util.string.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -130,8 +130,7 @@
catch (ClassNotFoundException ex1)
{
// ignore this exception.
- log
- .debug("Class not found by using objects own classloader, trying the IClassResolver");
+ log.debug("Class not found by using objects own classloader, trying the IClassResolver");
}
Application application = Application.get();
@@ -217,7 +216,7 @@
private static final int INT = 4;
/** log. */
- private static final Log log = LogFactory.getLog(Objects.class);
+ private static final Logger log = LoggerFactory.getLogger(Objects.class);
/** Type tag meaning long. */
private static final int LONG = 5;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java Thu Apr 26 12:01:10 2007
@@ -23,13 +23,13 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Session;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.util.concurrent.ConcurrentHashMap;
import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.string.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -61,7 +61,7 @@
private final static Map classesToGetAndSetters = new ConcurrentHashMap(64);
/** Log. */
- private static final Log log = LogFactory.getLog(PropertyResolver.class);
+ private static final Logger log = LoggerFactory.getLogger(PropertyResolver.class);
/**
* Looksup the value from the object with the given expression. If the
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java Thu Apr 26 12:01:10 2007
@@ -25,11 +25,11 @@
import java.net.URL;
import java.net.URLConnection;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.time.Time;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -44,7 +44,7 @@
private static final long serialVersionUID = 1L;
/** Logging. */
- private static final Log log = LogFactory.getLog(UrlResourceStream.class);
+ private static final Logger log = LoggerFactory.getLogger(UrlResourceStream.class);
/** Resource stream. */
private transient InputStream inputStream;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java Thu Apr 26 12:01:10 2007
@@ -21,12 +21,12 @@
import javax.servlet.ServletContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.time.Time;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -43,7 +43,7 @@
private static final long serialVersionUID = 1L;
/** log. */
- private static final Log log = LogFactory.getLog(WebExternalResourceStream.class);
+ private static final Logger log = LoggerFactory.getLogger(WebExternalResourceStream.class);
/** the relative url of the external resource. */
private final String url;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java Thu Apr 26 12:01:10 2007
@@ -26,11 +26,11 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.util.file.File;
import org.apache.wicket.util.time.Time;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -63,7 +63,7 @@
*/
private static final long serialVersionUID = 1L;
- private static final Log log = LogFactory.getLog(ZipResourceStream.class);
+ private static final Logger log = LoggerFactory.getLogger(ZipResourceStream.class);
ByteArrayOutputStream bytearray;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/ResourceStreamLocator.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/ResourceStreamLocator.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/ResourceStreamLocator.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/ResourceStreamLocator.java Thu Apr 26 12:01:10 2007
@@ -19,12 +19,12 @@
import java.net.URL;
import java.util.Locale;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.util.file.IResourceFinder;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.UrlResourceStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -57,7 +57,7 @@
public class ResourceStreamLocator implements IResourceStreamLocator
{
/** Logging */
- private static final Log log = LogFactory.getLog(ResourceStreamLocator.class);
+ private static final Logger log = LoggerFactory.getLogger(ResourceStreamLocator.class);
/** If null, the application registered finder will be used */
private IResourceFinder finder;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java Thu Apr 26 12:01:10 2007
@@ -19,8 +19,6 @@
import java.io.IOException;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.util.io.Streams;
import org.apache.wicket.util.lang.Packages;
import org.apache.wicket.util.resource.IResourceStream;
@@ -28,6 +26,8 @@
import org.apache.wicket.util.resource.locator.IResourceStreamLocator;
import org.apache.wicket.util.resource.locator.ResourceStreamLocator;
import org.apache.wicket.util.string.interpolator.MapVariableInterpolator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -41,7 +41,7 @@
private static final long serialVersionUID = 1L;
/** log. */
- private static final Log log = LogFactory.getLog(PackagedTextTemplate.class);
+ private static final Logger log = LoggerFactory.getLogger(PackagedTextTemplate.class);
/** class loader stream locator. */
private static final IResourceStreamLocator streamLocator = new ResourceStreamLocator();
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java Thu Apr 26 12:01:10 2007
@@ -24,8 +24,6 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.PageParameters;
@@ -61,6 +59,8 @@
import org.apache.wicket.util.diff.DiffUtil;
import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.string.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -77,7 +77,7 @@
public class BaseWicketTester extends MockWebApplication
{
/** log. */
- private static final Log log = LogFactory.getLog(BaseWicketTester.class);
+ private static final Logger log = LoggerFactory.getLogger(BaseWicketTester.class);
/**
* @author frankbille
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java Thu Apr 26 12:01:10 2007
@@ -26,8 +26,6 @@
import junit.framework.Assert;
import junit.framework.AssertionFailedError;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.feedback.FeedbackMessage;
@@ -38,6 +36,8 @@
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.util.diff.DiffUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -148,7 +148,7 @@
public class WicketTester extends BaseWicketTester
{
/** log. */
- private static final Log log = LogFactory.getLog(WicketTester.class);
+ private static final Logger log = LoggerFactory.getLogger(WicketTester.class);
/**
* @author frankbille
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/thread/ICode.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/thread/ICode.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/thread/ICode.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/thread/ICode.java Thu Apr 26 12:01:10 2007
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.util.thread;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
/**
* Interface to an arbitrary piece of code that runs and can do logging.
@@ -31,5 +31,5 @@
* @param log
* The log that will be used by the code.
*/
- void run(Log log);
+ void run(Logger log);
}
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/thread/Task.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/thread/Task.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/thread/Task.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/thread/Task.java Thu Apr 26 12:01:10 2007
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.util.thread;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.time.Time;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -49,7 +49,7 @@
private boolean isStarted = false;
/** The log to give to the user's code. */
- private transient Log log = null;
+ private transient Logger log = null;
/** The name of this task. */
private final String name;
@@ -93,7 +93,7 @@
{
// Sleep until start time
startTime.fromNow().sleep();
- final Log log = getLog();
+ final Logger log = getLog();
while (!stop)
{
@@ -169,7 +169,7 @@
* @param log
* The log
*/
- public synchronized void setLog(final Log log)
+ public synchronized void setLog(final Logger log)
{
this.log = log;
}
@@ -209,11 +209,11 @@
*
* @return the log
*/
- protected Log getLog()
+ protected Logger getLog()
{
if (log == null)
{
- log = LogFactory.getLog(Task.class);
+ log = LoggerFactory.getLogger(Task.class);
}
return log;
}
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/Duration.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/Duration.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/Duration.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/Duration.java Thu Apr 26 12:01:10 2007
@@ -20,10 +20,10 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.logging.Log;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.StringValueConversionException;
import org.apache.wicket.util.thread.ICode;
+import org.slf4j.Logger;
/**
@@ -123,7 +123,7 @@
* Optional log to use with errors and exceptions
* @return The duration it took to run the code
*/
- public static Duration benchmark(final ICode code, final Log log)
+ public static Duration benchmark(final ICode code, final Logger log)
{
// Get time before running code
final Time start = Time.now();
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/watch/ModificationWatcher.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/watch/ModificationWatcher.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/watch/ModificationWatcher.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/watch/ModificationWatcher.java Thu Apr 26 12:01:10 2007
@@ -21,14 +21,14 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.util.listener.ChangeListenerSet;
import org.apache.wicket.util.listener.IChangeListener;
import org.apache.wicket.util.thread.ICode;
import org.apache.wicket.util.thread.Task;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.time.Time;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -40,7 +40,7 @@
public final class ModificationWatcher
{
/** Logging */
- private static final Log log = LogFactory.getLog(ModificationWatcher.class);
+ private static final Logger log = LoggerFactory.getLogger(ModificationWatcher.class);
/** Maps Modifiable objects to Entry objects */
private final Map modifiableToEntry = new HashMap();
@@ -152,7 +152,7 @@
task.run(pollFrequency, new ICode()
{
- public void run(final Log log)
+ public void run(final Logger log)
{
// Iterate over a copy of the list of entries to avoid
// concurrent
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/Add.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/Add.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/Add.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/Add.java Thu Apr 26 12:01:10 2007
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.version.undo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Component;
import org.apache.wicket.util.lang.Classes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -32,7 +32,7 @@
private static final long serialVersionUID = 1L;
/** log. */
- private static final Log log = LogFactory.getLog(Add.class);
+ private static final Logger log = LoggerFactory.getLogger(Add.class);
/** subject. */
private final Component component;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java Thu Apr 26 12:01:10 2007
@@ -19,10 +19,10 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Component;
import org.apache.wicket.IClusterable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -35,7 +35,7 @@
private static final long serialVersionUID = 1L;
/** log. */
- private static final Log log = LogFactory.getLog(ChangeList.class);
+ private static final Logger log = LoggerFactory.getLogger(ChangeList.class);
/** the changes. */
private List changes = new ArrayList();
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java Thu Apr 26 12:01:10 2007
@@ -16,14 +16,14 @@
*/
package org.apache.wicket.version.undo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.lang.Objects;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -36,7 +36,7 @@
private static final long serialVersionUID = 1L;
/** log. */
- private static final Log log = LogFactory.getLog(ModelChange.class);
+ private static final Logger log = LoggerFactory.getLogger(ModelChange.class);
/** subject. */
private final Component component;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/Remove.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/Remove.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/Remove.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/Remove.java Thu Apr 26 12:01:10 2007
@@ -16,11 +16,11 @@
*/
package org.apache.wicket.version.undo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.util.lang.Classes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -33,7 +33,7 @@
private static final long serialVersionUID = 1L;
/** log. */
- private static final Log log = LogFactory.getLog(Remove.class);
+ private static final Logger log = LoggerFactory.getLogger(Remove.class);
/** subject. */
private final Component component;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java Thu Apr 26 12:01:10 2007
@@ -16,12 +16,12 @@
*/
package org.apache.wicket.version.undo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.util.collections.ArrayListStack;
import org.apache.wicket.version.IPageVersionManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -34,7 +34,7 @@
public class UndoPageVersionManager implements IPageVersionManager
{
/** log. */
- private static final Log log = LogFactory.getLog(UndoPageVersionManager.class);
+ private static final Logger log = LoggerFactory.getLogger(UndoPageVersionManager.class);
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/AttributeModifierComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/AttributeModifierComponentTest.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/AttributeModifierComponentTest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/AttributeModifierComponentTest.java Thu Apr 26 12:01:10 2007
@@ -19,12 +19,12 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.protocol.http.documentvalidation.HtmlDocumentValidator;
import org.apache.wicket.protocol.http.documentvalidation.Tag;
import org.apache.wicket.protocol.http.documentvalidation.TextContent;
import org.apache.wicket.util.tester.WicketTester;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -38,7 +38,7 @@
*/
public class AttributeModifierComponentTest extends TestCase
{
- private static final Log log = LogFactory.getLog(AttributeModifierComponentTest.class);
+ private static final Logger log = LoggerFactory.getLogger(AttributeModifierComponentTest.class);
private WicketTester tester;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ResourceTest.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ResourceTest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ResourceTest.java Thu Apr 26 12:01:10 2007
@@ -21,12 +21,12 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.protocol.http.MockHttpServletResponse;
import org.apache.wicket.protocol.http.WebRequestCycle;
import org.apache.wicket.util.resource.FileResourceStream;
import org.apache.wicket.util.resource.IResourceStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -34,7 +34,7 @@
*/
public class ResourceTest extends WicketTestCase
{
- private static final Log log = LogFactory.getLog(ResourceTest.class);
+ private static final Logger log = LoggerFactory.getLogger(ResourceTest.class);
private static final String TEST_STRING = "Hello, World!";
/**
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java Thu Apr 26 12:01:10 2007
@@ -19,8 +19,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.MockPageWithLinkAndComponent;
import org.apache.wicket.MockPageWithOneComponent;
import org.apache.wicket.Page;
@@ -32,6 +30,8 @@
import org.apache.wicket.protocol.http.WebRequestCycle;
import org.apache.wicket.util.tester.ITestPageSource;
import org.apache.wicket.util.time.Duration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -43,7 +43,7 @@
*/
public class AjaxTimerBehaviorTest extends WicketTestCase
{
- private static final Log log = LogFactory.getLog(AjaxTimerBehaviorTest.class);
+ private static final Logger log = LoggerFactory.getLogger(AjaxTimerBehaviorTest.class);
/**
* Construct.
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java Thu Apr 26 12:01:10 2007
@@ -16,18 +16,18 @@
*/
package org.apache.wicket.markup;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.diff.DiffUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*/
public class MarkupInheritanceTest extends WicketTestCase
{
- private static final Log log = LogFactory.getLog(MarkupInheritanceTest.class);
+ private static final Logger log = LoggerFactory.getLogger(MarkupInheritanceTest.class);
/**
* Create the test.
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java Thu Apr 26 12:01:10 2007
@@ -22,8 +22,6 @@
import junit.framework.Assert;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.pages.PageExpiredErrorPage;
import org.apache.wicket.markup.parser.XmlPullParser;
@@ -34,6 +32,8 @@
import org.apache.wicket.util.resource.locator.IResourceStreamLocator;
import org.apache.wicket.util.resource.locator.ResourceStreamLocator;
import org.apache.wicket.util.string.StringValueConversionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@@ -44,7 +44,7 @@
*/
public final class MarkupParserTest extends WicketTestCase
{
- private static final Log log = LogFactory.getLog(MarkupParserTest.class);
+ private static final Logger log = LoggerFactory.getLogger(MarkupParserTest.class);
/**
* Construct.
@@ -74,7 +74,7 @@
final ComponentTag aOpen = (ComponentTag)markupStream.next();
- log.info(aOpen);
+ log.info("", aOpen);
Assert.assertTrue(aOpen.getName().equals("a"));
Assert.assertEquals("foo.html", aOpen.getAttributes().getString("href"));
@@ -82,7 +82,7 @@
final ComponentTag boldOpen = (ComponentTag)markupStream.next();
- log.info(boldOpen);
+ log.info("", boldOpen);
Assert.assertTrue(boldOpen.getName().equals("b"));
Assert.assertEquals(XmlTag.OPEN, boldOpen.getType());
@@ -90,7 +90,7 @@
final ComponentTag boldClose = (ComponentTag)markupStream.next();
- log.info(boldClose);
+ log.info("", boldClose);
Assert.assertTrue(boldClose.getName().equals("b"));
Assert.assertEquals(XmlTag.CLOSE, boldClose.getType());
@@ -98,7 +98,7 @@
final ComponentTag img = (ComponentTag)markupStream.next();
- log.info(img);
+ log.info("", img);
Assert.assertTrue(img.getName().equals("img"));
Assert.assertEquals(9, img.getAttributes().getInt("width"));
Assert.assertEquals(10, img.getAttributes().getInt("height"));
@@ -108,7 +108,7 @@
final ComponentTag marker = (ComponentTag)markupStream.next();
- log.info(marker);
+ log.info("", marker);
Assert.assertTrue(marker.getName().equals("marker"));
Assert.assertEquals(XmlTag.OPEN_CLOSE, marker.getType());
@@ -116,7 +116,7 @@
final ComponentTag aClose = (ComponentTag)markupStream.next();
- log.info(aClose);
+ log.info("", aClose);
Assert.assertTrue(aClose.getName().equals("a"));
Assert.assertNull(markupStream.next());
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java Thu Apr 26 12:01:10 2007
@@ -16,11 +16,11 @@
*/
package org.apache.wicket.markup.html.autolink;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.autolink.sub.PageB;
import org.apache.wicket.markup.resolver.AutoLinkResolver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -29,7 +29,7 @@
public class AutolinkTest extends WicketTestCase
{
/** Logging */
- private static final Log log = LogFactory.getLog(AutoLinkResolver.class);
+ private static final Logger log = LoggerFactory.getLogger(AutoLinkResolver.class);
/**
* Construct.
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java Thu Apr 26 12:01:10 2007
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.markup.html.basic;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.MarkupException;
@@ -26,6 +24,8 @@
import org.apache.wicket.markup.html.border.Border;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.util.value.ValueMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -36,7 +36,7 @@
*/
public class SimplePageTest extends WicketTestCase
{
- private static final Log log = LogFactory.getLog(SimplePageTest.class);
+ private static final Logger log = LoggerFactory.getLogger(SimplePageTest.class);
/**
* Create the test.
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockHomePage.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockHomePage.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockHomePage.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockHomePage.java Thu Apr 26 12:01:10 2007
@@ -16,13 +16,13 @@
*/
package org.apache.wicket.markup.html.form.login;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Session;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.login.InterceptTest.MySession;
import org.apache.wicket.markup.html.link.PageLink;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -32,7 +32,7 @@
{
private static final long serialVersionUID = 1L;
- private static final Log log = LogFactory.getLog(MockHomePage.class);
+ private static final Logger log = LoggerFactory.getLogger(MockHomePage.class);
/**
*
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java Thu Apr 26 12:01:10 2007
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.markup.html.form.login;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.Session;
import org.apache.wicket.markup.html.WebPage;
@@ -26,6 +24,8 @@
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.form.login.InterceptTest.MySession;
import org.apache.wicket.model.Model;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -35,7 +35,7 @@
{
private static final long serialVersionUID = 1L;
- private static final Log log = LogFactory.getLog(MockLoginPage.class);
+ private static final Logger log = LoggerFactory.getLogger(MockLoginPage.class);
private Form form;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java Thu Apr 26 12:01:10 2007
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.markup.html.link;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.protocol.http.MockServletContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -30,7 +30,7 @@
public class DownloadLinkTest extends WicketTestCase
{
private static final String APPLICATION_X_CUSTOM = "application/x-custom";
- private static final Log log = LogFactory.getLog(DownloadLinkTest.class);
+ private static final Logger log = LoggerFactory.getLogger(DownloadLinkTest.class);
/**
* Construct.