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 [3/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/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java Thu Apr 26 12:01:10 2007
@@ -16,12 +16,12 @@
*/
package org.apache.wicket.markup.parser.filter;
-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.html.PackageResource;
import org.apache.wicket.util.resource.IResourceStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -32,7 +32,7 @@
*/
public class HeaderSectionTest extends WicketTestCase
{
- private static final Log log = LogFactory.getLog(HeaderSectionTest.class);
+ private static final Logger log = LoggerFactory.getLogger(HeaderSectionTest.class);
/**
* Create the test.
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseTest.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseTest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseTest.java Thu Apr 26 12:01:10 2007
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.protocol.http;
-import junit.framework.TestCase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import junit.framework.TestCase;
/**
*
@@ -28,7 +28,7 @@
*/
public class WebResponseTest extends TestCase
{
- private static final Log log = LogFactory.getLog(WebResponseTest.class);
+ private static final Logger log = LoggerFactory.getLogger(WebResponseTest.class);
/**
* Test that redirect works correctly when not using ajax
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java Thu Apr 26 12:01:10 2007
@@ -18,12 +18,12 @@
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;
/**
@@ -34,7 +34,7 @@
*/
public class WicketTagPanelTest extends TestCase
{
- private static final Log log = LogFactory.getLog(WicketTagPanelTest.class);
+ private static final Logger log = LoggerFactory.getLogger(WicketTagPanelTest.class);
private WicketTester application;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.java Thu Apr 26 12:01:10 2007
@@ -16,17 +16,17 @@
*/
package org.apache.wicket.util.parse.metapattern.parsers;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.WebPage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*/
public class Page2 extends WebPage
{
- private static final Log log = LogFactory.getLog(Page2.class);
+ private static final Logger log = LoggerFactory.getLogger(Page2.class);
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/trunk/jdk-1.5/wicket-examples/.amateras
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/.amateras?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.5/wicket-examples/.amateras (original)
+++ incubator/wicket/trunk/jdk-1.5/wicket-examples/.amateras Thu Apr 26 12:01:10 2007
@@ -1,10 +1,11 @@
-#EclipseHTMLEditor configuration file
-#Fri Apr 21 23:54:54 PDT 2006
-useDTD=true
-validateHTML=false
-root=/
-validateJSP=false
-validateJS=true
-validateXML=true
-removeMarkers=false
-validateDTD=true
+#EclipseHTMLEditor configuration file
+#Tue Apr 10 14:11:00 CEST 2007
+validateDTD=true
+useDTD=true
+validateJSP=true
+validateXML=true
+validateJS=true
+removeMarkers=true
+root=/
+validateHTML=true
+javaScripts=
Modified: incubator/wicket/trunk/jdk-1.5/wicket-examples/.tomcatplugin
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/.tomcatplugin?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
Binary files - no diff available.
Modified: incubator/wicket/trunk/jdk-1.5/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.5/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java (original)
+++ incubator/wicket/trunk/jdk-1.5/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java Thu Apr 26 12:01:10 2007
@@ -29,11 +29,11 @@
import javax.management.NotCompliantMBeanException;
import javax.management.ObjectName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.IDestroyer;
import org.apache.wicket.IInitializer;
import org.apache.wicket.WicketRuntimeException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -53,7 +53,7 @@
*/
public class Initializer implements IInitializer, IDestroyer
{
- private static Log log = LogFactory.getLog(Initializer.class);
+ private static Logger log = LoggerFactory.getLogger(Initializer.class);
// It's best to store a reference to the MBeanServer rather than getting it
// over and over
Modified: incubator/wicket/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/pom.xml?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/pom.xml (original)
+++ incubator/wicket/trunk/pom.xml Thu Apr 26 12:01:10 2007
@@ -252,9 +252,14 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.1.0-beta0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.1.0-beta0</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -359,8 +364,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>