xlawrence 2005/10/01 22:53:22 CEST
Modified files:
core/src/webapp/WEB-INF/etc/config log4j.xml
core/src/webapp/jsp/jahia/engines engine.jsp
Log:
Added log4j category. Replaces bad calls to System.out...
Revision Changes Path
1.22 +1 -1 jahia/core/src/webapp/WEB-INF/etc/config/log4j.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/config/log4j.xml.diff?r1=1.21&r2=1.22&f=h
1.13 +7 -2 jahia/core/src/webapp/jsp/jahia/engines/engine.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/engine.jsp.diff?r1=1.12&r2=1.13&f=h
Index: log4j.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/config/log4j.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- log4j.xml 30 Sep 2005 13:34:18 -0000 1.21
+++ log4j.xml 1 Oct 2005 20:53:21 -0000 1.22
@@ -103,7 +103,7 @@
<priority value="info"/>
</category>
- <category name="org.jahia.engines.workflow">
+ <category name="jsp.jahia.engines">
<priority value="debug"/>
</category>
Index: engine.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/engine.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- engine.jsp 30 Sep 2005 12:34:45 -0000 1.12
+++ engine.jsp 1 Oct 2005 20:53:22 -0000 1.13
@@ -15,6 +15,11 @@
<jsp:useBean id="URL" class="java.lang.String" scope="request"/>
<jsp:useBean id="javaScriptPath" class="java.lang.String" scope="request"/>
+<%!
+ private static final org.apache.log4j.Logger logger =
+ org.apache.log4j.Logger.getLogger("jsp.jahia.engines.engine");
+%>
+
<%
final HashMap engineMap = (HashMap)
request.getAttribute("org.jahia.engines.EngineHashMap");
final ParamBean jParams = (ParamBean)
request.getAttribute("org.jahia.params.ParamBean");
@@ -103,9 +108,9 @@
final String includePage = includes.getProperty(jspSource);
final String engineName = (String) engineMap.get("engineName");
- System.out.println("LastScreen: " + theScreen + ", JspSource: " +
jspSource + ", EngineName: " +
+ logger.debug("LastScreen: " + theScreen + ", JspSource: " + jspSource +
", EngineName: " +
engineName);
- System.out.println("JSP: " + includePage);
+ logger.debug("JSP: " + includePage);
%>
<html xmlns="http://www.w3.org/1999/xhtml";
xml:lang="<%=jParams.getLocale()%>" lang="<%=jParams.getLocale()%>">
