[jboss-cvs] JBossAS SVN: r70336 - in trunk: testsuite/src/main/org/jboss/test/jsf/webapp and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 3 15:31:08 EST 2008
Author: stan.silvert at jboss.com
Date: 2008-03-03 15:31:08 -0500 (Mon, 03 Mar 2008)
New Revision: 70336
Modified:
trunk/build/build-thirdparty.xml
trunk/testsuite/src/main/org/jboss/test/jsf/webapp/LoggingTest.java
trunk/testsuite/src/main/org/jboss/test/web/test/JSFIntegrationUnitTestCase.java
trunk/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java
Log:
JBAS-5132
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2008-03-03 19:56:41 UTC (rev 70335)
+++ trunk/build/build-thirdparty.xml 2008-03-03 20:31:08 UTC (rev 70336)
@@ -138,7 +138,7 @@
<componentref name="sun-jaf" version="1.1"/>
<componentref name="sun-javacc" version="3.2"/>
<componentref name="sun-javamail" version="1.4"/>
- <componentref name="sun-jsf" version="1.2_04_P02"/>
+ <componentref name="sun-jsf" version="1.2_08"/>
<componentref name="sun-jstl" version="1.2"/>
<componentref name="sun-opends" version="0.1.0.build016"/>
<componentref name="sun-servlet" version="2.5-brew"/>
Modified: trunk/testsuite/src/main/org/jboss/test/jsf/webapp/LoggingTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jsf/webapp/LoggingTest.java 2008-03-03 19:56:41 UTC (rev 70335)
+++ trunk/testsuite/src/main/org/jboss/test/jsf/webapp/LoggingTest.java 2008-03-03 20:31:08 UTC (rev 70336)
@@ -22,7 +22,7 @@
package org.jboss.test.jsf.webapp;
-import com.sun.faces.util.Util;
+import com.sun.faces.util.FacesLogger;
import org.apache.log4j.*;
import java.io.ByteArrayOutputStream;
@@ -44,7 +44,7 @@
public LoggingTest()
{
Appender appender = new WriterAppender(new SimpleLayout(), out);
- Logger log4jLogger = Logger.getLogger(Util.FACES_LOGGER);
+ Logger log4jLogger = Logger.getLogger("javax.enterprise.resource.webcontainer.jsf");
log4jLogger.addAppender(appender);
}
@@ -58,34 +58,34 @@
*/
public void sendLogMessages()
{
- java.util.logging.Logger julLogger = Util.getLogger(Util.FACES_LOGGER + Util.RENDERKIT_LOGGER);
+ java.util.logging.Logger julLogger = FacesLogger.RENDERKIT.getLogger();
julLogger.severe("Logged SEVERE message in RENDERKIT_LOGGER<br/>"); // not logged
- julLogger = Util.getLogger(Util.FACES_LOGGER + Util.TAGLIB_LOGGER);
+ julLogger = FacesLogger.TAGLIB.getLogger();
julLogger.severe("Logged SEVERE message in TAGLIB_LOGGER<br/>"); // not logged
- julLogger = Util.getLogger(Util.FACES_LOGGER + Util.APPLICATION_LOGGER);
+ julLogger = FacesLogger.APPLICATION.getLogger();
julLogger.severe("Logged SEVERE message in APPLICATION_LOGGER<br/>"); // logged
julLogger.warning("Logged WARNING message in APPLICATION_LOGGER<br/>"); // not logged
- julLogger = Util.getLogger(Util.FACES_LOGGER + Util.CONTEXT_LOGGER);
+ julLogger = FacesLogger.CONTEXT.getLogger();
julLogger.warning("Logged WARNING message in CONTEXT_LOGGER<br/>"); // logged
julLogger.info("Logged INFO message in CONTEXT_LOGGER<br/>"); // not logged
- julLogger = Util.getLogger(Util.FACES_LOGGER + Util.CONFIG_LOGGER);
+ julLogger = FacesLogger.CONFIG.getLogger();
julLogger.info("Logged INFO message in CONFIG_LOGGER<br/>"); // logged
julLogger.fine("Logged FINE message in CONFIG_LOGGER<br/>"); // not logged
- julLogger = Util.getLogger(Util.FACES_LOGGER + Util.LIFECYCLE_LOGGER);
+ julLogger = FacesLogger.LIFECYCLE.getLogger();
julLogger.fine("Logged FINE message in LIFECYCLE_LOGGER<br/>"); // logged
julLogger.finer("Logged FINER message in LIFECYCLE_LOGGER<br/>"); // not logged
- julLogger = Util.getLogger(Util.FACES_LOGGER + Util.TIMING_LOGGER);
+ julLogger = FacesLogger.TIMING.getLogger();
julLogger.finer("Logged FINER message in TIMING_LOGGER<br/>"); // logged
julLogger.finest("Logged FINEST message in TIMING_LOGGER<br/>"); // logged
- julLogger = Util.getLogger(Util.FACES_LOGGER);
- julLogger.finest("Logged FINEST message in FACES_LOGGER<br/>"); // logged
+ julLogger = FacesLogger.MANAGEDBEAN.getLogger();
+ julLogger.finest("Logged FINEST message in MANAGEDBEAN_LOGGER Logger<br/>"); // logged
}
/**
Modified: trunk/testsuite/src/main/org/jboss/test/web/test/JSFIntegrationUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/web/test/JSFIntegrationUnitTestCase.java 2008-03-03 19:56:41 UTC (rev 70335)
+++ trunk/testsuite/src/main/org/jboss/test/web/test/JSFIntegrationUnitTestCase.java 2008-03-03 20:31:08 UTC (rev 70336)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.web.test;
-import com.sun.faces.util.Util;
+import com.sun.faces.util.FacesLogger;
import java.net.URL;
@@ -53,14 +53,14 @@
public static void setLoggingLevels() throws Exception
{
HttpClient client = new HttpClient();
- client.executeMethod(new GetMethod(makeSetLoggerCmd(Util.FACES_LOGGER, "ALL")));
- client.executeMethod(new GetMethod(makeSetLoggerCmd(Util.FACES_LOGGER + Util.TAGLIB_LOGGER, "FATAL")));
- client.executeMethod(new GetMethod(makeSetLoggerCmd(Util.FACES_LOGGER + Util.APPLICATION_LOGGER, "ERROR")));
- client.executeMethod(new GetMethod(makeSetLoggerCmd(Util.FACES_LOGGER + Util.CONTEXT_LOGGER, "WARN")));
- client.executeMethod(new GetMethod(makeSetLoggerCmd(Util.FACES_LOGGER + Util.CONFIG_LOGGER, "INFO")));
- client.executeMethod(new GetMethod(makeSetLoggerCmd(Util.FACES_LOGGER + Util.LIFECYCLE_LOGGER, "DEBUG")));
- client.executeMethod(new GetMethod(makeSetLoggerCmd(Util.FACES_LOGGER + Util.TIMING_LOGGER, "TRACE")));
- client.executeMethod(new GetMethod(makeSetLoggerCmd(Util.FACES_LOGGER + Util.RENDERKIT_LOGGER, "OFF")));
+ client.executeMethod(new GetMethod(makeSetLoggerCmd(FacesLogger.MANAGEDBEAN.getLoggerName(), "ALL")));
+ client.executeMethod(new GetMethod(makeSetLoggerCmd(FacesLogger.TAGLIB.getLoggerName(), "FATAL")));
+ client.executeMethod(new GetMethod(makeSetLoggerCmd(FacesLogger.APPLICATION.getLoggerName(), "ERROR")));
+ client.executeMethod(new GetMethod(makeSetLoggerCmd(FacesLogger.CONTEXT.getLoggerName(), "WARN")));
+ client.executeMethod(new GetMethod(makeSetLoggerCmd(FacesLogger.CONFIG.getLoggerName(), "INFO")));
+ client.executeMethod(new GetMethod(makeSetLoggerCmd(FacesLogger.LIFECYCLE.getLoggerName(), "DEBUG")));
+ client.executeMethod(new GetMethod(makeSetLoggerCmd(FacesLogger.TIMING.getLoggerName(), "TRACE")));
+ client.executeMethod(new GetMethod(makeSetLoggerCmd(FacesLogger.RENDERKIT.getLoggerName(), "OFF")));
}
private static String makeSetLoggerCmd(String log4jLogger, String log4jPriority)
@@ -122,7 +122,7 @@
assertFalse(contains(responseBody, "Logged FINER message in LIFECYCLE_LOGGER"));
assertTrue(contains(responseBody, "Logged FINER message in TIMING_LOGGER"));
assertTrue(contains(responseBody, "Logged FINEST message in TIMING_LOGGER"));
- assertTrue(contains(responseBody, "Logged FINEST message in FACES_LOGGER"));
+ assertTrue(contains(responseBody, "Logged FINEST message in MANAGEDBEAN_LOGGER"));
}
Modified: trunk/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java 2008-03-03 19:56:41 UTC (rev 70335)
+++ trunk/tomcat/src/main/org/jboss/web/jsf/integration/config/JBossJSFConfigureListener.java 2008-03-03 20:31:08 UTC (rev 70336)
@@ -23,7 +23,7 @@
package org.jboss.web.jsf.integration.config;
import com.sun.faces.config.ConfigureListener;
-import com.sun.faces.util.Util;
+import com.sun.faces.util.FacesLogger;
import java.util.logging.Filter;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
@@ -42,6 +42,8 @@
private static Logger LOG = Logger.getLogger(JBossJSFConfigureListener.class);
+ public static final String BASE_JSF_LOGGER = "javax.enterprise.resource.webcontainer.jsf";
+
public static final String SHOULD_LOG_CONFIG_MESSAGES = "com.sun.faces.displayConfiguration";
private ServletContext servletContext;
@@ -146,39 +148,41 @@
{
Filter conversionFilter = new Log4JConversionFilter(logConfigMessages());
- java.util.logging.Logger julLogger;
-
- julLogger = Util.getLogger(Util.FACES_LOGGER);
+ java.util.logging.Logger julLogger = java.util.logging.Logger.getLogger(BASE_JSF_LOGGER);
setLevel(julLogger);
julLogger.setFilter(conversionFilter);
- julLogger = Util.getLogger(Util.FACES_LOGGER + Util.APPLICATION_LOGGER);
+ julLogger = FacesLogger.APPLICATION.getLogger();
setLevel(julLogger);
julLogger.setFilter(conversionFilter);
- julLogger = Util.getLogger(Util.FACES_LOGGER + Util.CONFIG_LOGGER);
+ julLogger = FacesLogger.CONFIG.getLogger();
setLevel(julLogger);
julLogger.setFilter(conversionFilter);
- julLogger = Util.getLogger(Util.FACES_LOGGER + Util.CONTEXT_LOGGER);
+ julLogger = FacesLogger.CONTEXT.getLogger();
setLevel(julLogger);
julLogger.setFilter(conversionFilter);
- julLogger = Util.getLogger(Util.FACES_LOGGER + Util.LIFECYCLE_LOGGER);
+ julLogger = FacesLogger.LIFECYCLE.getLogger();
setLevel(julLogger);
julLogger.setFilter(conversionFilter);
-
- julLogger = Util.getLogger(Util.FACES_LOGGER + Util.RENDERKIT_LOGGER);
+
+ julLogger = FacesLogger.MANAGEDBEAN.getLogger();
setLevel(julLogger);
julLogger.setFilter(conversionFilter);
- julLogger = Util.getLogger(Util.FACES_LOGGER + Util.TIMING_LOGGER);
+ julLogger = FacesLogger.RENDERKIT.getLogger();
setLevel(julLogger);
julLogger.setFilter(conversionFilter);
- julLogger = Util.getLogger(Util.FACES_LOGGER + Util.TAGLIB_LOGGER);
+ julLogger = FacesLogger.TAGLIB.getLogger();
setLevel(julLogger);
julLogger.setFilter(conversionFilter);
+
+ julLogger = FacesLogger.TIMING.getLogger();
+ setLevel(julLogger);
+ julLogger.setFilter(conversionFilter);
}
// should we log the configuration messages?
More information about the jboss-cvs-commits
mailing list