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 [1/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...
Author: jcompagner
Date: Thu Apr 26 12:01:10 2007
New Revision: 532837
URL: http://svn.apache.org/viewvc?view=rev&rev=532837
Log:
slf4j log impl
Modified:
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResource.java
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetUtil.java
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/MyTree.java
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/TreeTest.java
incubator/wicket/trunk/jdk-1.4/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/QuickStartApplication.java
incubator/wicket/trunk/jdk-1.4/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/Start.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/AccessStackPageMap.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Page.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Resource.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Response.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Session.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/SharedResources.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/Markup.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupFragment.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MergedMarkup.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/AjaxServerAndClientTimeFilter.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/ServerTimeFilter.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/PasswordTextField.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/PrependContextPathHandler.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockServletContext.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/RequestLogger.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/SecondLevelCacheSessionStore.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/TestFilePageStore.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycle.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponse.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebResponseWithCryptedUrl.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketServlet.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentValidator.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/AbstractRequestTargetUrlCodingStrategy.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategy.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/ComponentResourceRequestTarget.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/ResourceStreamRequestTarget.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/PropertiesFactory.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/crypt/ClassCryptFactory.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/file/WebApplicationPath.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/io/SerializableChecker.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/UrlResourceStream.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/WebExternalResourceStream.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/resource/locator/ResourceStreamLocator.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/tester/WicketTester.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/thread/ICode.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/thread/Task.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/time/Duration.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/watch/ModificationWatcher.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/Add.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/ChangeList.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/ModelChange.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/Remove.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/version/undo/UndoPageVersionManager.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/AttributeModifierComponentTest.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ResourceTest.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockHomePage.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseTest.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.java
incubator/wicket/trunk/jdk-1.5/wicket-examples/.amateras
incubator/wicket/trunk/jdk-1.5/wicket-examples/.tomcatplugin
incubator/wicket/trunk/jdk-1.5/wicket-jmx/src/main/java/org/apache/wicket/jmx/Initializer.java
incubator/wicket/trunk/pom.xml
Modified: incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResource.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResource.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResource.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/image/resource/ThumbnailImageResource.java Thu Apr 26 12:01:10 2007
@@ -23,13 +23,13 @@
import javax.imageio.ImageIO;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.html.WebResource;
import org.apache.wicket.markup.html.image.resource.DynamicImageResource;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.time.Time;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -45,7 +45,7 @@
private static final long serialVersionUID = 1L;
/** Log. */
- private static final Log log = LogFactory.getLog(ThumbnailImageResource.class);
+ private static final Logger log = LoggerFactory.getLogger(ThumbnailImageResource.class);
/** the unscaled, original image resource. */
private final WebResource unscaledImageResource;
Modified: incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetUtil.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetUtil.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetUtil.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetUtil.java Thu Apr 26 12:01:10 2007
@@ -21,11 +21,11 @@
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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -39,7 +39,7 @@
public class CharSetUtil
{
/** Logging */
- private static final Log log = LogFactory.getLog(CharSetUtil.class);
+ private static final Logger log = LoggerFactory.getLogger(CharSetUtil.class);
/** Locale to character encoding mapping */
private static CharSetMap charSetMap;
Modified: incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/MyTree.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/MyTree.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/MyTree.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/MyTree.java Thu Apr 26 12:01:10 2007
@@ -1,125 +1,125 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.extensions.markup.html.tree;
-
-import java.util.List;
-
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreeModel;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.wicket.ResourceReference;
-import org.apache.wicket.extensions.markup.html.tree.Tree;
-import org.apache.wicket.markup.html.image.Image;
-
-
-/**
- * tree implementation.
- *
- * @author Eelco Hillenius
- */
-public class MyTree extends Tree
-{
- private static final long serialVersionUID = 1L;
-
- private static final ResourceReference folderOpen = new ResourceReference(MyTree.class, "folderopen.gif");
- private static final ResourceReference folder = new ResourceReference(MyTree.class, "folder.gif");
- private static final ResourceReference nodeImage = new ResourceReference(MyTree.class, "node.gif");
-
- /** Log. */
- private static final Log log = LogFactory.getLog(MyTree.class);
-
- /**
- * Construct.
- *
- * @param id
- * The id of this component
- * @param model
- * the tree model
- */
- public MyTree(String id, TreeModel model)
- {
- super(id, model);
- }
-
- /**
- * @see org.apache.wicket.extensions.markup.html.tree.Tree#junctionLinkClicked(javax.swing.tree.DefaultMutableTreeNode)
- */
- protected void junctionLinkClicked(DefaultMutableTreeNode node)
- {
- super.junctionLinkClicked(node);
- log.info("tree junction link was clicked, user object: " + node.getUserObject());
- }
-
- /**
- * @see org.apache.wicket.extensions.markup.html.tree.Tree#nodeLinkClicked(javax.swing.tree.DefaultMutableTreeNode)
- */
- protected void nodeLinkClicked(DefaultMutableTreeNode node)
- {
- super.nodeLinkClicked(node);
- log.info("tree node link was clicked, user object: " + node.getUserObject());
- }
-
- /**
- * @see org.apache.wicket.markup.html.tree.Tree#getNodeImage(javax.swing.tree.DefaultMutableTreeNode)
- */
- protected Image getNodeImage(final DefaultMutableTreeNode node)
- {
- if (node.isLeaf())
- {
- Image img = new Image(NODE_IMAGE_NAME, nodeImage);
- return img;
- }
- else
- {
- // we want the image to be dynamic, yet resolve to a static image.
- return new Image(NODE_IMAGE_NAME)
- {
- private static final long serialVersionUID = 1L;
-
- protected ResourceReference getImageResourceReference()
- {
- if (isExpanded(node))
- {
- return folderOpen;
- }
- else
- {
- return folder;
- }
- }
- };
- }
- }
-
- /**
- * @see org.apache.wicket.extensions.markup.html.tree.Tree#getNodeLabel(javax.swing.tree.DefaultMutableTreeNode)
- */
- protected String getNodeLabel(DefaultMutableTreeNode node)
- {
- Object userObject = node.getUserObject();
- if (userObject instanceof List)
- {
- return "<sub>";
- }
- else
- {
- return String.valueOf(node.getUserObject());
- }
- }
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.extensions.markup.html.tree;
+
+import java.util.List;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreeModel;
+
+import org.apache.wicket.ResourceReference;
+import org.apache.wicket.extensions.markup.html.tree.Tree;
+import org.apache.wicket.markup.html.image.Image;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * tree implementation.
+ *
+ * @author Eelco Hillenius
+ */
+public class MyTree extends Tree
+{
+ private static final long serialVersionUID = 1L;
+
+ private static final ResourceReference folderOpen = new ResourceReference(MyTree.class, "folderopen.gif");
+ private static final ResourceReference folder = new ResourceReference(MyTree.class, "folder.gif");
+ private static final ResourceReference nodeImage = new ResourceReference(MyTree.class, "node.gif");
+
+ /** Log. */
+ private static final Logger log = LoggerFactory.getLogger(MyTree.class);
+
+ /**
+ * Construct.
+ *
+ * @param id
+ * The id of this component
+ * @param model
+ * the tree model
+ */
+ public MyTree(String id, TreeModel model)
+ {
+ super(id, model);
+ }
+
+ /**
+ * @see org.apache.wicket.extensions.markup.html.tree.Tree#junctionLinkClicked(javax.swing.tree.DefaultMutableTreeNode)
+ */
+ protected void junctionLinkClicked(DefaultMutableTreeNode node)
+ {
+ super.junctionLinkClicked(node);
+ log.info("tree junction link was clicked, user object: " + node.getUserObject());
+ }
+
+ /**
+ * @see org.apache.wicket.extensions.markup.html.tree.Tree#nodeLinkClicked(javax.swing.tree.DefaultMutableTreeNode)
+ */
+ protected void nodeLinkClicked(DefaultMutableTreeNode node)
+ {
+ super.nodeLinkClicked(node);
+ log.info("tree node link was clicked, user object: " + node.getUserObject());
+ }
+
+ /**
+ * @see org.apache.wicket.markup.html.tree.Tree#getNodeImage(javax.swing.tree.DefaultMutableTreeNode)
+ */
+ protected Image getNodeImage(final DefaultMutableTreeNode node)
+ {
+ if (node.isLeaf())
+ {
+ Image img = new Image(NODE_IMAGE_NAME, nodeImage);
+ return img;
+ }
+ else
+ {
+ // we want the image to be dynamic, yet resolve to a static image.
+ return new Image(NODE_IMAGE_NAME)
+ {
+ private static final long serialVersionUID = 1L;
+
+ protected ResourceReference getImageResourceReference()
+ {
+ if (isExpanded(node))
+ {
+ return folderOpen;
+ }
+ else
+ {
+ return folder;
+ }
+ }
+ };
+ }
+ }
+
+ /**
+ * @see org.apache.wicket.extensions.markup.html.tree.Tree#getNodeLabel(javax.swing.tree.DefaultMutableTreeNode)
+ */
+ protected String getNodeLabel(DefaultMutableTreeNode node)
+ {
+ Object userObject = node.getUserObject();
+ if (userObject instanceof List)
+ {
+ return "<sub>";
+ }
+ else
+ {
+ return String.valueOf(node.getUserObject());
+ }
+ }
}
Modified: incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/TreeTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/TreeTest.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/TreeTest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/tree/TreeTest.java Thu Apr 26 12:01:10 2007
@@ -1,90 +1,90 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.extensions.markup.html.tree;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.wicket.WicketTestCase;
-
-
-/**
- * Test for the Tree component. Also tests header insertion as that is what the
- * Tree component uses.
- *
- * @author Juergen Donnerstag
- * @author Eelco Hillenius
- */
-public class TreeTest extends WicketTestCase
-{
- private static final Log log = LogFactory.getLog(TreeTest.class);
-
- /**
- * Create the test.
- *
- * @param name
- * The test name
- */
- public TreeTest(String name)
- {
- super(name);
- }
-
- /**
- * Test Tree put on a plain page. Tests first render, and render after a
- * node click.
- *
- * @throws Exception
- */
- public void testRenderTreePage_1() throws Exception
- {
- executeTest(TreePage.class, "TreePageExpectedResult_1.html");
-
- executedListener(TreePage.class,
- tester.getLastRenderedPage().get("tree:tree:3:node:junctionLink"),
- "TreePageExpectedResult_1-1.html");
- }
-
- /**
- * Test Tree put on a page with a border. Tests first render, and render
- * after a node click.
- *
- * @throws Exception
- */
- public void testRenderTreePageWithBorder_1() throws Exception
- {
- executeTest(TreePageWithBorder.class, "TreePageWithBorderExpectedResult_1.html");
-
- executedListener(TreePageWithBorder.class,
- tester.getLastRenderedPage().get("tree:tree:3:node:junctionLink"),
- "TreePageWithBorderExpectedResult_1-1.html");
- }
-
- /**
- * Test Tree put on a plain page with a html head section, but without a
- * wicket:head tag. Tests first render, and render after a node click.
- *
- * @throws Exception
- */
- public void testRenderTreePageNoWicketHeadTag_1() throws Exception
- {
- executeTest(TreePageNoWicketHeadTag.class, "TreePageNoWicketHeadTagExpectedResult_1.html");
-
- executedListener(TreePageNoWicketHeadTag.class,
- tester.getLastRenderedPage().get("tree:tree:3:node:junctionLink"),
- "TreePageNoWicketHeadTagExpectedResult_1-1.html");
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.extensions.markup.html.tree;
+
+import org.apache.wicket.WicketTestCase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Test for the Tree component. Also tests header insertion as that is what the
+ * Tree component uses.
+ *
+ * @author Juergen Donnerstag
+ * @author Eelco Hillenius
+ */
+public class TreeTest extends WicketTestCase
+{
+ private static final Logger log = LoggerFactory.getLogger(TreeTest.class);
+
+ /**
+ * Create the test.
+ *
+ * @param name
+ * The test name
+ */
+ public TreeTest(String name)
+ {
+ super(name);
+ }
+
+ /**
+ * Test Tree put on a plain page. Tests first render, and render after a
+ * node click.
+ *
+ * @throws Exception
+ */
+ public void testRenderTreePage_1() throws Exception
+ {
+ executeTest(TreePage.class, "TreePageExpectedResult_1.html");
+
+ executedListener(TreePage.class,
+ tester.getLastRenderedPage().get("tree:tree:3:node:junctionLink"),
+ "TreePageExpectedResult_1-1.html");
+ }
+
+ /**
+ * Test Tree put on a page with a border. Tests first render, and render
+ * after a node click.
+ *
+ * @throws Exception
+ */
+ public void testRenderTreePageWithBorder_1() throws Exception
+ {
+ executeTest(TreePageWithBorder.class, "TreePageWithBorderExpectedResult_1.html");
+
+ executedListener(TreePageWithBorder.class,
+ tester.getLastRenderedPage().get("tree:tree:3:node:junctionLink"),
+ "TreePageWithBorderExpectedResult_1-1.html");
+ }
+
+ /**
+ * Test Tree put on a plain page with a html head section, but without a
+ * wicket:head tag. Tests first render, and render after a node click.
+ *
+ * @throws Exception
+ */
+ public void testRenderTreePageNoWicketHeadTag_1() throws Exception
+ {
+ executeTest(TreePageNoWicketHeadTag.class, "TreePageNoWicketHeadTagExpectedResult_1.html");
+
+ executedListener(TreePageNoWicketHeadTag.class,
+ tester.getLastRenderedPage().get("tree:tree:3:node:junctionLink"),
+ "TreePageNoWicketHeadTagExpectedResult_1-1.html");
+ }
+}
Modified: incubator/wicket/trunk/jdk-1.4/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/QuickStartApplication.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/QuickStartApplication.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/QuickStartApplication.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/QuickStartApplication.java Thu Apr 26 12:01:10 2007
@@ -16,12 +16,12 @@
*/
package org.apache.wicket.quickstart;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Request;
import org.apache.wicket.Response;
import org.apache.wicket.Session;
import org.apache.wicket.protocol.http.WebApplication;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -33,7 +33,7 @@
public class QuickStartApplication extends WebApplication
{
/** Logging */
- private static final Log log = LogFactory.getLog(QuickStartApplication.class);
+ private static final Logger log = LoggerFactory.getLogger(QuickStartApplication.class);
/**
* Constructor
Modified: incubator/wicket/trunk/jdk-1.4/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/Start.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/Start.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/Start.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket-quickstart/src/main/java/org/apache/wicket/quickstart/Start.java Thu Apr 26 12:01:10 2007
@@ -16,12 +16,12 @@
*/
package org.apache.wicket.quickstart;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.nio.SelectChannelConnector;
import org.mortbay.jetty.webapp.WebAppContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Seperate startup class for people that want to run the examples directly.
@@ -31,7 +31,7 @@
/**
* Used for logging.
*/
- private static Log log = LogFactory.getLog(Start.class);
+ private static Logger log = LoggerFactory.getLogger(Start.class);
/**
* Construct.
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/AccessStackPageMap.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/AccessStackPageMap.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/AccessStackPageMap.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/AccessStackPageMap.java Thu Apr 26 12:01:10 2007
@@ -18,10 +18,10 @@
import java.util.Iterator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.session.pagemap.IPageMapEntry;
import org.apache.wicket.util.collections.ArrayListStack;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -50,7 +50,7 @@
private static final long serialVersionUID = 1L;
/** Log. */
- private static final Log log = LogFactory.getLog(AccessStackPageMap.class);
+ private static final Logger log = LoggerFactory.getLogger(AccessStackPageMap.class);
/** Stack of entry accesses by id */
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Application.java Thu Apr 26 12:01:10 2007
@@ -28,8 +28,6 @@
import java.util.Map;
import java.util.Properties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.application.IComponentInstantiationListener;
import org.apache.wicket.markup.MarkupCache;
import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResourceFactory;
@@ -62,6 +60,8 @@
import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.time.Duration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -139,7 +139,7 @@
private static final ThreadLocal current = new ThreadLocal();
/** Log. */
- private static final Log log = LogFactory.getLog(Application.class);
+ private static final Logger log = LoggerFactory.getLogger(Application.class);
/**
* Checks if the <code>Application</code> threadlocal is set in this
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java Thu Apr 26 12:01:10 2007
@@ -23,8 +23,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.ajax.AjaxRequestTarget;
import org.apache.wicket.authorization.Action;
import org.apache.wicket.authorization.AuthorizationException;
@@ -50,6 +48,8 @@
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.value.ValueMap;
import org.apache.wicket.version.undo.Change;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -553,7 +553,7 @@
};
/** Log. */
- private static final Log log = LogFactory.getLog(Component.class);
+ private static final Logger log = LoggerFactory.getLogger(Component.class);
/**
* The name of attribute that will hold markup id
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/MarkupContainer.java Thu Apr 26 12:01:10 2007
@@ -23,8 +23,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.feedback.IFeedback;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupElement;
@@ -39,6 +37,8 @@
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.version.undo.Change;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -91,7 +91,7 @@
private static final long serialVersionUID = 1L;
/** Log for reporting. */
- private static final Log log = LogFactory.getLog(MarkupContainer.class);
+ private static final Logger log = LoggerFactory.getLogger(MarkupContainer.class);
/** List of children or single child */
private Object children;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Page.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Page.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Page.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Page.java Thu Apr 26 12:01:10 2007
@@ -21,8 +21,6 @@
import java.util.List;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.authorization.UnauthorizedActionException;
import org.apache.wicket.feedback.IFeedback;
import org.apache.wicket.markup.MarkupException;
@@ -40,6 +38,8 @@
import org.apache.wicket.util.value.Count;
import org.apache.wicket.version.IPageVersionManager;
import org.apache.wicket.version.undo.Change;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -159,7 +159,7 @@
private static final int FLAG_STATELESS_HINT = FLAG_RESERVED5;
/** Log. */
- private static final Log log = LogFactory.getLog(Page.class);
+ private static final Logger log = LoggerFactory.getLogger(Page.class);
/** Used to create page-unique numbers */
private short autoIndex;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestCycle.java Thu Apr 26 12:01:10 2007
@@ -18,8 +18,6 @@
import java.util.Iterator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.behavior.IBehavior;
import org.apache.wicket.protocol.http.BufferedWebResponse;
import org.apache.wicket.protocol.http.IRequestLogger;
@@ -39,6 +37,8 @@
import org.apache.wicket.request.target.resource.SharedResourceRequestTarget;
import org.apache.wicket.util.collections.ArrayListStack;
import org.apache.wicket.util.value.ValueMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -189,7 +189,7 @@
private static final int HANDLE_EXCEPTION = 5;
/** Log */
- private static final Log log = LogFactory.getLog(RequestCycle.class);
+ private static final Logger log = LoggerFactory.getLogger(RequestCycle.class);
/** No processing has been done. */
private static final int NOT_STARTED = 0;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java Thu Apr 26 12:01:10 2007
@@ -22,12 +22,12 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.authorization.AuthorizationException;
import org.apache.wicket.request.RequestParameters;
import org.apache.wicket.request.target.component.listener.ListenerInterfaceRequestTarget;
import org.apache.wicket.util.lang.Classes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -41,7 +41,7 @@
private static final Map interfaces = Collections.synchronizedMap(new HashMap());
/** Log. */
- private static final Log log = LogFactory.getLog(RequestListenerInterface.class);
+ private static final Logger log = LoggerFactory.getLogger(RequestListenerInterface.class);
/**
* Looks up a request interface listener by name.
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Resource.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Resource.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Resource.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Resource.java Thu Apr 26 12:01:10 2007
@@ -18,12 +18,12 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.request.target.resource.ResourceStreamRequestTarget;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.time.Time;
import org.apache.wicket.util.value.ValueMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -61,7 +61,7 @@
private static final long serialVersionUID = 1L;
/** Logger */
- private static final Log log = LogFactory.getLog(Resource.class);
+ private static final Logger log = LoggerFactory.getLogger(Resource.class);
/** True if this resource can be cached */
private boolean cacheable;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Response.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Response.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Response.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Response.java Thu Apr 26 12:01:10 2007
@@ -27,14 +27,14 @@
import javax.servlet.ServletContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.io.Streams;
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;
/**
@@ -48,7 +48,7 @@
*/
public abstract class Response
{
- private static final Log log = LogFactory.getLog(Response.class);
+ private static final Logger log = LoggerFactory.getLogger(Response.class);
/** Default encoding of output stream */
private String defaultEncoding;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Session.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Session.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Session.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Session.java Thu Apr 26 12:01:10 2007
@@ -29,8 +29,6 @@
import java.util.Set;
import java.util.Map.Entry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.application.IClassResolver;
import org.apache.wicket.authorization.IAuthorizationStrategy;
import org.apache.wicket.feedback.FeedbackMessage;
@@ -42,6 +40,8 @@
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Duration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -194,7 +194,7 @@
private static final ThreadLocal dirtyObjects = new ThreadLocal();
/** Logging object */
- private static final Log log = LogFactory.getLog(Session.class);
+ private static final Logger log = LoggerFactory.getLogger(Session.class);
/** Attribute prefix for page maps stored in the session */
private static final String pageMapAttributePrefix = "m:";
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/SharedResources.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/SharedResources.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/SharedResources.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/SharedResources.java Thu Apr 26 12:01:10 2007
@@ -20,10 +20,10 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.util.file.Files;
import org.apache.wicket.util.string.AppendingStringBuffer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -38,7 +38,7 @@
public class SharedResources
{
/** Logger */
- private static final Log log = LogFactory.getLog(SharedResources.class);
+ private static final Logger log = LoggerFactory.getLogger(SharedResources.class);
/**
* THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT CALL IT. Inserts
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java Thu Apr 26 12:01:10 2007
@@ -27,8 +27,6 @@
import java.util.Map;
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.Component;
import org.apache.wicket.IRequestTarget;
@@ -48,6 +46,8 @@
import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -228,7 +228,7 @@
}
- private static final Log LOG = LogFactory.getLog(AjaxRequestTarget.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AjaxRequestTarget.class);
private final List/* <String> */appendJavascripts = new ArrayList();
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/application/ReloadingClassLoader.java Thu Apr 26 12:01:10 2007
@@ -26,12 +26,12 @@
import java.util.List;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.util.file.File;
import org.apache.wicket.util.listener.IChangeListener;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.watch.ModificationWatcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -42,7 +42,7 @@
*/
public class ReloadingClassLoader extends URLClassLoader
{
- private static final Log log = LogFactory.getLog(ReloadingClassLoader.class);
+ private static final Logger log = LoggerFactory.getLogger(ReloadingClassLoader.class);
private static final Set urls = new HashSet();
private static final List patterns = new ArrayList();
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java Thu Apr 26 12:01:10 2007
@@ -22,12 +22,12 @@
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.IClusterable;
import org.apache.wicket.util.concurrent.CopyOnWriteArrayList;
import org.apache.wicket.util.string.StringList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -43,7 +43,7 @@
public final class FeedbackMessages implements IClusterable
{
/** Log. */
- private static final Log log = LogFactory.getLog(FeedbackMessages.class);
+ private static final Logger log = LoggerFactory.getLogger(FeedbackMessages.class);
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/DefaultMarkupResourceStreamProvider.java Thu Apr 26 12:01:10 2007
@@ -18,12 +18,12 @@
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.MarkupContainer;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.locator.IResourceStreamLocator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -36,7 +36,7 @@
public class DefaultMarkupResourceStreamProvider implements IMarkupResourceStreamProvider
{
/** Log for reporting. */
- private static final Log log = LogFactory.getLog(DefaultMarkupResourceStreamProvider.class);
+ private static final Logger log = LoggerFactory.getLogger(DefaultMarkupResourceStreamProvider.class);
/**
* Constructor.
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/Markup.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/Markup.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/Markup.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/Markup.java Thu Apr 26 12:01:10 2007
@@ -22,8 +22,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Holds markup as a resource (the stream that the markup came from) and a list
@@ -38,7 +38,7 @@
*/
public class Markup
{
- private static final Log log = LogFactory.getLog(Markup.class);
+ private static final Logger log = LoggerFactory.getLogger(Markup.class);
/** Placeholder that indicates no markup */
public static final Markup NO_MARKUP = new Markup();
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupCache.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.Application;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.WicketRuntimeException;
@@ -30,6 +28,8 @@
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.watch.ModificationWatcher;
import org.apache.wicket.util.watch.Watcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -42,7 +42,7 @@
public class MarkupCache
{
/** Log for reporting. */
- private static final Log log = LogFactory.getLog(MarkupCache.class);
+ private static final Logger log = LoggerFactory.getLogger(MarkupCache.class);
/** Map of markup tags by class (exactly what is in the file). */
private final Map markupCache = new ConcurrentHashMap();
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupFragment.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupFragment.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupFragment.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MarkupFragment.java Thu Apr 26 12:01:10 2007
@@ -21,9 +21,9 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.util.string.AppendingStringBuffer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -39,7 +39,7 @@
*/
public class MarkupFragment
{
- private static final Log log = LogFactory.getLog(MarkupFragment.class);
+ private static final Logger log = LoggerFactory.getLogger(MarkupFragment.class);
/** Placeholder that indicates no markup */
public static final MarkupFragment NO_MARKUP_FRAGMENT = new MarkupFragment(Markup.NO_MARKUP);
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MergedMarkup.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MergedMarkup.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MergedMarkup.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/MergedMarkup.java Thu Apr 26 12:01:10 2007
@@ -16,13 +16,13 @@
*/
package org.apache.wicket.markup;
-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.markup.parser.XmlTag;
import org.apache.wicket.markup.parser.filter.HtmlHeaderSectionHandler;
import org.apache.wicket.util.string.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -47,7 +47,7 @@
*/
public class MergedMarkup extends Markup
{
- private final static Log log = LogFactory.getLog(MergedMarkup.class);
+ private final static Logger log = LoggerFactory.getLogger(MergedMarkup.class);
/**
* Merge inherited and base markup.
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/AjaxServerAndClientTimeFilter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/AjaxServerAndClientTimeFilter.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/AjaxServerAndClientTimeFilter.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/AjaxServerAndClientTimeFilter.java Thu Apr 26 12:01:10 2007
@@ -19,14 +19,14 @@
import java.util.HashMap;
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.IResponseFilter;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.JavascriptUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -45,7 +45,7 @@
*/
public class AjaxServerAndClientTimeFilter implements IResponseFilter
{
- private static Log log = LogFactory.getLog(AjaxServerAndClientTimeFilter.class);
+ private static Logger log = LoggerFactory.getLogger(AjaxServerAndClientTimeFilter.class);
/**
* @see org.apache.wicket.IResponseFilter#filter(java.lang.StringBuffer)
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java Thu Apr 26 12:01:10 2007
@@ -23,8 +23,6 @@
import java.lang.ref.SoftReference;
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.SharedResources;
import org.apache.wicket.util.io.Streams;
@@ -32,6 +30,8 @@
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.string.JavascriptStripper;
import org.apache.wicket.util.time.Time;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -156,7 +156,7 @@
private static final long serialVersionUID = 1L;;
- private static final Log log = LogFactory.getLog(JavascriptPackageResource.class);
+ private static final Logger log = LoggerFactory.getLogger(JavascriptPackageResource.class);
/**
* Gets the resource for a given set of criteria. Only one resource will be
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java Thu Apr 26 12:01:10 2007
@@ -33,8 +33,6 @@
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.lang.Packages;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.string.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -103,7 +103,7 @@
public static final Pattern EXTENSION_JS = Pattern.compile(".*\\.js");
/** log. */
- private static final Log log = LogFactory.getLog(PackageResource.class);
+ private static final Logger log = LoggerFactory.getLogger(PackageResource.class);
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/ServerAndClientTimeFilter.java Thu Apr 26 12:01:10 2007
@@ -19,14 +19,14 @@
import java.util.HashMap;
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.IResponseFilter;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.JavascriptUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -44,7 +44,7 @@
*/
public class ServerAndClientTimeFilter implements IResponseFilter
{
- private static final Log log = LogFactory.getLog(ServerAndClientTimeFilter.class);
+ private static final Logger log = LoggerFactory.getLogger(ServerAndClientTimeFilter.class);
/**
* @see org.apache.wicket.IResponseFilter#filter(AppendingStringBuffer)
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/ServerTimeFilter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/ServerTimeFilter.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/ServerTimeFilter.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/ServerTimeFilter.java Thu Apr 26 12:01:10 2007
@@ -16,12 +16,12 @@
*/
package org.apache.wicket.markup.html;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.IResponseFilter;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.JavascriptUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -36,7 +36,7 @@
*/
public class ServerTimeFilter implements IResponseFilter
{
- private static final Log log = LogFactory.getLog(ServerTimeFilter.class);
+ private static final Logger log = LoggerFactory.getLogger(ServerTimeFilter.class);
/**
* @see org.apache.wicket.IResponseFilter#filter(AppendingStringBuffer)
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java Thu Apr 26 12:01:10 2007
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.markup.html;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Component;
import org.apache.wicket.IPageMap;
import org.apache.wicket.IRequestTarget;
@@ -46,6 +44,8 @@
import org.apache.wicket.request.target.component.IBookmarkablePageRequestTarget;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.JavascriptUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -73,7 +73,7 @@
private static final long serialVersionUID = 1L;
/** log. */
- private static final Log log = LogFactory.getLog(WebPage.class);
+ private static final Logger log = LoggerFactory.getLogger(WebPage.class);
/** The resource references used for new window/tab support */
private static ResourceReference cookiesResource = new ResourceReference(WebPage.class,
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java Thu Apr 26 12:01:10 2007
@@ -21,8 +21,6 @@
import java.util.Locale;
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.IRequestTarget;
import org.apache.wicket.MarkupContainer;
@@ -53,6 +51,8 @@
import org.apache.wicket.util.upload.FileUploadException;
import org.apache.wicket.util.upload.FileUploadBase.SizeLimitExceededException;
import org.apache.wicket.util.value.ValueMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -195,7 +195,7 @@
private static final long serialVersionUID = 1L;
/** Log. */
- private static final Log log = LogFactory.getLog(Form.class);
+ private static final Logger log = LoggerFactory.getLogger(Form.class);
/** Maximum size of an upload in bytes */
private Bytes maxSize = Bytes.MAX;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/PasswordTextField.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/PasswordTextField.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/PasswordTextField.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/PasswordTextField.java Thu Apr 26 12:01:10 2007
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.markup.html.form;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -37,7 +37,7 @@
private static final long serialVersionUID = 1L;
/** Log. */
- private static final Log log = LogFactory.getLog(PasswordTextField.class);
+ private static final Logger log = LoggerFactory.getLogger(PasswordTextField.class);
/**
* Flag indicating whether the contents of the field should be reset each
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java Thu Apr 26 12:01:10 2007
@@ -18,13 +18,13 @@
import javax.servlet.http.Cookie;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.util.time.Time;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -38,7 +38,7 @@
private static final long serialVersionUID = 1L;
/** Logging */
- private final static Log log = LogFactory.getLog(CookieValuePersister.class);
+ private final static Logger log = LoggerFactory.getLogger(CookieValuePersister.class);
/**
* @see org.apache.wicket.markup.html.form.persistence.IValuePersister#clear(org.apache.wicket.markup.html.form.FormComponent)
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java Thu Apr 26 12:01:10 2007
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.markup.html.internal;
-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.WicketRuntimeException;
@@ -27,6 +25,8 @@
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.parser.filter.EnclosureHandler;
import org.apache.wicket.markup.resolver.EnclosureResolver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@@ -74,7 +74,7 @@
{
private static final long serialVersionUID = 1L;
- private static final Log log = LogFactory.getLog(Enclosure.class);
+ private static final Logger log = LoggerFactory.getLogger(Enclosure.class);
/** The child component to delegate the isVisible() call to */
private Component childComponent;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java Thu Apr 26 12:01:10 2007
@@ -16,13 +16,13 @@
*/
package org.apache.wicket.markup.html.link;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Component;
import org.apache.wicket.IClusterable;
import org.apache.wicket.IPageMap;
import org.apache.wicket.Page;
import org.apache.wicket.PageMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -44,7 +44,7 @@
public class PopupSettings implements IClusterable
{
/** The log. */
- private static final Log log = LogFactory.getLog(PopupSettings.class);
+ private static final Logger log = LoggerFactory.getLogger(PopupSettings.class);
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/pages/BrowserInfoPage.java Thu Apr 26 12:01:10 2007
@@ -18,8 +18,6 @@
import java.io.Serializable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.IClusterable;
import org.apache.wicket.PageParameters;
@@ -39,6 +37,8 @@
import org.apache.wicket.request.ClientInfo;
import org.apache.wicket.request.target.component.BookmarkablePageRequestTarget;
import org.apache.wicket.settings.IRequestCycleSettings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -484,7 +484,7 @@
}
/** log. */
- private static final Log log = LogFactory.getLog(BrowserInfoPage.class);
+ private static final Logger log = LoggerFactory.getLogger(BrowserInfoPage.class);
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java Thu Apr 26 12:01:10 2007
@@ -20,12 +20,12 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupElement;
import org.apache.wicket.markup.parser.AbstractMarkupFilter;
import org.apache.wicket.util.collections.ArrayListStack;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -38,7 +38,7 @@
public final class HtmlHandler extends AbstractMarkupFilter
{
/** Logging */
- private static final Log log = LogFactory.getLog(HtmlHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(HtmlHandler.class);
/** Tag stack to find balancing tags */
final private ArrayListStack stack = new ArrayListStack();
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java Thu Apr 26 12:01:10 2007
@@ -19,11 +19,11 @@
import java.text.ParseException;
import java.util.Iterator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupElement;
import org.apache.wicket.markup.parser.AbstractMarkupFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -49,7 +49,7 @@
public final class HtmlProblemFinder extends AbstractMarkupFilter
{
/** Logging */
- private static final Log log = LogFactory.getLog(HtmlProblemFinder.class);
+ private static final Logger log = LoggerFactory.getLogger(HtmlProblemFinder.class);
/** Ignore the issue detected */
public static final int ERR_INGORE = 3;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/PrependContextPathHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/PrependContextPathHandler.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/PrependContextPathHandler.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/PrependContextPathHandler.java Thu Apr 26 12:01:10 2007
@@ -18,8 +18,6 @@
import java.text.ParseException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.IMarkupParserFactory;
@@ -27,6 +25,8 @@
import org.apache.wicket.markup.MarkupParserFactory;
import org.apache.wicket.markup.parser.AbstractMarkupFilter;
import org.apache.wicket.settings.IMarkupSettings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -48,7 +48,7 @@
private static final String attributeNames[] = new String[] { "href", "src", "background" };
/** Logging */
- private static final Log log = LogFactory.getLog(PrependContextPathHandler.class);
+ private static final Logger log = LoggerFactory.getLogger(PrependContextPathHandler.class);
private final Application application;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java Thu Apr 26 12:01:10 2007
@@ -21,8 +21,6 @@
import java.util.Map;
import java.util.Set;
-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.Page;
@@ -40,6 +38,8 @@
import org.apache.wicket.protocol.http.RequestUtils;
import org.apache.wicket.util.lang.Packages;
import org.apache.wicket.util.string.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -671,7 +671,7 @@
"href");
/** Logging */
- private static final Log log = LogFactory.getLog(AutoLinkResolver.class);
+ private static final Logger log = LoggerFactory.getLogger(AutoLinkResolver.class);
private static final long serialVersionUID = 1L;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java Thu Apr 26 12:01:10 2007
@@ -16,12 +16,12 @@
*/
package org.apache.wicket.markup.resolver;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -59,7 +59,7 @@
*/
public class WicketContainerResolver implements IComponentResolver
{
- private static final Log log = LogFactory.getLog(WicketContainerResolver.class);
+ private static final Logger log = LoggerFactory.getLogger(WicketContainerResolver.class);
static
{
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java Thu Apr 26 12:01:10 2007
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.markup.resolver;
-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.markup.ComponentTag;
@@ -28,6 +26,8 @@
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.parser.XmlTag;
import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -41,7 +41,7 @@
*/
public class WicketMessageResolver implements IComponentResolver
{
- private static final Log log = LogFactory.getLog(WicketMessageResolver.class);
+ private static final Logger log = LoggerFactory.getLogger(WicketMessageResolver.class);
static
{
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/LoadableDetachableModel.java Thu Apr 26 12:01:10 2007
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.model;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Component;
import org.apache.wicket.RequestCycle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -53,7 +53,7 @@
public abstract class LoadableDetachableModel extends AbstractReadOnlyModel
{
/** Logger. */
- private static final Log log = LogFactory.getLog(LoadableDetachableModel.class);
+ private static final Logger log = LoggerFactory.getLogger(LoadableDetachableModel.class);
/** keeps track of whether this model is attached or detached */
private transient boolean attached = false;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/AbstractHttpSessionStore.java Thu Apr 26 12:01:10 2007
@@ -22,8 +22,6 @@
import javax.servlet.http.HttpSessionBindingEvent;
import javax.servlet.http.HttpSessionBindingListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
import org.apache.wicket.IPageMap;
import org.apache.wicket.Page;
@@ -33,6 +31,8 @@
import org.apache.wicket.settings.IPageSettings;
import org.apache.wicket.version.IPageVersionManager;
import org.apache.wicket.version.undo.UndoPageVersionManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -106,7 +106,7 @@
}
/** log. */
- protected static Log log = LogFactory.getLog(AbstractHttpSessionStore.class);
+ protected static Logger log = LoggerFactory.getLogger(AbstractHttpSessionStore.class);
/** The web application for this store. Is never null. */
protected final WebApplication application;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java?view=diff&rev=532837&r1=532836&r2=532837
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/FilePageStore.java Thu Apr 26 12:01:10 2007
@@ -28,13 +28,13 @@
import java.util.Map;
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.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;
/**
@@ -364,7 +364,7 @@
private static final Object SERIALIZING = new Object();
/** log. */
- protected static Log log = LogFactory.getLog(FilePageStore.class);
+ protected static Logger log = LoggerFactory.getLogger(FilePageStore.class);
private final File defaultWorkDir;