You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/07/04 20:53:37 UTC
svn commit: r791161 - in /tiles/framework/trunk: assembly/ tiles-api/
tiles-api/src/main/java/org/apache/tiles/access/
tiles-api/src/main/java/org/apache/tiles/reflect/ tiles-compat/
tiles-compat/src/test/java/org/apache/tiles/compat/definition/digeste...
Author: apetrelli
Date: Sat Jul 4 18:53:36 2009
New Revision: 791161
URL: http://svn.apache.org/viewvc?rev=791161&view=rev
Log:
TILES-424
Migrated to SLF4j in dependencies, code.
Added exclusion of commons-logging in dependencies that use it and, instead, added dependency to jcl-slf4j adaptation layer.
Modified:
tiles/framework/trunk/assembly/pom.xml
tiles/framework/trunk/tiles-api/pom.xml
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/ClassUtil.java
tiles/framework/trunk/tiles-compat/pom.xml
tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java
tiles/framework/trunk/tiles-core/pom.xml
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/AbstractTilesApplicationContextFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesApplicationContextFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesRequestContextFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContext.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactoryTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java
tiles/framework/trunk/tiles-freemarker/pom.xml
tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
tiles/framework/trunk/tiles-jsp/pom.xml
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspPrintWriterAdapter.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java
tiles/framework/trunk/tiles-portlet/pom.xml
tiles/framework/trunk/tiles-servlet/pom.xml
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesListener.java
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesServlet.java
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java
tiles/framework/trunk/tiles-template/pom.xml
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
tiles/framework/trunk/tiles-test/pom.xml
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/init/InitContextListener.java
tiles/framework/trunk/tiles-velocity/pom.xml
tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderable.java
Modified: tiles/framework/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/pom.xml?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/assembly/pom.xml (original)
+++ tiles/framework/trunk/assembly/pom.xml Sat Jul 4 18:53:36 2009
@@ -212,10 +212,23 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.8</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>2.5.6</version>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -228,6 +241,10 @@
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
Modified: tiles/framework/trunk/tiles-api/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/pom.xml?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-api/pom.xml (original)
+++ tiles/framework/trunk/tiles-api/pom.xml Sat Jul 4 18:53:36 2009
@@ -82,23 +82,22 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<scope>test</scope>
</dependency>
-
- <dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>2.5.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.8</version>
+ <optional>true</optional>
+ </dependency>
</dependencies>
</project>
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java Sat Jul 4 18:53:36 2009
@@ -20,13 +20,13 @@
*/
package org.apache.tiles.access;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.lang.reflect.Method;
+
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.reflect.ClassUtil;
-
-import java.lang.reflect.Method;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -98,7 +98,7 @@
*/
public static void setContainer(TilesApplicationContext context,
TilesContainer container, String key) {
- Log log = LogFactory.getLog(TilesAccess.class);
+ Logger log = LoggerFactory.getLogger(TilesAccess.class);
if (key == null) {
key = CONTAINER_ATTRIBUTE;
}
@@ -126,7 +126,7 @@
*/
@Deprecated
public static void setContainer(Object context, TilesContainer container) {
- Log log = LogFactory.getLog(TilesAccess.class);
+ Logger log = LoggerFactory.getLogger(TilesAccess.class);
if (container == null) {
if (log.isInfoEnabled()) {
log.info("Removing TilesContext for context: " + context.getClass().getName());
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/ClassUtil.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/ClassUtil.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/ClassUtil.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/reflect/ClassUtil.java Sat Jul 4 18:53:36 2009
@@ -27,8 +27,8 @@
import java.lang.reflect.Method;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -186,7 +186,7 @@
*/
public static void collectBeanInfo(Class<?> clazz,
Map<String, PropertyDescriptor> name2descriptor) {
- Log log = LogFactory.getLog(ClassUtil.class);
+ Logger log = LoggerFactory.getLogger(ClassUtil.class);
BeanInfo info = null;
try {
info = Introspector.getBeanInfo(clazz);
Modified: tiles/framework/trunk/tiles-compat/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/pom.xml?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-compat/pom.xml (original)
+++ tiles/framework/trunk/tiles-compat/pom.xml Sat Jul 4 18:53:36 2009
@@ -98,6 +98,13 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.8</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
Modified: tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java (original)
+++ tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java Sat Jul 4 18:53:36 2009
@@ -30,12 +30,12 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.Attribute;
import org.apache.tiles.Definition;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.DefinitionsReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Tests the <code>org.apache.tiles.definition.digester.DigesterDefinitionsReader</code> class.
@@ -47,8 +47,8 @@
/**
* The logging object.
*/
- private final Log log = LogFactory
- .getLog(TestCompatibilityDigesterDefinitionsReader.class);
+ private final Logger log = LoggerFactory
+ .getLogger(TestCompatibilityDigesterDefinitionsReader.class);
/**
* The definitions reader.
Modified: tiles/framework/trunk/tiles-core/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/pom.xml?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/pom.xml (original)
+++ tiles/framework/trunk/tiles-core/pom.xml Sat Jul 4 18:53:36 2009
@@ -104,9 +104,16 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.1</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.8</version>
+ <optional>true</optional>
</dependency>
<dependency>
@@ -158,10 +165,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mvel</groupId>
- <artifactId>mvel2</artifactId>
- <version>2.0.11</version>
- <optional>true</optional>
+ <groupId>org.mvel</groupId>
+ <artifactId>mvel2</artifactId>
+ <version>2.0.11</version>
+ <optional>true</optional>
</dependency>
</dependencies>
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/AbstractTilesApplicationContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/AbstractTilesApplicationContextFactory.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/AbstractTilesApplicationContextFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/AbstractTilesApplicationContextFactory.java Sat Jul 4 18:53:36 2009
@@ -22,11 +22,11 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.Initializable;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.reflect.ClassUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Abstract factory to create factories for {@link TilesApplicationContext}.
@@ -64,8 +64,8 @@
*/
public static AbstractTilesApplicationContextFactory createFactory(
TilesApplicationContext preliminaryContext) {
- Log log = LogFactory
- .getLog(AbstractTilesApplicationContextFactory.class);
+ Logger log = LoggerFactory
+ .getLogger(AbstractTilesApplicationContextFactory.class);
AbstractTilesApplicationContextFactory retValue;
if (log.isInfoEnabled()) {
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesApplicationContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesApplicationContextFactory.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesApplicationContextFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesApplicationContextFactory.java Sat Jul 4 18:53:36 2009
@@ -21,18 +21,18 @@
package org.apache.tiles.context;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.tiles.Initializable;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.awareness.AbstractTilesApplicationContextFactoryAware;
-import org.apache.tiles.reflect.ClassUtil;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.tiles.Initializable;
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.awareness.AbstractTilesApplicationContextFactoryAware;
+import org.apache.tiles.reflect.ClassUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Implementation for TilesApplicationContextFactory, that creates a chain of
* sub-factories, trying each one until it returns a not-null value.
@@ -63,8 +63,8 @@
/**
* The logging object.
*/
- private final Log log = LogFactory
- .getLog(ChainedTilesApplicationContextFactory.class);
+ private final Logger log = LoggerFactory
+ .getLogger(ChainedTilesApplicationContextFactory.class);
/**
* The Tiles context factories composing the chain.
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java Sat Jul 4 18:53:36 2009
@@ -21,17 +21,17 @@
package org.apache.tiles.context;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
-import org.apache.tiles.reflect.ClassUtil;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
+import org.apache.tiles.reflect.ClassUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Default implementation for TilesContextFactory, that creates a chain of
* sub-factories, trying each one until it returns a not-null value.
@@ -65,8 +65,8 @@
/**
* The logging object.
*/
- private final Log log = LogFactory
- .getLog(ChainedTilesContextFactory.class);
+ private final Logger log = LoggerFactory
+ .getLogger(ChainedTilesContextFactory.class);
/**
* The Tiles context factories composing the chain.
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesRequestContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesRequestContextFactory.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesRequestContextFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesRequestContextFactory.java Sat Jul 4 18:53:36 2009
@@ -21,17 +21,17 @@
package org.apache.tiles.context;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
-import org.apache.tiles.reflect.ClassUtil;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
+import org.apache.tiles.reflect.ClassUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Default implementation for TilesRequestContextFactory, that creates a chain
* of sub-factories, trying each one until it returns a not-null value.
@@ -62,8 +62,8 @@
/**
* The logging object.
*/
- private final Log log = LogFactory
- .getLog(ChainedTilesRequestContextFactory.class);
+ private final Logger log = LoggerFactory
+ .getLogger(ChainedTilesRequestContextFactory.class);
/**
* The Tiles context factories composing the chain.
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContext.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContext.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContext.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContext.java Sat Jul 4 18:53:36 2009
@@ -27,9 +27,9 @@
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.TilesApplicationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* ApplicationContext decorator used to provide
@@ -54,8 +54,8 @@
/**
* The logging object.
*/
- private final Log log =
- LogFactory.getLog(EnhancedTilesApplicationContext.class);
+ private final Logger log =
+ LoggerFactory.getLogger(EnhancedTilesApplicationContext.class);
/**
* The root context to be wrapped.
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java Sat Jul 4 18:53:36 2009
@@ -21,17 +21,17 @@
package org.apache.tiles.definition;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.tiles.Attribute;
-import org.apache.tiles.Definition;
-
import java.util.HashMap;
import java.util.HashSet;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
+import org.apache.tiles.Attribute;
+import org.apache.tiles.Definition;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* @version $Rev$ $Date$
*
@@ -45,7 +45,7 @@
/**
* Commons Logging instance.
*/
- private final Log log = LogFactory.getLog(DefinitionsImpl.class);
+ private final Logger log = LoggerFactory.getLogger(DefinitionsImpl.class);
/**
* The base set of Definition objects not discriminated by locale.
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java Sat Jul 4 18:53:36 2009
@@ -20,8 +20,13 @@
*/
package org.apache.tiles.definition;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.StringTokenizer;
+
import org.apache.tiles.Definition;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.dao.DefinitionDAO;
@@ -29,13 +34,8 @@
import org.apache.tiles.definition.dao.URLReader;
import org.apache.tiles.impl.BasicTilesContainer;
import org.apache.tiles.util.LocaleUtil;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.StringTokenizer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* {@link DefinitionsFactory DefinitionsFactory} implementation that manages
@@ -63,7 +63,8 @@
/**
* LOG instance for all UrlDefinitionsFactory instances.
*/
- private final Log log = LogFactory.getLog(UrlDefinitionsFactory.class);
+ private final Logger log = LoggerFactory
+ .getLogger(UrlDefinitionsFactory.class);
/**
* Contains the URL objects identifying where configuration data is found.
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java Sat Jul 4 18:53:36 2009
@@ -32,8 +32,6 @@
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.Definition;
import org.apache.tiles.Initializable;
import org.apache.tiles.TilesApplicationContext;
@@ -45,6 +43,8 @@
import org.apache.tiles.definition.digester.DigesterDefinitionsReader;
import org.apache.tiles.impl.BasicTilesContainer;
import org.apache.tiles.reflect.ClassUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Base abstract class for a DAO that is based on URLs and locale as a
@@ -60,8 +60,8 @@
/**
* The logging object.
*/
- private final Log log = LogFactory
- .getLog(BaseLocaleUrlDefinitionDAO.class);
+ private final Logger log = LoggerFactory
+ .getLogger(BaseLocaleUrlDefinitionDAO.class);
/**
* Compatibility constant.
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java Sat Jul 4 18:53:36 2009
@@ -26,10 +26,10 @@
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.Definition;
import org.apache.tiles.definition.NoSuchDefinitionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -49,7 +49,7 @@
/**
* The logging object.
*/
- private final Log log = LogFactory.getLog(ResolvingLocaleUrlDefinitionDAO.class);
+ private final Logger log = LoggerFactory.getLogger(ResolvingLocaleUrlDefinitionDAO.class);
/** {@inheritDoc} */
@Override
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java Sat Jul 4 18:53:36 2009
@@ -26,8 +26,6 @@
import java.util.List;
import java.util.Locale;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
@@ -61,6 +59,8 @@
import org.apache.tiles.renderer.impl.StringAttributeRenderer;
import org.apache.tiles.renderer.impl.TemplateAttributeRenderer;
import org.apache.tiles.renderer.impl.UntypedAttributeRenderer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Factory that builds a standard Tiles container using only Java code.
@@ -78,7 +78,8 @@
/**
* The logging object.
*/
- private final Log log = LogFactory.getLog(BasicTilesContainerFactory.class);
+ private final Logger log = LoggerFactory
+ .getLogger(BasicTilesContainerFactory.class);
/** {@inheritDoc} */
@Override
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java Sat Jul 4 18:53:36 2009
@@ -25,8 +25,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.Initializable;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
@@ -52,6 +50,8 @@
import org.apache.tiles.reflect.ClassUtil;
import org.apache.tiles.renderer.RendererFactory;
import org.apache.tiles.renderer.impl.BasicRendererFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Factory provided for convenience.
@@ -128,7 +128,8 @@
/**
* The logging object.
*/
- private final Log log = LogFactory.getLog(TilesContainerFactory.class);
+ private final Logger log = LoggerFactory
+ .getLogger(TilesContainerFactory.class);
/**
* Default configuration parameters.
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java Sat Jul 4 18:53:36 2009
@@ -20,8 +20,14 @@
*/
package org.apache.tiles.impl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+import java.util.StringTokenizer;
+
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.BasicAttributeContext;
@@ -41,14 +47,8 @@
import org.apache.tiles.preparer.ViewPreparer;
import org.apache.tiles.renderer.AttributeRenderer;
import org.apache.tiles.renderer.RendererFactory;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-import java.util.StringTokenizer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Basic implementation of the tiles container interface.
@@ -88,8 +88,8 @@
* Log instance for all BasicTilesContainer
* instances.
*/
- private final Log log =
- LogFactory.getLog(BasicTilesContainer.class);
+ private final Logger log = LoggerFactory
+ .getLogger(BasicTilesContainer.class);
/**
* The Tiles application context object.
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java Sat Jul 4 18:53:36 2009
@@ -20,17 +20,17 @@
*/
package org.apache.tiles.impl.mgmt;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.tiles.Attribute;
import org.apache.tiles.Definition;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.NoSuchDefinitionException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Manages custom and configured definitions, so they can be used by the
@@ -43,8 +43,7 @@
/**
* The logging object.
*/
- private final Log log =
- LogFactory.getLog(DefinitionManager.class);
+ private final Logger log = LoggerFactory.getLogger(DefinitionManager.class);
/**
* The default name of the attribute in which storing custom definitions.
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java Sat Jul 4 18:53:36 2009
@@ -20,14 +20,14 @@
*/
package org.apache.tiles.preparer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.reflect.ClassUtil;
-
import java.util.HashMap;
import java.util.Map;
+import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.reflect.ClassUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Default implementation of the {@link PreparerFactory}.
* This factory provides no contextual configuration. It
@@ -41,8 +41,8 @@
/**
* The logging object.
*/
- private final Log log =
- LogFactory.getLog(BasicPreparerFactory.class);
+ private final Logger log = LoggerFactory
+ .getLogger(BasicPreparerFactory.class);
/**
* Maps a preparer name to the instantiated preparer.
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/renderer/impl/AbstractBaseAttributeRenderer.java Sat Jul 4 18:53:36 2009
@@ -24,8 +24,6 @@
import java.util.Iterator;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.awareness.TilesApplicationContextAware;
@@ -36,6 +34,8 @@
import org.apache.tiles.evaluator.AttributeEvaluatorFactory;
import org.apache.tiles.evaluator.AttributeEvaluatorFactoryAware;
import org.apache.tiles.renderer.AttributeRenderer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Base abstract class that manages authorization to display the attribute.
@@ -50,8 +50,8 @@
/**
* The logging object.
*/
- private final Log log = LogFactory
- .getLog(AbstractBaseAttributeRenderer.class);
+ private final Logger log = LoggerFactory
+ .getLogger(AbstractBaseAttributeRenderer.class);
/**
* The Tiles request context factory.
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java Sat Jul 4 18:53:36 2009
@@ -27,17 +27,18 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.Attribute;
import org.apache.tiles.Definition;
import org.apache.tiles.ListAttribute;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.DefinitionsReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Tests the <code>org.apache.tiles.definition.digester.DigesterDefinitionsReader</code> class.
@@ -49,8 +50,8 @@
/**
* The logging object.
*/
- private final Log log = LogFactory
- .getLog(TestDigesterDefinitionsReader.class);
+ private final Logger log = LoggerFactory
+ .getLogger(TestDigesterDefinitionsReader.class);
/**
* The definitions reader.
@@ -95,6 +96,7 @@
* Tests the read method under normal conditions.
* @throws IOException If something goes wrong.
*/
+ @SuppressWarnings("unchecked")
public void testRead() throws IOException {
reader.init(new HashMap<String, String>());
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactoryTest.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactoryTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactoryTest.java Sat Jul 4 18:53:36 2009
@@ -29,8 +29,6 @@
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.context.ChainedTilesApplicationContextFactory;
@@ -39,6 +37,8 @@
import org.apache.tiles.mock.RepeaterTilesApplicationContextFactory;
import org.apache.tiles.mock.RepeaterTilesRequestContextFactory;
import org.easymock.EasyMock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -49,8 +49,8 @@
/**
* The logging object.
*/
- private final Log log = LogFactory
- .getLog(KeyedDefinitionsFactoryTilesContainerFactoryTest.class);
+ private final Logger log = LoggerFactory
+ .getLogger(KeyedDefinitionsFactoryTilesContainerFactoryTest.class);
/**
* The application context.
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java Sat Jul 4 18:53:36 2009
@@ -30,8 +30,6 @@
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.TilesException;
@@ -40,6 +38,8 @@
import org.apache.tiles.mock.RepeaterTilesApplicationContextFactory;
import org.apache.tiles.mock.RepeaterTilesRequestContextFactory;
import org.easymock.EasyMock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -55,8 +55,8 @@
/**
* The logging object.
*/
- private final Log log = LogFactory
- .getLog(TilesContainerFactoryTest.class);
+ private final Logger log = LoggerFactory
+ .getLogger(TilesContainerFactoryTest.class);
/**
* The servlet context.
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java Sat Jul 4 18:53:36 2009
@@ -30,8 +30,6 @@
import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesException;
@@ -42,6 +40,8 @@
import org.apache.tiles.mock.RepeaterTilesApplicationContextFactory;
import org.apache.tiles.mock.RepeaterTilesRequestContextFactory;
import org.easymock.EasyMock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -52,8 +52,8 @@
/**
* The logging object.
*/
- private final Log log = LogFactory
- .getLog(BasicTilesContainerTest.class);
+ private final Logger log = LoggerFactory
+ .getLogger(BasicTilesContainerTest.class);
/**
* A sample integer value to check object rendering.
Modified: tiles/framework/trunk/tiles-freemarker/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/pom.xml?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/pom.xml (original)
+++ tiles/framework/trunk/tiles-freemarker/pom.xml Sat Jul 4 18:53:36 2009
@@ -50,6 +50,14 @@
<artifactId>freemarker</artifactId>
<version>2.3.15</version>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.8</version>
+ <optional>true</optional>
+ </dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
Modified: tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java (original)
+++ tiles/framework/trunk/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContextFactory.java Sat Jul 4 18:53:36 2009
@@ -26,14 +26,14 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.awareness.TilesRequestContextFactoryAware;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.context.TilesRequestContextFactory;
import org.apache.tiles.freemarker.FreeMarkerTilesException;
import org.apache.tiles.servlet.context.ServletTilesRequestContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import freemarker.core.Environment;
import freemarker.ext.servlet.HttpRequestHashModel;
@@ -50,7 +50,7 @@
/**
* The logging object.
*/
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
/**
* Parent Tiles context factory.
Modified: tiles/framework/trunk/tiles-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/pom.xml?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/pom.xml (original)
+++ tiles/framework/trunk/tiles-jsp/pom.xml Sat Jul 4 18:53:36 2009
@@ -108,6 +108,13 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.8</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspPrintWriterAdapter.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspPrintWriterAdapter.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspPrintWriterAdapter.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspPrintWriterAdapter.java Sat Jul 4 18:53:36 2009
@@ -25,8 +25,8 @@
import javax.servlet.jsp.JspWriter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Adapts a {@link JspWriter} to a {@link PrintWriter}, swallowing {@link IOException}.
@@ -44,7 +44,7 @@
/**
* The logging object.
*/
- private Log log = LogFactory.getLog(this.getClass());
+ private final Logger log = LoggerFactory.getLogger(this.getClass());
/**
* Constructor.
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java Sat Jul 4 18:53:36 2009
@@ -32,13 +32,13 @@
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.JspFragment;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.impl.NoSuchContainerException;
import org.apache.tiles.jsp.taglib.TilesJspException;
import org.apache.tiles.servlet.context.ServletUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Utility class for working within a Jsp environment.
@@ -150,7 +150,7 @@
*/
public static void setContainer(JspContext context,
TilesContainer container, String key) {
- Log log = LogFactory.getLog(ServletUtil.class);
+ Logger log = LoggerFactory.getLogger(ServletUtil.class);
if (key == null) {
key = TilesAccess.CONTAINER_ATTRIBUTE;
}
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java Sat Jul 4 18:53:36 2009
@@ -19,7 +19,6 @@
* under the License.
*/
-
package org.apache.tiles.jsp.taglib.definition;
import java.io.InputStream;
@@ -36,8 +35,6 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.BasicAttributeContext;
import org.apache.tiles.TilesApplicationContext;
@@ -48,6 +45,8 @@
import org.apache.tiles.jsp.context.JspUtil;
import org.apache.tiles.jsp.taglib.TilesBodyTag;
import org.apache.tiles.servlet.context.ServletTilesApplicationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Init definitions impl.
@@ -63,8 +62,7 @@
/**
* The logging object.
*/
- private final Log log =
- LogFactory.getLog(InitContainerTag.class);
+ private final Logger log = LoggerFactory.getLogger(InitContainerTag.class);
/**
* The container factory class name to use.
Modified: tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java Sat Jul 4 18:53:36 2009
@@ -26,15 +26,15 @@
import javax.servlet.ServletContext;
import javax.servlet.jsp.PageContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import junit.framework.TestCase;
+
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.jsp.taglib.TilesJspException;
import org.apache.tiles.servlet.context.ServletUtil;
import org.easymock.classextension.EasyMock;
-
-import junit.framework.TestCase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Tests {@link JspUtil}.
@@ -46,7 +46,7 @@
/**
* The logging object.
*/
- private Log log = LogFactory.getLog(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
/**
* Tests {@link ServletUtil#getContainer(ServletContext)}.
Modified: tiles/framework/trunk/tiles-portlet/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-portlet/pom.xml?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-portlet/pom.xml (original)
+++ tiles/framework/trunk/tiles-portlet/pom.xml Sat Jul 4 18:53:36 2009
@@ -96,6 +96,12 @@
<artifactId>spring-web</artifactId>
<version>2.5.6</version>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -108,10 +114,22 @@
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.8</version>
+ <scope>runtime</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<version>2.0</version>
Modified: tiles/framework/trunk/tiles-servlet/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/pom.xml?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-servlet/pom.xml (original)
+++ tiles/framework/trunk/tiles-servlet/pom.xml Sat Jul 4 18:53:36 2009
@@ -103,10 +103,23 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.8</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>2.5.6</version>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java (original)
+++ tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java Sat Jul 4 18:53:36 2009
@@ -29,8 +29,6 @@
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
@@ -38,6 +36,8 @@
import org.apache.tiles.context.TilesRequestContextWrapper;
import org.apache.tiles.impl.NoSuchContainerException;
import org.apache.tiles.util.TilesIOException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -150,7 +150,7 @@
*/
public static void setContainer(ServletContext context,
TilesContainer container, String key) {
- Log log = LogFactory.getLog(ServletUtil.class);
+ Logger log = LoggerFactory.getLogger(ServletUtil.class);
if (key == null) {
key = TilesAccess.CONTAINER_ATTRIBUTE;
}
Modified: tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesListener.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesListener.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesListener.java (original)
+++ tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesListener.java Sat Jul 4 18:53:36 2009
@@ -20,8 +20,10 @@
*/
package org.apache.tiles.web.startup;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.TilesException;
@@ -30,10 +32,8 @@
import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.startup.BasicTilesInitializer;
import org.apache.tiles.startup.TilesInitializer;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Listener for the initialization of the Tiles container.
@@ -46,8 +46,7 @@
/**
* Log instance.
*/
- protected final Log log =
- LogFactory.getLog(TilesListener.class);
+ private Logger log = LoggerFactory.getLogger(TilesListener.class);
/**
* The initializer object.
Modified: tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesServlet.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesServlet.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesServlet.java (original)
+++ tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesServlet.java Sat Jul 4 18:53:36 2009
@@ -20,18 +20,18 @@
*/
package org.apache.tiles.web.startup;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+
import org.apache.tiles.TilesException;
import org.apache.tiles.servlet.context.ServletTilesApplicationContext;
import org.apache.tiles.servlet.context.ServletUtil;
import org.apache.tiles.startup.BasicTilesInitializer;
import org.apache.tiles.startup.TilesInitializer;
import org.apache.tiles.web.util.ServletContextAdapter;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Initialization Servlet.
@@ -44,8 +44,7 @@
/**
* Log instance.
*/
- protected final Log log =
- LogFactory.getLog(TilesServlet.class);
+ private Logger log = LoggerFactory.getLogger(TilesServlet.class);
/**
* The private listener instance, that is used to initialize Tiles
Modified: tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java (original)
+++ tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java Sat Jul 4 18:53:36 2009
@@ -20,13 +20,10 @@
*/
package org.apache.tiles.web.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.tiles.Attribute;
-import org.apache.tiles.AttributeContext;
-import org.apache.tiles.TilesContainer;
-import org.apache.tiles.reflect.ClassUtil;
-import org.apache.tiles.servlet.context.ServletUtil;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -36,10 +33,14 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Enumeration;
-import java.util.HashMap;
+
+import org.apache.tiles.Attribute;
+import org.apache.tiles.AttributeContext;
+import org.apache.tiles.TilesContainer;
+import org.apache.tiles.reflect.ClassUtil;
+import org.apache.tiles.servlet.context.ServletUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Decoration Filter. Intercepts all requests and decorates them
@@ -89,8 +90,7 @@
/**
* The logging object.
*/
- private final Log log =
- LogFactory.getLog(TilesDecorationFilter.class);
+ private Logger log = LoggerFactory.getLogger(TilesDecorationFilter.class);
/**
* Filter configuration.
Modified: tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java (original)
+++ tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java Sat Jul 4 18:53:36 2009
@@ -20,19 +20,20 @@
*/
package org.apache.tiles.web.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.tiles.TilesContainer;
-import org.apache.tiles.AttributeContext;
-import org.apache.tiles.reflect.ClassUtil;
-import org.apache.tiles.servlet.context.ServletUtil;
+import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+
+import org.apache.tiles.AttributeContext;
+import org.apache.tiles.TilesContainer;
+import org.apache.tiles.reflect.ClassUtil;
+import org.apache.tiles.servlet.context.ServletUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Tiles dispatching servlet. Used to invoke
@@ -51,8 +52,8 @@
/**
* The logging object.
*/
- private final Log log =
- LogFactory.getLog(TilesDispatchServlet.class);
+ private final Logger log = LoggerFactory
+ .getLogger(TilesDispatchServlet.class);
/**
* The key under which the container is stored.
Modified: tiles/framework/trunk/tiles-template/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/pom.xml?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/pom.xml (original)
+++ tiles/framework/trunk/tiles-template/pom.xml Sat Jul 4 18:53:36 2009
@@ -42,6 +42,13 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.8</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
Modified: tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java (original)
+++ tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java Sat Jul 4 18:53:36 2009
@@ -25,10 +25,10 @@
import java.io.Writer;
import java.util.Stack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -50,7 +50,7 @@
/**
* The logging object.
*/
- private Log log = LogFactory.getLog(getClass());
+ private Logger log = LoggerFactory.getLogger(getClass());
/**
* The attribute resolver to use.
Modified: tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java (original)
+++ tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/ImportAttributeModel.java Sat Jul 4 18:53:36 2009
@@ -25,11 +25,11 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
import org.apache.tiles.TilesContainer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -49,7 +49,7 @@
/**
* The logging object.
*/
- private Log log = LogFactory.getLog(getClass());
+ private Logger log = LoggerFactory.getLogger(getClass());
/**
* Retuns a Map that contains the attributes to be imported. The importing
Modified: tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java (original)
+++ tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java Sat Jul 4 18:53:36 2009
@@ -24,10 +24,10 @@
import java.io.IOException;
import java.util.Stack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.Attribute;
import org.apache.tiles.TilesContainer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <p>
@@ -62,7 +62,7 @@
/**
* The logging object.
*/
- private Log log = LogFactory.getLog(getClass());
+ private Logger log = LoggerFactory.getLogger(getClass());
/**
* The attribute resolver to use.
Modified: tiles/framework/trunk/tiles-test/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/pom.xml?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/pom.xml (original)
+++ tiles/framework/trunk/tiles-test/pom.xml Sat Jul 4 18:53:36 2009
@@ -57,6 +57,13 @@
<artifactId>tiles-velocity</artifactId>
<version>${pom.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -106,11 +113,23 @@
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>2.5.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>2.5.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.mvel</groupId>
Modified: tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/init/InitContextListener.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/init/InitContextListener.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/init/InitContextListener.java (original)
+++ tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/init/InitContextListener.java Sat Jul 4 18:53:36 2009
@@ -32,10 +32,10 @@
import javax.sql.DataSource;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.test.exception.TilesTestRuntimeException;
import org.hsqldb.jdbc.jdbcDataSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Initializes the data source of the DB.
@@ -47,7 +47,8 @@
/**
* The logging object.
*/
- private final Log log = LogFactory.getLog(InitContextListener.class);
+ private final Logger log = LoggerFactory
+ .getLogger(InitContextListener.class);
/** {@inheritDoc} */
public void contextInitialized(ServletContextEvent event) {
Modified: tiles/framework/trunk/tiles-velocity/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/pom.xml?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/pom.xml (original)
+++ tiles/framework/trunk/tiles-velocity/pom.xml Sat Jul 4 18:53:36 2009
@@ -44,6 +44,14 @@
<artifactId>tiles-template</artifactId>
<version>${pom.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.8</version>
+ <optional>true</optional>
+ </dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -72,6 +80,10 @@
<artifactId>struts-core</artifactId>
<groupId>org.apache.struts</groupId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderable.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderable.java?rev=791161&r1=791160&r2=791161&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderable.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/template/AbstractDefaultToStringRenderable.java Sat Jul 4 18:53:36 2009
@@ -28,14 +28,14 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.velocity.TilesVelocityException;
import org.apache.velocity.context.Context;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.Renderable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Renderable that provides a default implementation of {@link Renderable#toString()}
@@ -78,7 +78,7 @@
/**
* The logging object.
*/
- private Log log = LogFactory.getLog(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
/**
* Constructor.