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/01/16 14:27:29 UTC
svn commit: r734996 - in /tiles/framework/trunk:
tiles-api/src/main/java/org/apache/tiles/access/
tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/
tiles-core/src/main/java/org/apache/tiles/context/
tiles-core/src/main/java/org/ap...
Author: apetrelli
Date: Fri Jan 16 05:27:28 2009
New Revision: 734996
URL: http://svn.apache.org/viewvc?rev=734996&view=rev
Log:
TILES-353
Removed static references to logging objects.
Refactoring to follow checkstyle rules.
Modified:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
tiles/framework/trunk/tiles-compat/src/test/java/org/apache/tiles/compat/definition/digester/TestCompatibilityDigesterDefinitionsReader.java
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/evaluator/el/TilesContextELResolver.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-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ContainerTagSupport.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RoleSecurityTagSupport.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
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/TilesFilter.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-test/src/main/java/org/apache/tiles/test/init/InitContextListener.java
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -43,12 +43,6 @@
}
/**
- * The logging object.
- */
- private static final Log LOG =
- LogFactory.getLog(TilesAccess.class);
-
- /**
* The name of the attribute to use when getting and setting the container
* object in a context.
*/
@@ -104,18 +98,19 @@
*/
public static void setContainer(TilesApplicationContext context,
TilesContainer container, String key) {
+ Log log = LogFactory.getLog(TilesAccess.class);
if (key == null) {
key = CONTAINER_ATTRIBUTE;
}
if (container == null) {
- if (LOG.isInfoEnabled()) {
- LOG.info("Removing TilesContext for context: " + context.getClass().getName());
+ if (log.isInfoEnabled()) {
+ log.info("Removing TilesContext for context: " + context.getClass().getName());
}
context.getApplicationScope().remove(key);
}
- if (container != null && LOG.isInfoEnabled()) {
- LOG.info("Publishing TilesContext for context: " + context.getClass().getName());
+ if (container != null && log.isInfoEnabled()) {
+ log.info("Publishing TilesContext for context: " + context.getClass().getName());
}
context.getApplicationScope().put(key, container);
}
@@ -131,15 +126,15 @@
*/
@Deprecated
public static void setContainer(Object context, TilesContainer container) {
-
+ Log log = LogFactory.getLog(TilesAccess.class);
if (container == null) {
- if (LOG.isInfoEnabled()) {
- LOG.info("Removing TilesContext for context: " + context.getClass().getName());
+ if (log.isInfoEnabled()) {
+ log.info("Removing TilesContext for context: " + context.getClass().getName());
}
removeAttribute(context, CONTAINER_ATTRIBUTE);
}
- if (container != null && LOG.isInfoEnabled()) {
- LOG.info("Publishing TilesContext for context: " + context.getClass().getName());
+ if (container != null && log.isInfoEnabled()) {
+ log.info("Publishing TilesContext for context: " + context.getClass().getName());
}
setAttribute(context, CONTAINER_ATTRIBUTE, container);
}
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -47,7 +47,7 @@
/**
* The logging object.
*/
- private static final Log LOG = LogFactory
+ private final Log log = LogFactory
.getLog(TestCompatibilityDigesterDefinitionsReader.class);
/**
@@ -174,8 +174,8 @@
fail("Should've thrown an exception.");
} catch (DefinitionsFactoryException e) {
// correct.
- if (LOG.isDebugEnabled()) {
- LOG.debug("Exception caught, it is OK", e);
+ if (log.isDebugEnabled()) {
+ log.debug("Exception caught, it is OK", e);
}
} catch (Exception e) {
fail("Exception reading configuration." + e);
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -37,12 +37,6 @@
public abstract class AbstractTilesApplicationContextFactory {
/**
- * The logging object.
- */
- private static final Log LOG = LogFactory
- .getLog(AbstractTilesApplicationContextFactory.class);
-
- /**
* Initialization parameter that represents the context factory class name.
*
* @since 2.1.1
@@ -70,10 +64,12 @@
*/
public static AbstractTilesApplicationContextFactory createFactory(
TilesApplicationContext preliminaryContext) {
+ Log log = LogFactory
+ .getLog(AbstractTilesApplicationContextFactory.class);
AbstractTilesApplicationContextFactory retValue;
- if (LOG.isInfoEnabled()) {
- LOG.info("Initializing Tiles2 application context. . .");
+ if (log.isInfoEnabled()) {
+ log.info("Initializing Tiles2 application context. . .");
}
Map<String, String> params = preliminaryContext.getInitParams();
@@ -91,8 +87,8 @@
((Initializable) retValue).init(params);
}
- if (LOG.isInfoEnabled()) {
- LOG.info("Finished initializing Tiles2 application context.");
+ if (log.isInfoEnabled()) {
+ log.info("Finished initializing Tiles2 application context.");
}
return retValue;
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -62,7 +62,7 @@
/**
* The logging object.
*/
- private static final Log LOG = LogFactory
+ private final Log log = LogFactory
.getLog(ChainedTilesApplicationContextFactory.class);
/**
@@ -115,10 +115,10 @@
} catch (ClassNotFoundException e) {
// We log it, because it could be a default configuration class that
// is simply not present.
- LOG.warn("Cannot find TilesContextFactory class "
+ log.warn("Cannot find TilesContextFactory class "
+ classNames[i]);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Cannot find TilesContextFactory class "
+ if (log.isDebugEnabled()) {
+ log.debug("Cannot find TilesContextFactory class "
+ classNames[i], e);
}
} catch (InstantiationException e) {
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -64,7 +64,7 @@
/**
* The logging object.
*/
- private static final Log LOG = LogFactory
+ private final Log log = LogFactory
.getLog(ChainedTilesContextFactory.class);
/**
@@ -115,10 +115,10 @@
} catch (ClassNotFoundException e) {
// We log it, because it could be a default configuration class that
// is simply not present.
- LOG.warn("Cannot find TilesContextFactory class "
+ log.warn("Cannot find TilesContextFactory class "
+ classNames[i]);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Cannot find TilesContextFactory class "
+ if (log.isDebugEnabled()) {
+ log.debug("Cannot find TilesContextFactory class "
+ classNames[i], e);
}
} catch (InstantiationException e) {
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -61,7 +61,7 @@
/**
* The logging object.
*/
- private static final Log LOG = LogFactory
+ private final Log log = LogFactory
.getLog(ChainedTilesRequestContextFactory.class);
/**
@@ -107,10 +107,10 @@
} catch (ClassNotFoundException e) {
// We log it, because it could be a default configuration class that
// is simply not present.
- LOG.warn("Cannot find TilesRequestContextFactory class "
+ log.warn("Cannot find TilesRequestContextFactory class "
+ classNames[i]);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Cannot find TilesRequestContextFactory class "
+ if (log.isDebugEnabled()) {
+ log.debug("Cannot find TilesRequestContextFactory class "
+ classNames[i], e);
}
} catch (InstantiationException e) {
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -54,7 +54,7 @@
/**
* The logging object.
*/
- private static final Log LOG =
+ private final Log log =
LogFactory.getLog(EnhancedTilesApplicationContext.class);
/**
@@ -164,7 +164,7 @@
resources.add(e.nextElement());
}
} catch (IOException e) {
- LOG.warn("Unable to retrieved resources from classloader: "
+ log.warn("Unable to retrieved resources from classloader: "
+ loader, e);
}
return resources;
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -45,7 +45,7 @@
/**
* Commons Logging instance.
*/
- private static Log log = LogFactory.getLog(DefinitionsImpl.class);
+ private final Log log = LogFactory.getLog(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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -62,7 +62,7 @@
/**
* LOG instance for all UrlDefinitionsFactory instances.
*/
- private static final Log LOG = LogFactory.getLog(UrlDefinitionsFactory.class);
+ private final Log log = LogFactory.getLog(UrlDefinitionsFactory.class);
/**
* Contains the URL objects identifying where configuration data is found.
@@ -106,7 +106,7 @@
/** {@inheritDoc} */
public synchronized void refresh() {
- LOG.debug("Updating Tiles definitions. . .");
+ log.debug("Updating Tiles definitions. . .");
if (definitionDao instanceof Refreshable) {
((Refreshable) definitionDao).refresh();
}
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -60,7 +60,7 @@
/**
* The logging object.
*/
- private static final Log LOG = LogFactory
+ private final Log log = LogFactory
.getLog(BaseLocaleUrlDefinitionDAO.class);
/**
@@ -162,7 +162,7 @@
}
}
} catch (Exception e) {
- LOG.warn("Exception while monitoring update times.", e);
+ log.warn("Exception while monitoring update times.", e);
return true;
}
return status;
@@ -189,27 +189,27 @@
if (urls != null && !urls.isEmpty()) {
for (URL resourceUrl : urls) {
if (resourceUrl != null) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Adding resource '" + resourceUrl
+ if (log.isDebugEnabled()) {
+ log.debug("Adding resource '" + resourceUrl
+ "' to definitions factory.");
}
String externalForm = resourceUrl.toExternalForm();
if (externalForm.indexOf('_', externalForm
.lastIndexOf("/")) < 0) {
sourceURLs.add(resourceUrl);
- } else if (LOG.isDebugEnabled()) {
- LOG.debug("Not adding resource '" + resourceUrl
+ } else if (log.isDebugEnabled()) {
+ log.debug("Not adding resource '" + resourceUrl
+ "' to definitions factory because it is "
+ "supposed to be an internationalization.");
}
} else {
- LOG.warn("Unable to find configured definition '"
+ log.warn("Unable to find configured definition '"
+ resources[i] + "'");
}
}
} else {
- LOG.warn("Unable to find resources under the name '"
+ log.warn("Unable to find resources under the name '"
+ resources[i] + "'");
}
}
@@ -274,8 +274,8 @@
defsMap = reader.read(connection.getInputStream());
} catch (FileNotFoundException e) {
// File not found. continue.
- if (LOG.isDebugEnabled()) {
- LOG.debug("File " + null + " not found, continue");
+ if (log.isDebugEnabled()) {
+ log.debug("File " + null + " not found, continue");
}
} catch (IOException e) {
throw new DefinitionsFactoryException(
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -49,7 +49,7 @@
/**
* The logging object.
*/
- private static final Log LOG = LogFactory.getLog(ResolvingLocaleUrlDefinitionDAO.class);
+ private final Log log = LogFactory.getLog(ResolvingLocaleUrlDefinitionDAO.class);
/** {@inheritDoc} */
@Override
@@ -107,8 +107,8 @@
return;
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Resolve definition for child name='"
+ if (log.isDebugEnabled()) {
+ log.debug("Resolve definition for child name='"
+ definition.getName()
+ "' extends='" + definition.getExtends() + "'.");
}
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java?rev=734996&r1=734995&r2=734996&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java Fri Jan 16 05:27:28 2009
@@ -49,7 +49,7 @@
/**
* The logging object.
*/
- private static final Log LOG = LogFactory
+ private final Log log = LogFactory
.getLog(TilesContextBeanELResolver.class);
/**
@@ -194,8 +194,8 @@
try {
info = Introspector.getBeanInfo(clazz);
} catch (Exception ex) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Cannot inspect class " + clazz, ex);
+ if (log.isDebugEnabled()) {
+ log.debug("Cannot inspect class " + clazz, ex);
}
}
if (info == null) {
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -73,7 +73,7 @@
/**
* The logging object.
*/
- private static final Log LOG = LogFactory.getLog(BasicTilesContainerFactory.class);
+ private final Log log = LogFactory.getLog(BasicTilesContainerFactory.class);
/** {@inheritDoc} */
@Override
@@ -172,8 +172,8 @@
.setRequestContextFactory(parent);
}
} catch (ClassNotFoundException e) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Cannot find JspTilesContextFactory, ignoring problem", e);
+ if (log.isDebugEnabled()) {
+ log.debug("Cannot find JspTilesContextFactory, ignoring problem", e);
}
} catch (InstantiationException e) {
throw new TilesContainerFactoryException(
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -126,7 +126,7 @@
/**
* The logging object.
*/
- private static final Log LOG = LogFactory.getLog(TilesContainerFactory.class);
+ private final Log log = LogFactory.getLog(TilesContainerFactory.class);
/**
* Default configuration parameters.
@@ -358,8 +358,8 @@
BasicTilesContainer container) {
Map <String, String> initParameterMap;
- if (LOG.isInfoEnabled()) {
- LOG.info("Initializing Tiles2 container. . .");
+ if (log.isInfoEnabled()) {
+ log.info("Initializing Tiles2 container. . .");
}
initParameterMap = context.getInitParams();
@@ -368,8 +368,8 @@
storeContainerDependencies(context, initParameterMap, configuration, container);
container.init(initParameterMap);
- if (LOG.isInfoEnabled()) {
- LOG.info("Tiles2 container initialized");
+ if (log.isInfoEnabled()) {
+ log.info("Tiles2 container initialized");
}
}
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -87,7 +87,7 @@
* Log instance for all BasicTilesContainer
* instances.
*/
- private static final Log LOG =
+ private final Log log =
LogFactory.getLog(BasicTilesContainer.class);
/**
@@ -176,8 +176,8 @@
AttributeContext attributeContext = getAttributeContext(request);
if (!isPermitted(request, attributeContext.getRoles())) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Access to current attribute context denied. "
+ if (log.isDebugEnabled()) {
+ log.debug("Access to current attribute context denied. "
+ "User not in role '" + attributeContext.getRoles());
}
return;
@@ -460,8 +460,8 @@
definitionsFactory.init(initParameters);
- if (LOG.isInfoEnabled()) {
- LOG.info("Tiles2 container initialization complete.");
+ if (log.isInfoEnabled()) {
+ log.info("Tiles2 container initialization complete.");
}
}
@@ -592,8 +592,8 @@
*/
private void prepare(TilesRequestContext context, String preparerName, boolean ignoreMissing) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Prepare request received for '" + preparerName);
+ if (log.isDebugEnabled()) {
+ log.debug("Prepare request received for '" + preparerName);
}
ViewPreparer preparer = preparerFactory.getPreparer(preparerName, context);
@@ -621,16 +621,16 @@
*/
private void render(TilesRequestContext request, String definitionName) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Render request recieved for definition '" + definitionName + "'");
+ if (log.isDebugEnabled()) {
+ log.debug("Render request recieved for definition '" + definitionName + "'");
}
Definition definition = getDefinition(definitionName, request);
if (definition == null) {
- if (LOG.isWarnEnabled()) {
+ if (log.isWarnEnabled()) {
String message = "Unable to find the definition '" + definitionName + "'";
- LOG.warn(message);
+ log.warn(message);
}
throw new NoSuchDefinitionException(definitionName);
}
@@ -640,8 +640,8 @@
subContext.inherit(definition);
if (!isPermitted(request, subContext.getRoles())) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Access to definition '" + definitionName
+ if (log.isDebugEnabled()) {
+ log.debug("Access to definition '" + definitionName
+ "' denied. User not in role '"
+ definition.getRoles());
}
@@ -675,8 +675,8 @@
String dispatchPath = computeDispatchPath(request, attributeContext);
- if (LOG.isDebugEnabled()) {
- LOG.debug("Dispatching to definition path '"
+ if (log.isDebugEnabled()) {
+ log.debug("Dispatching to definition path '"
+ attributeContext.getTemplate() + " '");
}
request.dispatch(dispatchPath);
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -43,7 +43,7 @@
/**
* The logging object.
*/
- private static final Log LOG =
+ private final Log log =
LogFactory.getLog(DefinitionManager.class);
/**
@@ -190,8 +190,8 @@
return;
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Resolve definition for child name='"
+ if (log.isDebugEnabled()) {
+ log.debug("Resolve definition for child name='"
+ definition.getName()
+ "' extends='" + definition.getExtends() + "'.");
}
@@ -208,7 +208,7 @@
+ "' can't find its ancestor '"
+ definition.getExtends()
+ "'. Please check your description file.";
- LOG.error(msg);
+ log.error(msg);
// to do : find better exception
throw new NoSuchDefinitionException(msg);
}
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -41,7 +41,7 @@
/**
* The logging object.
*/
- private static final Log LOG =
+ private final Log log =
LogFactory.getLog(BasicPreparerFactory.class);
/**
@@ -82,12 +82,12 @@
*/
protected ViewPreparer createPreparer(String name) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Creating ViewPreparer '" + name + "' . . .");
+ if (log.isDebugEnabled()) {
+ log.debug("Creating ViewPreparer '" + name + "' . . .");
}
Object instance = ClassUtil.instantiate(name, true);
- LOG.debug("ViewPreparer created successfully");
+ log.debug("ViewPreparer created successfully");
return (ViewPreparer) instance;
}
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -50,7 +50,7 @@
/**
* The logging object.
*/
- private static final Log LOG = LogFactory
+ private final Log log = LogFactory
.getLog(AbstractBaseAttributeRenderer.class);
/**
@@ -95,8 +95,8 @@
TilesRequestContext request = getRequestContext(requestItems);
if (!isPermitted(request, attribute.getRoles())) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Access to attribute denied. User not in role '"
+ if (log.isDebugEnabled()) {
+ log.debug("Access to attribute denied. User not in role '"
+ attribute.getRoles() + "'");
}
return;
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -49,7 +49,7 @@
/**
* The logging object.
*/
- private static final Log LOG = LogFactory
+ private final Log log = LogFactory
.getLog(TestDigesterDefinitionsReader.class);
/**
@@ -223,8 +223,8 @@
fail("Should've thrown an exception.");
} catch (DefinitionsFactoryException e) {
// correct.
- if (LOG.isDebugEnabled()) {
- LOG.debug("Exception caught, it is OK", e);
+ if (log.isDebugEnabled()) {
+ log.debug("Exception caught, it is OK", e);
}
} catch (Exception e) {
fail("Exception reading configuration." + e);
@@ -247,8 +247,8 @@
fail("Should've thrown an exception.");
} catch (DefinitionsFactoryException e) {
// correct.
- if (LOG.isDebugEnabled()) {
- LOG.debug("Exception caught, it is OK", e);
+ if (log.isDebugEnabled()) {
+ log.debug("Exception caught, it is OK", e);
}
} catch (Exception e) {
fail("Exception reading configuration." + e);
@@ -276,8 +276,8 @@
fail("Should've thrown an exception.");
} catch (DefinitionsFactoryException e) {
// correct.
- if (LOG.isDebugEnabled()) {
- LOG.debug("Exception caught, it is OK", e);
+ if (log.isDebugEnabled()) {
+ log.debug("Exception caught, it is OK", e);
}
} catch (Exception e) {
fail("Exception reading configuration." + e);
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -49,7 +49,7 @@
/**
* The logging object.
*/
- private static final Log LOG = LogFactory
+ private final Log log = LogFactory
.getLog(KeyedDefinitionsFactoryTilesContainerFactoryTest.class);
/**
@@ -141,8 +141,8 @@
container.init(new HashMap<String, String>());
fail("Container should have already been initialized");
} catch (IllegalStateException te) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("The container has been initialized, the exception is ok", te);
+ if (log.isDebugEnabled()) {
+ log.debug("The container has been initialized, the exception is ok", te);
}
}
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -55,7 +55,7 @@
/**
* The logging object.
*/
- private static final Log LOG = LogFactory
+ private final Log log = LogFactory
.getLog(TilesContainerFactoryTest.class);
/**
@@ -134,8 +134,8 @@
AbstractTilesContainerFactory.getTilesContainerFactory(context);
fail("Invalid classname. Exception should have been thrown.");
} catch (TilesException e) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("The classname is invalid, it is ok", e);
+ if (log.isDebugEnabled()) {
+ log.debug("The classname is invalid, it is ok", e);
}
}
}
@@ -172,8 +172,8 @@
container.init(new HashMap<String, String>());
fail("Container should have already been initialized");
} catch (IllegalStateException te) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Intercepted an exception, it is OK", te);
+ if (log.isDebugEnabled()) {
+ log.debug("Intercepted an exception, it is OK", te);
}
}
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -52,7 +52,7 @@
/**
* The logging object.
*/
- private static final Log LOG = LogFactory
+ private final Log log = LogFactory
.getLog(BasicTilesContainerTest.class);
/**
@@ -122,7 +122,7 @@
try {
container.render(attribute, null, request);
} catch (TilesException e) {
- LOG.debug("Intercepted a TilesException, it is correct", e);
+ log.debug("Intercepted a TilesException, it is correct", e);
exceptionFound = true;
}
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -38,12 +38,6 @@
public final class JspUtil {
/**
- * The logging object.
- */
- private static final Log LOG =
- LogFactory.getLog(ServletUtil.class);
-
- /**
* Constructor, private to avoid instantiation.
*/
private JspUtil() {
@@ -128,18 +122,19 @@
*/
public static void setContainer(PageContext context,
TilesContainer container, String key) {
+ Log log = LogFactory.getLog(ServletUtil.class);
if (key == null) {
key = TilesAccess.CONTAINER_ATTRIBUTE;
}
if (container == null) {
- if (LOG.isInfoEnabled()) {
- LOG.info("Removing TilesContext for context: " + context.getClass().getName());
+ if (log.isInfoEnabled()) {
+ log.info("Removing TilesContext for context: " + context.getClass().getName());
}
context.removeAttribute(key, PageContext.APPLICATION_SCOPE);
}
- if (container != null && LOG.isInfoEnabled()) {
- LOG.info("Publishing TilesContext for context: " + context.getClass().getName());
+ if (container != null && log.isInfoEnabled()) {
+ log.info("Publishing TilesContext for context: " + context.getClass().getName());
}
context.setAttribute(key, container, PageContext.APPLICATION_SCOPE);
}
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java?rev=734996&r1=734995&r2=734996&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java Fri Jan 16 05:27:28 2009
@@ -44,7 +44,7 @@
/**
* The logging object.
*/
- private static final Log LOG = LogFactory.getLog(AttributeTagSupport.class);
+ private final Log log = LogFactory.getLog(AttributeTagSupport.class);
/**
* Maps scope names to their constants.
@@ -157,8 +157,8 @@
} catch (TilesException e) {
if (!ignore) {
throw e;
- } else if (LOG.isDebugEnabled()) {
- LOG.debug("Ignoring Tiles Exception", e);
+ } else if (log.isDebugEnabled()) {
+ log.debug("Ignoring Tiles Exception", e);
}
}
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ContainerTagSupport.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ContainerTagSupport.java?rev=734996&r1=734995&r2=734996&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ContainerTagSupport.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ContainerTagSupport.java Fri Jan 16 05:27:28 2009
@@ -43,7 +43,7 @@
* The log instance for this tag.
*/
@SuppressWarnings("unused")
- private static final Log LOG = LogFactory.getLog(ContainerTagSupport.class);
+ private final Log log = LogFactory.getLog(ContainerTagSupport.class);
/**
* The Tiles container that can be used inside the tag.
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java?rev=734996&r1=734995&r2=734996&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java Fri Jan 16 05:27:28 2009
@@ -41,7 +41,7 @@
/**
* The logging object.
*/
- private static final Log LOG = LogFactory.getLog(ImportAttributeTag.class);
+ private final Log log = LogFactory.getLog(ImportAttributeTag.class);
/**
* The destination attribute name.
@@ -128,8 +128,8 @@
} catch (TilesException e) {
if (!ignore) {
throw e;
- } else if (LOG.isDebugEnabled()) {
- LOG.debug("Ignoring Tiles Exception", e);
+ } else if (log.isDebugEnabled()) {
+ log.debug("Ignoring Tiles Exception", e);
}
}
} else if (!ignore) {
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java?rev=734996&r1=734995&r2=734996&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java Fri Jan 16 05:27:28 2009
@@ -71,7 +71,7 @@
/**
* The logging object.
*/
- private static final Log LOG = LogFactory.getLog(PutAttributeTag.class);
+ private final Log log = LogFactory.getLog(PutAttributeTag.class);
/**
* Name of attribute to put in attribute context.
@@ -142,7 +142,7 @@
String message = "Error: enclosing tag '"
+ getParent().getClass().getName()
+ " doesn't accept 'put' tag.";
- LOG.error(message);
+ log.error(message);
throw new TilesJspException(message);
}
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTag.java?rev=734996&r1=734995&r2=734996&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTag.java Fri Jan 16 05:27:28 2009
@@ -55,7 +55,7 @@
/**
* The log instance for this tag.
*/
- private static final Log LOG = LogFactory.getLog(RenderTag.class);
+ private final Log log = LogFactory.getLog(RenderTag.class);
/**
* The role to check. If the user is in the specified role, the tag is taken
@@ -225,7 +225,7 @@
return EVAL_PAGE;
} catch (IOException io) {
String message = "IO Error executing tag: " + io.getMessage();
- LOG.error(message, io);
+ log.error(message, io);
throw new TilesJspException(message, io);
} finally {
endContext(pageContext);
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RoleSecurityTagSupport.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RoleSecurityTagSupport.java?rev=734996&r1=734995&r2=734996&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RoleSecurityTagSupport.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RoleSecurityTagSupport.java Fri Jan 16 05:27:28 2009
@@ -39,7 +39,7 @@
/**
* The log instance for this tag.
*/
- private static final Log LOG = LogFactory.getLog(RoleSecurityTagSupport.class);
+ private final Log log = LogFactory.getLog(RoleSecurityTagSupport.class);
/**
* The role to check. If the user is in the specified role, the tag is taken
@@ -82,7 +82,7 @@
}
} catch (IOException io) {
String message = "IO Error executing tag: " + io.getMessage();
- LOG.error(message, io);
+ log.error(message, io);
throw new TilesJspException(message, io);
}
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -61,7 +61,7 @@
/**
* The logging object.
*/
- private static final Log LOG =
+ private final Log log =
LogFactory.getLog(InitContainerTag.class);
/**
@@ -145,7 +145,7 @@
JspUtil.getContainer(pageContext, containerKey);
if (container != null) {
- LOG.warn("TilesContainer already instantiated for this context under key '"
+ log.warn("TilesContainer already instantiated for this context under key '"
+ containerKey + "'. Ignoring request to define.");
return SKIP_BODY;
}
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -45,12 +45,6 @@
public final class ServletUtil {
/**
- * The logging object.
- */
- private static final Log LOG =
- LogFactory.getLog(ServletUtil.class);
-
- /**
* Name of the attribute used to store the force-include option.
* @since 2.0.6
*/
@@ -147,18 +141,19 @@
*/
public static void setContainer(ServletContext context,
TilesContainer container, String key) {
+ Log log = LogFactory.getLog(ServletUtil.class);
if (key == null) {
key = TilesAccess.CONTAINER_ATTRIBUTE;
}
if (container == null) {
- if (LOG.isInfoEnabled()) {
- LOG.info("Removing TilesContext for context: " + context.getClass().getName());
+ if (log.isInfoEnabled()) {
+ log.info("Removing TilesContext for context: " + context.getClass().getName());
}
context.removeAttribute(key);
}
- if (container != null && LOG.isInfoEnabled()) {
- LOG.info("Publishing TilesContext for context: " + context.getClass().getName());
+ if (container != null && log.isInfoEnabled()) {
+ log.info("Publishing TilesContext for context: " + context.getClass().getName());
}
context.setAttribute(key, container);
}
Modified: tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesFilter.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesFilter.java?rev=734996&r1=734995&r2=734996&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesFilter.java (original)
+++ tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesFilter.java Fri Jan 16 05:27:28 2009
@@ -33,8 +33,6 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tiles.definition.util.DefinitionsFactoryUtil;
/**
@@ -51,12 +49,6 @@
public class TilesFilter extends TilesServlet implements Filter {
/**
- * The logging object.
- */
- @SuppressWarnings("unused")
- private static final Log LOG = LogFactory.getLog(TilesFilter.class);
-
- /**
* The filter configuration object we are associated with. If
* this value is null, this filter instance is not currently
* configured.
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -46,7 +46,7 @@
/**
* Log instance.
*/
- protected static final Log LOG =
+ protected final Log log =
LogFactory.getLog(TilesListener.class);
/**
@@ -87,7 +87,7 @@
try {
ServletUtil.setContainer(servletContext, null);
} catch (TilesException e) {
- LOG.warn("Unable to remove tiles container from service.", e);
+ log.warn("Unable to remove tiles container from service.", e);
}
}
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -44,7 +44,7 @@
/**
* Log instance.
*/
- protected static final Log LOG =
+ protected final Log log =
LogFactory.getLog(TilesServlet.class);
/**
@@ -68,7 +68,7 @@
try {
ServletUtil.setContainer(getServletContext(), null);
} catch (TilesException e) {
- LOG.warn("Unable to remove tiles container from service.", e);
+ log.warn("Unable to remove tiles container from service.", e);
}
}
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -88,7 +88,7 @@
/**
* The logging object.
*/
- private static final Log LOG =
+ private final Log log =
LogFactory.getLog(TilesDecorationFilter.class);
/**
@@ -202,7 +202,7 @@
String mask = parm.substring("definition(".length());
mask = mask.substring(0, mask.lastIndexOf("*)"));
map.put(mask, value);
- LOG.info("Mapping all requests matching '" + mask
+ log.info("Mapping all requests matching '" + mask
+ "*' to definition '" + value + "'");
}
}
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -50,7 +50,7 @@
/**
* The logging object.
*/
- private static final Log LOG =
+ private final Log log =
LogFactory.getLog(TilesDispatchServlet.class);
/**
@@ -93,8 +93,8 @@
getServletContext(), containerKey);
mutator.mutate(container.getAttributeContext(req, res), req);
String definition = getDefinitionName(req);
- if (LOG.isDebugEnabled()) {
- LOG.info("Dispatching to tile '" + definition + "'");
+ if (log.isDebugEnabled()) {
+ log.info("Dispatching to tile '" + definition + "'");
}
container.render(definition, req, res);
}
@@ -120,7 +120,7 @@
/** {@inheritDoc} */
protected void doPost(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
- LOG.info("Tiles dispatch request received. Redirecting POST to GET.");
+ log.info("Tiles dispatch request received. Redirecting POST to GET.");
doGet(req, res);
}
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=734996&r1=734995&r2=734996&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 Fri Jan 16 05:27:28 2009
@@ -47,7 +47,7 @@
/**
* The logging object.
*/
- private static final Log LOG = LogFactory.getLog(InitContextListener.class);
+ private final Log log = LogFactory.getLog(InitContextListener.class);
/** {@inheritDoc} */
public void contextInitialized(ServletContextEvent event) {
@@ -92,7 +92,7 @@
try {
stream.close();
} catch (IOException e) {
- LOG.error("Error during close of the stream containing the SQL schema", e);
+ log.error("Error during close of the stream containing the SQL schema", e);
}
}
return text.split(";");
@@ -118,7 +118,7 @@
try {
conn.rollback();
} catch (SQLException e1) {
- LOG.error("Error during rollback", e);
+ log.error("Error during rollback", e);
}
throw new TilesTestRuntimeException("Error during execution of SQL commands", e);
} finally {
@@ -130,7 +130,7 @@
stmt.close();
}
} catch (SQLException e) {
- LOG.error("Error during closing resources", e);
+ log.error("Error during closing resources", e);
}
}
}