[richfaces-svn-commits] JBoss Rich Faces SVN: r19024 - in branches/RFPL-434: core/commons/src/main/java/org/richfaces/log and 6 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Mon Aug 30 15:11:36 EDT 2010
Author: nbelaevski
Date: 2010-08-30 15:11:36 -0400 (Mon, 30 Aug 2010)
New Revision: 19024
Removed:
branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/ResourceLogger.java
branches/RFPL-434/core/impl/src/test/resources/log4j.xml
branches/RFPL-434/core/legacy-tests/src/test/resources/log4j.xml
branches/RFPL-434/examples/core-demo/src/main/resources/log4j.xml
branches/RFPL-434/examples/richfaces-showcase/src/main/resources/log4j.properties
branches/RFPL-434/examples/richfaces-showcase/src/main/resources/log4j.xml
Modified:
branches/RFPL-434/core/commons/src/main/java/org/richfaces/l10n/MessageInterpolator.java
branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/JavaLogger.java
branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/LogFactory.java
branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java
branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java
branches/RFPL-434/dist/readme-ui.txt
Log:
https://jira.jboss.org/browse/RFPL-434
Modified: branches/RFPL-434/core/commons/src/main/java/org/richfaces/l10n/MessageInterpolator.java
===================================================================
--- branches/RFPL-434/core/commons/src/main/java/org/richfaces/l10n/MessageInterpolator.java 2010-08-30 18:45:51 UTC (rev 19023)
+++ branches/RFPL-434/core/commons/src/main/java/org/richfaces/l10n/MessageInterpolator.java 2010-08-30 19:11:36 UTC (rev 19024)
@@ -26,8 +26,6 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import javax.faces.context.FacesContext;
-
/**
* @author Nick Belaevski
*
Modified: branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/JavaLogger.java
===================================================================
--- branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/JavaLogger.java 2010-08-30 18:45:51 UTC (rev 19023)
+++ branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/JavaLogger.java 2010-08-30 19:11:36 UTC (rev 19024)
@@ -45,8 +45,6 @@
public static final String RICHFACES_LOG = "org.richfaces";
- private static final String CLASS_NAME = JavaLogger.class.getName();
-
static final Map<Level, java.util.logging.Level> LEVELS_MAP =
new EnumMap<Level, java.util.logging.Level>(Level.class);
@@ -57,6 +55,8 @@
LEVELS_MAP.put(Level.DEBUG, java.util.logging.Level.FINE);
}
+ private static final String CLASS_NAME = JavaLogger.class.getName();
+
private final java.util.logging.Logger jdkLogger;
private MessageInterpolator messageInterpolator;
Modified: branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/LogFactory.java
===================================================================
--- branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/LogFactory.java 2010-08-30 18:45:51 UTC (rev 19023)
+++ branches/RFPL-434/core/commons/src/main/java/org/richfaces/log/LogFactory.java 2010-08-30 19:11:36 UTC (rev 19024)
@@ -23,7 +23,6 @@
package org.richfaces.log;
-import org.richfaces.log.Logger.Level;
/**
* <p class="changed_added_4_0">This class produces loggers used by whole RichFaces library.</p>
Modified: branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java 2010-08-30 18:45:51 UTC (rev 19023)
+++ branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java 2010-08-30 19:11:36 UTC (rev 19024)
@@ -29,12 +29,15 @@
import java.util.Properties;
import java.util.Set;
+import javax.faces.application.ProjectStage;
import javax.faces.application.Resource;
import javax.faces.application.ResourceHandler;
import javax.faces.context.FacesContext;
import org.richfaces.application.DependencyInjector;
import org.richfaces.application.ServiceTracker;
+import org.richfaces.log.Logger;
+import org.richfaces.log.RichfacesLogger;
import org.richfaces.util.PropertiesUtil;
import org.richfaces.util.Util;
@@ -49,7 +52,7 @@
private static final Joiner RESOURCE_QUALIFIER_JOINER = Joiner.on(':').skipNulls();
- private static final ResourceLogger LOGGER = ResourceLogger.INSTANCE;
+ private static final Logger LOGGER = RichfacesLogger.RESOURCE.getLogger();
private static class ExternalStaticResourceFactory {
@@ -100,6 +103,28 @@
initializeExternalResourcesMap();
}
+ private void logResourceProblem(FacesContext context, Throwable throwable, String messagePattern,
+ Object... arguments) {
+ boolean isProductionStage = context.isProjectStage(ProjectStage.Production);
+
+ if (LOGGER.isWarnEnabled() || (!isProductionStage && LOGGER.isInfoEnabled())) {
+ String formattedMessage = MessageFormat.format(messagePattern, arguments);
+
+ if (throwable != null) {
+ LOGGER.warn(formattedMessage, throwable);
+ } else {
+ if (isProductionStage) {
+ LOGGER.info(formattedMessage);
+ } else {
+ LOGGER.warn(formattedMessage);
+ }
+ }
+ }
+ }
+
+ private void logMissingResource(FacesContext context, String resourceData) {
+ logResourceProblem(context, null, "Resource {0} was not found", resourceData);
+ }
private String getResourceNameFromQualifier(String qualifier) {
int idx = qualifier.lastIndexOf(':');
if (idx < 0) {
@@ -252,10 +277,10 @@
} catch (ClassNotFoundException e) {
// do nothing
} catch (Exception e) {
- LOGGER.logResourceProblem(FacesContext.getCurrentInstance(), e, "Error creating resource {0}",
+ logResourceProblem(FacesContext.getCurrentInstance(), e, "Error creating resource {0}",
resourceName);
} catch (LinkageError e) {
- LOGGER.logResourceProblem(FacesContext.getCurrentInstance(), e, "Error creating resource {0}",
+ logResourceProblem(FacesContext.getCurrentInstance(), e, "Error creating resource {0}",
resourceName);
}
}
@@ -274,7 +299,7 @@
Resource resource = createResource(resourceName, libraryName, null);
if (resource == null) {
- LOGGER.logMissingResource(context, resourceData.getResourceKey());
+ logMissingResource(context, resourceData.getResourceKey());
return null;
}
@@ -289,7 +314,7 @@
}
if ((existingVersion != null) && (requestedVersion != null) && !existingVersion.equals(requestedVersion)) {
- LOGGER.logResourceProblem(context, null, "Resource {0} of version {1} was not found", resourceName,
+ logResourceProblem(context, null, "Resource {0} of version {1} was not found", resourceName,
requestedVersion);
return null;
}
Modified: branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java 2010-08-30 18:45:51 UTC (rev 19023)
+++ branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/ResourceHandlerImpl.java 2010-08-30 19:11:36 UTC (rev 19024)
@@ -40,6 +40,8 @@
import org.ajax4jsf.cache.Cache;
import org.richfaces.application.ServiceTracker;
+import org.richfaces.log.Logger;
+import org.richfaces.log.RichfacesLogger;
import org.richfaces.util.RequestStateManager.BooleanRequestStateVariable;
import org.richfaces.util.Util;
@@ -53,7 +55,7 @@
public static final String RESOURCE_CACHE_NAME = "org.richfaces.ResourcesCache";
public static final String HANDLER_START_TIME_ATTRIBUTE = ResourceHandlerImpl.class.getName() + ":StartTime";
- private static final ResourceLogger LOGGER = ResourceLogger.INSTANCE;
+ private static final Logger LOGGER = RichfacesLogger.RESOURCE.getLogger();
private ResourceFactory resourceFactory;
Deleted: branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/ResourceLogger.java
===================================================================
--- branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/ResourceLogger.java 2010-08-30 18:45:51 UTC (rev 19023)
+++ branches/RFPL-434/core/impl/src/main/java/org/richfaces/resource/ResourceLogger.java 2010-08-30 19:11:36 UTC (rev 19024)
@@ -1,238 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.richfaces.resource;
-
-import java.text.MessageFormat;
-
-import javax.faces.application.ProjectStage;
-import javax.faces.context.FacesContext;
-
-import org.richfaces.log.Logger;
-import org.richfaces.log.RichfacesLogger;
-
-/**
- * @author Nick Belaevski
- *
- */
-final class ResourceLogger implements Logger {
-
- static final ResourceLogger INSTANCE = new ResourceLogger();
-
- private static final Logger LOGGER = RichfacesLogger.RESOURCE.getLogger();
-
- private ResourceLogger() {}
-
- void logResourceProblem(FacesContext context, Throwable throwable, String messagePattern,
- Object... arguments) {
- boolean isProductionStage = context.isProjectStage(ProjectStage.Production);
-
- if (LOGGER.isWarnEnabled() || (!isProductionStage && LOGGER.isInfoEnabled())) {
- String formattedMessage = MessageFormat.format(messagePattern, arguments);
-
- if (throwable != null) {
- LOGGER.warn(formattedMessage, throwable);
- } else {
- if (isProductionStage) {
- LOGGER.info(formattedMessage);
- } else {
- LOGGER.warn(formattedMessage);
- }
- }
- }
- }
-
- void logMissingResource(FacesContext context, String resourceData) {
- logResourceProblem(context, null, "Resource {0} was not found", resourceData);
- }
-
- /**
- * @return
- * @see org.richfaces.log.Logger#isDebugEnabled()
- */
- public boolean isDebugEnabled() {
- return LOGGER.isDebugEnabled();
- }
-
- /**
- * @param content
- * @see org.richfaces.log.Logger#debug(java.lang.CharSequence)
- */
- public void debug(CharSequence content) {
- LOGGER.debug(content);
- }
-
- /**
- * @param content
- * @param error
- * @see org.richfaces.log.Logger#debug(java.lang.CharSequence, java.lang.Throwable)
- */
- public void debug(CharSequence content, Throwable error) {
- LOGGER.debug(content, error);
- }
-
- /**
- * @param error
- * @see org.richfaces.log.Logger#debug(java.lang.Throwable)
- */
- public void debug(Throwable error) {
- LOGGER.debug(error);
- }
-
- /**
- * @return
- * @see org.richfaces.log.Logger#isInfoEnabled()
- */
- public boolean isInfoEnabled() {
- return LOGGER.isInfoEnabled();
- }
-
- /**
- * @param content
- * @see org.richfaces.log.Logger#info(java.lang.CharSequence)
- */
- public void info(CharSequence content) {
- LOGGER.info(content);
- }
-
- /**
- * @param content
- * @param error
- * @see org.richfaces.log.Logger#info(java.lang.CharSequence, java.lang.Throwable)
- */
- public void info(CharSequence content, Throwable error) {
- LOGGER.info(content, error);
- }
-
- /**
- * @param error
- * @see org.richfaces.log.Logger#info(java.lang.Throwable)
- */
- public void info(Throwable error) {
- LOGGER.info(error);
- }
-
- /**
- * @return
- * @see org.richfaces.log.Logger#isWarnEnabled()
- */
- public boolean isWarnEnabled() {
- return LOGGER.isWarnEnabled();
- }
-
- /**
- * @param content
- * @see org.richfaces.log.Logger#warn(java.lang.CharSequence)
- */
- public void warn(CharSequence content) {
- LOGGER.warn(content);
- }
-
- /**
- * @param content
- * @param error
- * @see org.richfaces.log.Logger#warn(java.lang.CharSequence, java.lang.Throwable)
- */
- public void warn(CharSequence content, Throwable error) {
- LOGGER.warn(content, error);
- }
-
- /**
- * @param error
- * @see org.richfaces.log.Logger#warn(java.lang.Throwable)
- */
- public void warn(Throwable error) {
- LOGGER.warn(error);
- }
-
- /**
- * @return
- * @see org.richfaces.log.Logger#isErrorEnabled()
- */
- public boolean isErrorEnabled() {
- return LOGGER.isErrorEnabled();
- }
-
- /**
- * @param content
- * @see org.richfaces.log.Logger#error(java.lang.CharSequence)
- */
- public void error(CharSequence content) {
- LOGGER.error(content);
- }
-
- /**
- * @param content
- * @param error
- * @see org.richfaces.log.Logger#error(java.lang.CharSequence, java.lang.Throwable)
- */
- public void error(CharSequence content, Throwable error) {
- LOGGER.error(content, error);
- }
-
- /**
- * @param error
- * @see org.richfaces.log.Logger#error(java.lang.Throwable)
- */
- public void error(Throwable error) {
- LOGGER.error(error);
- }
-
- /**
- * @param level
- * @return
- * @see org.richfaces.log.Logger#isLogEnabled(org.richfaces.log.Logger.Level)
- */
- public boolean isLogEnabled(Level level) {
- return LOGGER.isLogEnabled(level);
- }
-
- /**
- * @param level
- * @param content
- * @see org.richfaces.log.Logger#log(org.richfaces.log.Logger.Level, java.lang.CharSequence)
- */
- public void log(Level level, CharSequence content) {
- LOGGER.log(level, content);
- }
-
- /**
- * @param level
- * @param content
- * @param error
- * @see org.richfaces.log.Logger#log(org.richfaces.log.Logger.Level, java.lang.CharSequence, java.lang.Throwable)
- */
- public void log(Level level, CharSequence content, Throwable error) {
- LOGGER.log(level, content, error);
- }
-
- /**
- * @param level
- * @param error
- * @see org.richfaces.log.Logger#log(org.richfaces.log.Logger.Level, java.lang.Throwable)
- */
- public void log(Level level, Throwable error) {
- LOGGER.log(level, error);
- }
-
-
-
-}
Deleted: branches/RFPL-434/core/impl/src/test/resources/log4j.xml
===================================================================
--- branches/RFPL-434/core/impl/src/test/resources/log4j.xml 2010-08-30 18:45:51 UTC (rev 19023)
+++ branches/RFPL-434/core/impl/src/test/resources/log4j.xml 2010-08-30 19:11:36 UTC (rev 19024)
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright 1999-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!DOCTYPE log4j:configuration SYSTEM "file:///eclipse/dtdcache/log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
- <!-- This is a sample configuration for log4j.
- It simply just logs everything into a single
- log file.
- Note, that you can use properties for value substitution.
- -->
- <appender name="DEFAULT" class="org.apache.log4j.ConsoleAppender">
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} [%c] %C %M %n%-5p: %m%n" />
- </layout>
- </appender>
-
-<!--
- <appender name="FACES" class="org.apache.log4j.ConsoleAppender">
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%t %-5p %c{2} - %m:%n"/>
- </layout>
- </appender>
-
- <appender name="CHAMELEON" class="org.apache.log4j.ConsoleAppender">
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%t %-5p %c{2} - %m:%n"/>
- </layout>
- </appender>
- -->
- <category name="com.sun.faces">
- <priority value="DEBUG" />
- <appender-ref ref="DEFAULT"/>
- </category>
-
- <category name="org.apache.myfaces">
- <priority value="DEBUG" />
- <appender-ref ref="DEFAULT"/>
- </category>
-
- <category name="javax.faces">
- <priority value="INFO" />
- <appender-ref ref="DEFAULT"/>
- </category>
-
- <category name="faces">
- <priority value="INFO" />
- <appender-ref ref="DEFAULT"/>
- </category>
-
- <category name="org.richfaces">
- <priority value="DEBUG" />
- <appender-ref ref="DEFAULT"/>
- </category>
-
-
- <category name="org.ajax4jsf">
- <priority value="DEBUG" />
- <appender-ref ref="DEFAULT"/>
- </category>
-
- <!--
- <root>
- <priority value ="info" />
- <appender-ref ref="DEFAULT" />
- </root>
- -->
-</log4j:configuration>
Deleted: branches/RFPL-434/core/legacy-tests/src/test/resources/log4j.xml
===================================================================
--- branches/RFPL-434/core/legacy-tests/src/test/resources/log4j.xml 2010-08-30 18:45:51 UTC (rev 19023)
+++ branches/RFPL-434/core/legacy-tests/src/test/resources/log4j.xml 2010-08-30 19:11:36 UTC (rev 19024)
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright 1999-2004 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!DOCTYPE log4j:configuration SYSTEM "file:///eclipse/dtdcache/log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
- <!-- This is a sample configuration for log4j.
- It simply just logs everything into a single
- log file.
- Note, that you can use properties for value substitution.
- -->
- <appender name="DEFAULT" class="org.apache.log4j.ConsoleAppender">
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%t %-5p %c{2} - %m:%n"/>
- </layout>
- </appender>
-
-<!--
- <appender name="FACES" class="org.apache.log4j.ConsoleAppender">
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%t %-5p %c{2} - %m:%n"/>
- </layout>
- </appender>
-
- <appender name="CHAMELEON" class="org.apache.log4j.ConsoleAppender">
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%t %-5p %c{2} - %m:%n"/>
- </layout>
- </appender>
- -->
- <category name="com.sun.faces">
- <priority value="WARN" />
- <appender-ref ref="DEFAULT"/>
- </category>
-
- <category name="org.apache.myfaces">
- <priority value="WARN" />
- <appender-ref ref="DEFAULT"/>
- </category>
-
- <category name="javax.faces">
- <priority value="WARN" />
- <appender-ref ref="DEFAULT"/>
- </category>
-
- <category name="faces">
- <priority value="WARN" />
- <appender-ref ref="DEFAULT"/>
- </category>
-
- <category name="com.exadel.vcp">
- <priority value="WARN" />
- <appender-ref ref="DEFAULT"/>
- </category>
-
-
- <category name="org.ajax4jsf">
- <priority value="WARN" />
- <appender-ref ref="DEFAULT"/>
- </category>
-
- <!--
- <root>
- <priority value ="WARN" />
- <appender-ref ref="DEFAULT" />
- </root>
- -->
-</log4j:configuration>
Modified: branches/RFPL-434/dist/readme-ui.txt
===================================================================
--- branches/RFPL-434/dist/readme-ui.txt 2010-08-30 18:45:51 UTC (rev 19023)
+++ branches/RFPL-434/dist/readme-ui.txt 2010-08-30 19:11:36 UTC (rev 19024)
@@ -13,11 +13,9 @@
1.3) richfaces-core-impl-4.0.0.20100824-M2.jar
1.4) richfaces-components-api-4.0.0.20100824-M2.jar
1.5) richfaces-components-ui-4.0.0.20100824-M2.jar
- 1.6) slf4j-api
- 1.7) slf4j-log4j12 (or whatever else - select the implementation according to logging framework that you use)
- 1.8) sac-1.3, cssparser-0.9.5 - required for components CSS work
- 1.9) google-guava-r06 - core runtime dependency.
- 1.10) annotations.jar from org.richfaces.cdk . It's optional and should be added only if some RichFaces components will be
+ 1.6) sac-1.3, cssparser-0.9.5 - required for components CSS work
+ 1.7) google-guava-r06 - core runtime dependency.
+ 1.8) annotations.jar from org.richfaces.cdk . It's optional and should be added only if some RichFaces components will be
created/accessed dynamically from some appication actions/listeners.
For optimal performance it's recommended to add one of these caching frameworks to application classpath: EhCache, JBoss Cache, OsCache.
Deleted: branches/RFPL-434/examples/core-demo/src/main/resources/log4j.xml
===================================================================
--- branches/RFPL-434/examples/core-demo/src/main/resources/log4j.xml 2010-08-30 18:45:51 UTC (rev 19023)
+++ branches/RFPL-434/examples/core-demo/src/main/resources/log4j.xml 2010-08-30 19:11:36 UTC (rev 19024)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
- <appender name="console" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n" />
- </layout>
- </appender>
- <logger name="org.richfaces">
- <level value="info" />
- </logger>
- <logger name="org.richfaces.demo.PhaseTracker">
- <level value="debug" />
- </logger>
- <root>
- <priority value="info" />
- <appender-ref ref="console" />
- </root>
-
-</log4j:configuration>
\ No newline at end of file
Deleted: branches/RFPL-434/examples/richfaces-showcase/src/main/resources/log4j.properties
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/resources/log4j.properties 2010-08-30 18:45:51 UTC (rev 19023)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/resources/log4j.properties 2010-08-30 19:11:36 UTC (rev 19024)
@@ -1,24 +0,0 @@
-# A default log4j configuration for log4j users.
-#
-# To use this configuration, deploy it into your application's WEB-INF/classes
-# directory. You are also encouraged to edit it as you like.
-
-# Configure the console as our one appender
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%c] - %m%n
-
-# tighten logging on the DataNucleus Categories
-log4j.category.DataNucleus.JDO=WARN, A1
-log4j.category.DataNucleus.Persistence=WARN, A1
-log4j.category.DataNucleus.Cache=WARN, A1
-log4j.category.DataNucleus.MetaData=WARN, A1
-log4j.category.DataNucleus.General=WARN, A1
-log4j.category.DataNucleus.Utility=WARN, A1
-log4j.category.DataNucleus.Transaction=WARN, A1
-log4j.category.DataNucleus.Datastore=WARN, A1
-log4j.category.DataNucleus.ClassLoading=WARN, A1
-log4j.category.DataNucleus.Plugin=WARN, A1
-log4j.category.DataNucleus.ValueGeneration=WARN, A1
-log4j.category.DataNucleus.Enhancer=WARN, A1
-log4j.category.DataNucleus.SchemaTool=WARN, A1
Deleted: branches/RFPL-434/examples/richfaces-showcase/src/main/resources/log4j.xml
===================================================================
--- branches/RFPL-434/examples/richfaces-showcase/src/main/resources/log4j.xml 2010-08-30 18:45:51 UTC (rev 19023)
+++ branches/RFPL-434/examples/richfaces-showcase/src/main/resources/log4j.xml 2010-08-30 19:11:36 UTC (rev 19024)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
- <appender name="console" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n" />
- </layout>
- </appender>
- <root>
- <priority value="info" />
- <appender-ref ref="console" />
- </root>
-
-</log4j:configuration>
\ No newline at end of file
More information about the richfaces-svn-commits
mailing list