You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2010/12/22 03:04:32 UTC
svn commit: r1051734 - in /wicket/trunk:
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/
testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/
testing/wicket-threadtest/src/main/java/org/apache/wicket/thr...
Author: pete
Date: Wed Dec 22 02:04:32 2010
New Revision: 1051734
URL: http://svn.apache.org/viewvc?rev=1051734&view=rev
Log:
replace commons-logging with slf4j-logging
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test2.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App2Test1.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Pool.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestFilter.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/CommandRunner.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/SimpleGetCommand.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
Modified: wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java?rev=1051734&r1=1051733&r2=1051734&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java (original)
+++ wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java Wed Dec 22 02:04:32 2010
@@ -19,8 +19,6 @@ package org.apache.wicket.threadtest;
import java.util.Arrays;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.threadtest.tester.SimpleGetCommand;
import org.apache.wicket.threadtest.tester.Tester;
import org.apache.wicket.util.io.WicketObjectStreamFactory;
@@ -31,9 +29,6 @@ import org.apache.wicket.util.lang.Wicke
*/
public class App1Test1
{
-
- private static final Log log = LogFactory.getLog(App1Test1.class);
-
/**
* @param args
* @throws Exception
Modified: wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test2.java?rev=1051734&r1=1051733&r2=1051734&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test2.java (original)
+++ wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test2.java Wed Dec 22 02:04:32 2010
@@ -19,8 +19,6 @@ package org.apache.wicket.threadtest;
import java.util.Arrays;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.threadtest.tester.SimpleGetCommand;
import org.apache.wicket.threadtest.tester.Tester;
@@ -29,9 +27,6 @@ import org.apache.wicket.threadtest.test
*/
public class App1Test2
{
-
- private static final Log log = LogFactory.getLog(App1Test2.class);
-
/**
* @param args
* @throws Exception
Modified: wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java?rev=1051734&r1=1051733&r2=1051734&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java (original)
+++ wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java Wed Dec 22 02:04:32 2010
@@ -19,8 +19,6 @@ package org.apache.wicket.threadtest;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.threadtest.apps.app1.ResourceTestPage;
import org.apache.wicket.threadtest.tester.SimpleGetCommand;
import org.apache.wicket.threadtest.tester.Tester;
@@ -30,9 +28,6 @@ import org.apache.wicket.threadtest.test
*/
public class App1Test3
{
-
- private static final Log log = LogFactory.getLog(App1Test3.class);
-
/**
* @param args
* @throws Exception
Modified: wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App2Test1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App2Test1.java?rev=1051734&r1=1051733&r2=1051734&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App2Test1.java (original)
+++ wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App2Test1.java Wed Dec 22 02:04:32 2010
@@ -19,8 +19,6 @@ package org.apache.wicket.threadtest;
import java.util.Arrays;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.threadtest.tester.SimpleGetCommand;
import org.apache.wicket.threadtest.tester.Tester;
@@ -30,8 +28,6 @@ import org.apache.wicket.threadtest.test
public class App2Test1
{
- private static final Log log = LogFactory.getLog(App2Test1.class);
-
/**
* @param args
* @throws Exception
Modified: wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Pool.java
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Pool.java?rev=1051734&r1=1051733&r2=1051734&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Pool.java (original)
+++ wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/Pool.java Wed Dec 22 02:04:32 2010
@@ -18,8 +18,8 @@ package org.apache.wicket.threadtest.app
import java.util.Stack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Test pool.
@@ -28,10 +28,9 @@ import org.apache.commons.logging.LogFac
*/
public class Pool
{
-
private static Pool _instance = new Pool();
- private static Log log = LogFactory.getLog(Pool.class);
+ private static final Logger log = LoggerFactory.getLogger(Pool.class);
/**
* @return the connection
Modified: wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestFilter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestFilter.java?rev=1051734&r1=1051733&r2=1051734&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestFilter.java (original)
+++ wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app2/TestFilter.java Wed Dec 22 02:04:32 2010
@@ -25,17 +25,11 @@ import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* Test filter
*/
public class TestFilter implements Filter
{
-
- private static final Log log = LogFactory.getLog(TestFilter.class);
-
/**
* @see javax.servlet.Filter#destroy()
*/
Modified: wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/CommandRunner.java
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/CommandRunner.java?rev=1051734&r1=1051733&r2=1051734&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/CommandRunner.java (original)
+++ wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/CommandRunner.java Wed Dec 22 02:04:32 2010
@@ -19,8 +19,8 @@ package org.apache.wicket.threadtest.tes
import java.util.List;
import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Runs a command.
@@ -38,7 +38,7 @@ public class CommandRunner implements Ru
void onError(CommandRunner runner, Exception e);
}
- private static final Log log = LogFactory.getLog(CommandRunner.class);
+ private static final Logger log = LoggerFactory.getLogger(CommandRunner.class);
private HttpClient client;
@@ -83,8 +83,7 @@ public class CommandRunner implements Ru
}
catch (Exception e)
{
- log.fatal("execution of command " + command + ", thread " + Thread.currentThread() +
- " failed", e);
+ log.error("execution of command " + command + ", thread " + Thread.currentThread() + " failed", e);
observer.onError(this, e);
return;
}
Modified: wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/SimpleGetCommand.java
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/SimpleGetCommand.java?rev=1051734&r1=1051733&r2=1051734&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/SimpleGetCommand.java (original)
+++ wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/SimpleGetCommand.java Wed Dec 22 02:04:32 2010
@@ -21,14 +21,13 @@ import java.util.List;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.util.io.Streams;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SimpleGetCommand extends AbstractGetCommand
{
-
- private static final Log log = LogFactory.getLog(SimpleGetCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(SimpleGetCommand.class);
private boolean printResponse = false;
@@ -80,8 +79,7 @@ public class SimpleGetCommand extends Ab
}
/**
- * @see org.apache.wicket.threadtest.tester.AbstractGetCommand#doGet(org.apache
- * .commons.httpclient.HttpClient, java.lang.String)
+ * @see org.apache.wicket.threadtest.tester.AbstractGetCommand#doGet(org.apache.commons.httpclient.HttpClient, String)
*/
@Override
protected void doGet(HttpClient client, String url) throws Exception
Modified: wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java?rev=1051734&r1=1051733&r2=1051734&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java (original)
+++ wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java Wed Dec 22 02:04:32 2010
@@ -24,20 +24,19 @@ import org.apache.commons.httpclient.Mul
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.params.HttpClientParams;
import org.apache.commons.httpclient.params.HttpConnectionManagerParams;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.threadtest.tester.CommandRunner.CommandRunnerObserver;
import org.apache.wicket.util.time.Duration;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.webapp.WebAppContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author eelcohillenius
*/
public final class Tester implements CommandRunnerObserver
{
-
- private static final Log log = LogFactory.getLog(Tester.class);
+ private static final Logger log = LoggerFactory.getLogger(Tester.class);
private static HttpClientParams params;
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java?rev=1051734&r1=1051733&r2=1051734&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java Wed Dec 22 02:04:32 2010
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.examples;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.settings.ISecuritySettings;
import org.apache.wicket.util.crypt.ClassCryptFactory;
@@ -32,11 +30,6 @@ import org.apache.wicket.util.crypt.NoCr
public abstract class WicketExampleApplication extends WebApplication
{
/**
- * Used for logging.
- */
- private static final Log log = LogFactory.getLog(WicketExampleApplication.class);
-
- /**
* prevent wicket from launching a java application window on the desktop
* <br/>
* once someone uses awt-specific classes java will automatically do so and allocate a window
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java?rev=1051734&r1=1051733&r2=1051734&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java Wed Dec 22 02:04:32 2010
@@ -19,8 +19,6 @@ package org.apache.wicket.examples.custo
import java.net.MalformedURLException;
import java.net.URL;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Page;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.examples.WicketExampleApplication;
@@ -30,7 +28,8 @@ import org.apache.wicket.util.resource.U
import org.apache.wicket.util.resource.locator.IResourceStreamLocator;
import org.apache.wicket.util.resource.locator.ResourceStreamLocator;
import org.apache.wicket.util.string.Strings;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Application class for the custom resource loading example.
@@ -40,7 +39,7 @@ import org.apache.wicket.util.string.Str
public class CustomResourceLoadingApplication extends WicketExampleApplication
{
/** log. */
- private static final Log log = LogFactory.getLog(CustomResourceLoadingApplication.class);
+ private static final Logger log = LoggerFactory.getLogger(CustomResourceLoadingApplication.class);
/**
* Custom implementation of {@link IResourceStreamLocator}.
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java?rev=1051734&r1=1051733&r2=1051734&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java Wed Dec 22 02:04:32 2010
@@ -18,8 +18,6 @@ package org.apache.wicket.examples.encod
import java.util.Locale;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -32,8 +30,6 @@ import org.apache.wicket.request.mapper.
*/
public class Home extends WicketExamplePage
{
- private static final Log log = LogFactory.getLog(Home.class);
-
/**
* Constructor
*
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java?rev=1051734&r1=1051733&r2=1051734&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java Wed Dec 22 02:04:32 2010
@@ -33,8 +33,6 @@ import java.util.List;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
-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.WicketRuntimeException;
@@ -57,7 +55,8 @@ import org.apache.wicket.util.string.Str
import com.uwyn.jhighlight.renderer.Renderer;
import com.uwyn.jhighlight.renderer.XhtmlRendererFactory;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Displays the resources in a packages directory in a browsable format.
@@ -66,7 +65,7 @@ import com.uwyn.jhighlight.renderer.Xhtm
*/
public class SourcesPage extends WebPage
{
- private static final Log log = LogFactory.getLog(SourcesPage.class);
+ private static final Logger log = LoggerFactory.getLogger(SourcesPage.class);
/**
* Model for retrieving the source code from the classpath of a packaged resource.
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java?rev=1051734&r1=1051733&r2=1051734&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java Wed Dec 22 02:04:32 2010
@@ -20,11 +20,8 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
@@ -157,9 +154,6 @@ public class MultiUploadPage extends Wic
}
}
- /** Log. */
- private static final Log log = LogFactory.getLog(MultiUploadPage.class);
-
/** Reference to listview for easy access. */
private final FileListView fileListView;
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java?rev=1051734&r1=1051733&r2=1051734&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java Wed Dec 22 02:04:32 2010
@@ -20,8 +20,6 @@ import java.io.File;
import java.util.Arrays;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar;
@@ -39,7 +37,8 @@ import org.apache.wicket.request.mapper.
import org.apache.wicket.util.file.Files;
import org.apache.wicket.util.file.Folder;
import org.apache.wicket.util.lang.Bytes;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Upload example.
@@ -145,7 +144,7 @@ public class UploadPage extends WicketEx
}
/** Log. */
- private static final Log log = LogFactory.getLog(UploadPage.class);
+ private static final Logger log = LoggerFactory.getLogger(UploadPage.class);
/** Reference to listview for easy access. */
private final FileListView fileListView;