shuber 2004/09/17 11:57:06 CEST
Modified files:
war/src/java/org/jahia/webapps/poll PollServlet.java
Question.java
war/src/webapp/WEB-INF web.xml
Added files:
war/src/java/org/jahia/webapps/poll InitServlet.java
war/src/webapp/WEB-INF/etc log4j.xml
Log:
Added Log4J
Revision Changes Path
1.1 +91 -0 poll/war/src/java/org/jahia/webapps/poll/InitServlet.java (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/poll/war/src/java/org/jahia/webapps/poll/InitServlet.java?rev=1.1&content-type=text/plain
1.3 +38 -34 poll/war/src/java/org/jahia/webapps/poll/PollServlet.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/poll/war/src/java/org/jahia/webapps/poll/PollServlet.java.diff?r1=1.2&r2=1.3&f=h
1.2 +54 -51 poll/war/src/java/org/jahia/webapps/poll/Question.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/poll/war/src/java/org/jahia/webapps/poll/Question.java.diff?r1=1.1&r2=1.2&f=h
1.1 +95 -0 poll/war/src/webapp/WEB-INF/etc/log4j.xml (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/poll/war/src/webapp/WEB-INF/etc/log4j.xml?rev=1.1&content-type=text/plain
1.2 +16 -1 poll/war/src/webapp/WEB-INF/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/poll/war/src/webapp/WEB-INF/web.xml.diff?r1=1.1&r2=1.2&f=h
Index: InitServlet.java
====================================================================
package org.jahia.webapps.poll;
import javax.servlet.http.HttpServlet;
import java.io.*;
import java.sql.*;
import javax.servlet.*;
import javax.servlet.http.*;
import org.jdom.input.*;
import org.jdom.*;
import java.security.Security;
import java.net.URLEncoder;
import java.net.URLDecoder;
import java.util.*;
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.xml.DOMConfigurator;
import org.jdom.output.*;
import org.jahia.tools.Tools;
public class InitServlet extends HttpServlet {
static private String servletDiskPath = null;
private static org.apache.log4j.Logger logger =
org.apache.log4j.Logger.getLogger(InitServlet.class);
private String dbURL;
public void init() {
String xmlFile = getInitParameter("log4j-xml-init-file");
String realXmlFile = getServletContext().getRealPath(xmlFile);
// if the log4j-init-file is not set, then no point in trying
if (xmlFile != null) {
DOMConfigurator.configure(realXmlFile);
}
logger.debug("Log4j configured, initializing the rest of the application...");
/*
String webInfPath = getServletContext().getRealPath("WEB-INF");
servletDiskPath = this.getServletContext().getRealPath(File.separator);
File repositoryConfigFile = new File(servletDiskPath + "WEB-INF" +
File.separator + "classes" + File.separator + "repository.xml");
if (repositoryConfigFile.exists()) {
SAXBuilder builder = new SAXBuilder();
try {
Document document = builder.build(repositoryConfigFile);
if (document != null) {
Element rootElement = document.getRootElement();
Element connElement =
rootElement.getChild("jdbc-connection-descriptor");
if (connElement != null) {
logger.debug("Found <jdbc-connection-descriptor> tag.");
String dbAlias = connElement.getAttributeValue("dbalias");
logger.debug("Read dbalias=[" + dbAlias + "]");
if (dbAlias.startsWith("$context/")) {
String withoutMarker =
dbAlias.substring("$context/".length());
// we must translate the path separators to something
// acceptable for the system.
withoutMarker = Tools.replace(withoutMarker, "/",
File.separator);
logger.debug("Setting OJB dbalis to [" + servletDiskPath
+ withoutMarker + "]");
connElement.setAttribute("dbalias", servletDiskPath +
withoutMarker);
}
}
XMLOutputter serializer = new XMLOutputter();
FileOutputStream repositoryOutput = new
FileOutputStream(repositoryConfigFile);
serializer.output(document, repositoryOutput);
}
} catch (org.jdom.JDOMException jdome) {
logger.error("Error loading repository configuration file " +
repositoryConfigFile.toString(), jdome);
} catch (java.io.FileNotFoundException fnfe) {
logger.error("Error modifying repository config file " +
repositoryConfigFile.toString(), fnfe);
} catch (java.io.IOException ioe) {
logger.error("Error modifying repository config file " +
repositoryConfigFile.toString(), ioe);
}
}
*/
}
public void service(HttpServletRequest request,
HttpServletResponse response)
throws ServletException, IOException {
}
}
Index: PollServlet.java
===================================================================
RCS file:
/home/cvs/repository/poll/war/src/java/org/jahia/webapps/poll/PollServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PollServlet.java 16 Sep 2004 17:08:06 -0000 1.2
+++ PollServlet.java 17 Sep 2004 09:57:05 -0000 1.3
@@ -18,6 +18,10 @@
public class PollServlet extends HttpServlet
{
+
+ private static org.apache.log4j.Logger logger =
+ org.apache.log4j.Logger.getLogger(PollServlet.class);
+
/** the external properties file ServletConfig key **/
private final static String SC_KEY_PROPERTIES = "properties";
@@ -63,7 +67,7 @@
*/
public void init(ServletConfig config) throws ServletException {
- Tools.toConsole("init", "begin");
+ logger.debug("begin");
super.init(config);
String propsPath = config.getInitParameter(SC_KEY_PROPERTIES);
if ( propsPath == null ) {
@@ -93,7 +97,7 @@
iVal = new Integer(props.getProperty(PROP_DB_INITIALCONNECTIONS));
m_DB_INITIALCONNECTIONS = iVal.intValue();
- Tools.toConsole("loadProperties", "driver=" + m_DB_DRIVER+", url=" +
+ logger.debug("driver=" + m_DB_DRIVER+", url=" +
m_DB_URL + ", username=" + m_DB_USERNAME +
", max connections=" + m_DB_MAXCONNECTIONS);
DB.init(m_DB_DRIVER, m_DB_URL, m_DB_USERNAME, m_DB_PASSWORD,
@@ -155,7 +159,7 @@
if ( action == null ){
action = "";
}
- Tools.toConsole("doGet"," action : "+action);
+ logger.debug(" action : "+action);
// page by default - index.jsp
@@ -175,15 +179,15 @@
if ( request.isUserInRole("manager") ) {
admin.forward(request, response);
- Tools.toConsole("doGet"," login OK ");
+ logger.debug(" login OK ");
} else if (!login.equals("")) {// an username is specified: check it
String sqlSelect = "SELECT user_id,
user_passwd FROM user WHERE user_id='" + login_user + "' and user_passwd='" + passwd +
"'";
rs = DB.executeQuery(sqlSelect);
if (rs.next()== true) {
admin.forward(request, response);
- Tools.toConsole("doGet"," login OK ");
+ logger.debug(" login OK ");
} else { // login fail
- Tools.toConsole("doGet","login fail");
+ logger.error("login fail");
erreurLogin.forward(request, response);
}
} else {
@@ -192,7 +196,7 @@
}
catch (Exception e)
{
- Tools.toConsole("doGet","LoginAccess : "+ e);
+ logger.error("LoginAccess : ", e);
}
}
@@ -200,12 +204,12 @@
create_question.forward(request, response);
}
else if(action.equals("insertQuestion")) {
- Tools.toConsole("doGet","begin insert questions");
+ logger.debug("begin insert questions");
try {
String question_value =
request.getParameter("question_value");
String question = Tools.filter(question_value);
- Tools.toConsole("doGet","action insertQuestion > la
question a inserer : "+ question);
+ logger.debug("action insertQuestion > la question a
inserer : "+ question);
String[] answers_value =
request.getParameterValues("answer_value");
String option = request.getParameter("option");
@@ -222,7 +226,7 @@
q.setOption(option);
q.insertQuestion();
}
- Tools.toConsole("doGet"," insert the question = OK");
+ logger.debug(" insert the question = OK");
int sizeArray = answers_value.length;
for (int i = 0; i < sizeArray; i++) {
if (!answers_value[i].equals("")) {
@@ -235,7 +239,7 @@
admin.forward(request, response);
}
catch(Exception e) {
- Tools.toConsole("doGet","error :"+e);
+ logger.error("error :",e);
}
}
// button Back of newQuestion.jsp link of admin.jsp
@@ -263,7 +267,7 @@
sqlQuery = "UPDATE question SET type='"+ option +"'
where question_id='"+id_question+"'";
DB.executeQuery(sqlQuery);
- Tools.toConsole("doGet","action ok_edit, question
saved !");
+ logger.debug("action ok_edit, question saved !");
String[] answers_value =
request.getParameterValues("answer_value");
Vector answers_value_vector = new Vector();
@@ -287,7 +291,7 @@
for(int i = 0; i < sizeVector; i++){
sqlQuery = "UPDATE reponse SET reponse='"+
answers_value_vector.get(i) +"' where reponse_id='"+ theIDAnswers.get(i) +"'";
- Tools.toConsole("doGet", "action ok_edit, the
answers = "+ answers_value_vector.get(i));
+ logger.debug( "action ok_edit, the answers =
"+ answers_value_vector.get(i));
DB.executeQuery(sqlQuery);
}
if (sizeVector < sizeArray){
@@ -315,7 +319,7 @@
}
}
catch(Exception e){
- Tools.toConsole("doGet","action ok_edit : "+ e);
+ logger.error("action ok_edit : ", e);
}
admin.forward(request, response);
}
@@ -326,25 +330,25 @@
ResultSet rs;
String sqlQuery = "UPDATE question SET Editer=0";
DB.executeQuery(sqlQuery);
- Tools.toConsole("doGet","tous les questions ont le
code edite 0");
+ logger.debug("All questions have edit code at 0");
sqlQuery = "UPDATE question SET Editer=1 WHERE
question_id='"+ id_question +"'";
DB.executeQuery(sqlQuery);
- Tools.toConsole("doGet","la question est
selectionnee");
+ logger.debug("The question is selected");
sqlQuery = "UPDATE reponse SET Editer=0";
DB.executeQuery(sqlQuery);
sqlQuery = "UPDATE reponse SET Editer=1 WHERE
question_id='"+ id_question +"'";
DB.executeQuery(sqlQuery);
- Tools.toConsole("doGet","les reponses sont
selectionnees");
+ logger.debug("The answers are selected");
String theColor = request.getParameter("color_value");
- Tools.toConsole("doGet","color :"+ theColor);
+ logger.debug("color :"+ theColor);
sqlQuery = "UPDATE tools SET color='"+ theColor +"'";
DB.executeQuery(sqlQuery);
}
catch(Exception e)
{
- Tools.toConsole("doGet","action chooseTheQuestion : "+
e);
+ logger.error("action chooseTheQuestion : ", e);
}
admin.forward(request, response);
}
@@ -358,15 +362,15 @@
ResultSet rs;
String sqlQuery = "DELETE FROM question WHERE
question_id='"+ id_question +"'";
DB.executeQuery(sqlQuery);
- Tools.toConsole("doGet","la question a ete effacee");
+ logger.debug("The question was deleted");
sqlQuery = "DELETE FROM reponse WHERE question_id='"+
id_question +"'";
DB.executeQuery(sqlQuery);
- Tools.toConsole("doGet","les r�ponses ont ete
effacees");
+ logger.debug("The answers were deleted");
}
catch(Exception e)
{
- Tools.toConsole("doGet","LoginAccess : "+ e);
+ logger.error("LoginAccess : ", e);
}
admin.forward(request, response);
}
@@ -374,21 +378,21 @@
try {
String type = request.getParameter("option");
if(type.equals("unique")) {
- Tools.toConsole("doGet","action_submit > type
:"+ type);
+ logger.debug("action_submit > type :"+ type);
String id_reponse =
request.getParameter("vote");
ResultSet rs;
String sqlSelect = "SELECT nbre_check FROM
reponse where reponse_id='"+ id_reponse +"'";
rs = DB.executeQuery(sqlSelect);
while(rs.next()) {
int NC = rs.getInt("nbre_check");
- Tools.toConsole("doGet","action
submit_vote > nbre check : "+NC);
+ logger.debug("action submit_vote >
nbre check : "+NC);
NC++;
- Tools.toConsole("doGet","nbre_check
:"+ NC);
+ logger.debug("nbre_check :"+ NC);
String sqlQuery = "UPDATE reponse SET
nbre_check='"+ NC +"' WHERE reponse_id='"+ id_reponse +"'";
DB.executeQuery(sqlQuery);
}
} else {
- Tools.toConsole("doGet","action_submit > type
:"+ type);
+ logger.debug("action_submit > type :"+ type);
String[] ids_reponse =
request.getParameterValues("vote");
int longueur = ids_reponse.length;
for(int i = 0; i < longueur; i++) {
@@ -397,9 +401,9 @@
rs = DB.executeQuery(sqlSelect);
while(rs.next()) {
int NC =
rs.getInt("nbre_check");
-
Tools.toConsole("doGet","action submit_vote > nbre check : "+ NC);
+ logger.debug("action
submit_vote > nbre check : "+ NC);
NC++;
-
Tools.toConsole("doGet","nbre_check :"+ NC);
+ logger.debug("nbre_check :"+
NC);
String sqlQuery = "UPDATE
reponse SET nbre_check='"+ NC +"' WHERE reponse_id='"+ ids_reponse[i] +"'";
DB.executeQuery(sqlQuery);
}
@@ -407,25 +411,25 @@
}
}
catch(Exception e) {
- Tools.toConsole("doGet"," LoginAccess : "+ e);
+ logger.error(" LoginAccess : ", e);
}
try {
int id_question =
Integer.parseInt(request.getParameter("id_question"));
- Tools.toConsole("doGet","id_question :"+ id_question);
+ logger.debug("id_question :"+ id_question);
ResultSet rs;
String sqlSelect = "SELECT nbre_vote FROM question
where question_id='"+ id_question+"'";
rs = DB.executeQuery(sqlSelect);
while(rs.next()){
int NV = rs.getInt("nbre_vote");
- Tools.toConsole("doGet","nbre vote : "+ NV);
+ logger.debug("nbre vote : "+ NV);
NV++;
- Tools.toConsole("doGet","nbre vote : "+ NV);
+ logger.debug("nbre vote : "+ NV);
String sqlQuery = "UPDATE question SET
nbre_vote='"+ NV +"' WHERE question_id='"+ id_question +"'";
DB.executeQuery(sqlQuery);
}
}
catch(Exception e) {
- Tools.toConsole("doGet","> : "+ e);
+ logger.error("> : ", e);
}
submit_vote.forward(request, response);
}
@@ -455,7 +459,7 @@
q.changeLogin();
new_log.forward(request, response);
} else {
- Tools.toConsole("action new log", "the passwords
aren't identical");
+ logger.error("the passwords aren't identical");
errorNewLog.forward(request, response);
}
}
Index: Question.java
===================================================================
RCS file:
/home/cvs/repository/poll/war/src/java/org/jahia/webapps/poll/Question.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Question.java 16 Sep 2004 15:33:53 -0000 1.1
+++ Question.java 17 Sep 2004 09:57:05 -0000 1.2
@@ -30,6 +30,9 @@
* @version : %I%, %G%
*/
public class Question {
+
+ private static org.apache.log4j.Logger logger =
+ org.apache.log4j.Logger.getLogger(Question.class);
public Vector theAnswersVector = new Vector();
public Vector theIDAnswersVector = new Vector();
@@ -131,15 +134,15 @@
if(answer_value != null) {
//--- get the last id of answers ---//
String sqlQuery = "select max(reponse_id) as MaxRID
from reponse";
- System.out.println(sqlQuery);
+ logger.debug(sqlQuery);
ResultSet rs = DB.executeQuery(sqlQuery);
while(rs.next()) {
no_id_R = rs.getInt("MaxRID");
no_id_R++;
- Tools.toConsole("insertAnswer", " : ID answer :" +
no_id_R);
+ logger.debug(" : ID answer :" + no_id_R);
}
- Tools.toConsole("insertAnswer",": insert Answer "+ no_id_R +" OK");
+ logger.debug(": insert Answer "+ no_id_R +" OK");
sqlQuery = "insert into reponse values('"+ no_id_R +"','"+ no_id_Q
+"','"+ answer_value +"','0','0')";
DB.executeQuery(sqlQuery);
}
@@ -155,7 +158,7 @@
try {
//--- insert the question ---//
- Tools.toConsole("insertQuestion"," question : "+
question_value);
+ logger.debug(" question : "+ question_value);
//--- get the last id of questions ---//
String sqlSelect = "select max(question_id) as MaxQID from
question";
ResultSet rs = DB.executeQuery(sqlSelect);
@@ -163,16 +166,16 @@
while(rs.next()) {
no_id_Q = rs.getInt("MaxQID");
no_id_Q++;
- Tools.toConsole("insertQuestion","ID question :" +
no_id_Q);
+ logger.debug("ID question :" + no_id_Q);
}
String sqlQuery = "insert into question values('"+ no_id_Q
+"','"+ question_value +"','"+ option +"','0','0')";
DB.executeQuery(sqlQuery);
- Tools.toConsole("insertQuestion", "insert question no "+
no_id_Q + ", "+ question_value +", type : "+ option +" OK");
+ logger.debug( "insert question no "+ no_id_Q + ", "+
question_value +", type : "+ option +" OK");
}
catch (SQLException err) {
- System.err.println("\nErreur SQL ");
- System.err.println("Question > insertQuestion > "+ err);
+ logger.error("\nErreur SQL ");
+ logger.error("Question > insertQuestion > ", err);
}
}
@@ -204,7 +207,7 @@
}
}
catch (SQLException err) {
- System.err.println("\nErreur SQL > getOP > "+ err);
+ logger.error("\nErreur SQL > getOP > ", err);
}
return theOP;
}
@@ -233,12 +236,12 @@
if(rs.next()) {
nbre_vote = rs.getInt("nbre_vote");
- Tools.toConsole("getNbreVote","number of voters :"+
nbre_vote);
+ logger.debug("number of voters :"+ nbre_vote);
}
}
catch (SQLException err) {
- System.err.println("\nErreur SQL ");
- System.err.println("Question > getNbreVote > "+ err);
+ logger.error("\nErreur SQL ");
+ logger.error("Question > getNbreVote > ", err);
}
return nbre_vote;
}
@@ -254,7 +257,7 @@
public String getShowQuestion() {
try {
- Tools.toConsole("getShowQuestion", "begin....");
+ logger.debug( "begin....");
String sqlSelect = "select question from question WHERE
Editer=1";
ResultSet rs = DB.executeQuery(sqlSelect);
@@ -265,10 +268,10 @@
}
}
catch (SQLException err) {
- System.err.println("\nErreur SQL ");
- System.err.println("Question > getShowQuestion > "+ err);
+ logger.error("\nErreur SQL ");
+ logger.error("Question > getShowQuestion > ", err);
}
- Tools.toConsole("getShowQuestion"," ...end");
+ logger.debug(" ...end");
return question_value;
}
@@ -293,7 +296,7 @@
*/
public String showAnswer() {
- Tools.toConsole("showReponse", "begin");
+ logger.debug("begin");
try {
String sqlSelect = "select reponse_id, question_id,
reponse, Editer from reponse where Editer=1 order by reponse_id";
ResultSet rs = DB.executeQuery(sqlSelect);
@@ -308,12 +311,12 @@
}
}
catch (SQLException err) {
- System.err.println("\nErreur SQL ");
- System.err.println("Question > showAnswer > "+ err);
+ logger.error("\nErreur SQL ");
+ logger.error("Question > showAnswer > ", err);
}
Integer NIDQ = new Integer(no_id_Q);
NIDQS = NIDQ.toString(no_id_Q);
- Tools.toConsole("showReponse", "no id question :"+ NIDQS);
+ logger.debug("no id question :"+ NIDQS);
return NIDQS;
}
@@ -337,7 +340,7 @@
public void chooseQuestion() {
try {
- Tools.toConsole("chooseQuestion"," begin...");
+ logger.debug(" begin...");
String sqlSelect = "select question_id, question,Editer from
question order by question_id";
ResultSet rs = DB.executeQuery(sqlSelect);
@@ -349,10 +352,10 @@
}
}
catch (SQLException err) {
- System.err.println("\nErreur SQL ");
- System.err.println("Question > chooseQuestion > "+ err);
+ logger.error("\nErreur SQL ");
+ logger.error("Question > chooseQuestion > ", err);
}
- Tools.toConsole("chooseQuestion"," ...end");
+ logger.debug(" ...end");
}
@@ -397,10 +400,10 @@
}
}
catch (SQLException err) {
- System.err.println("\nErreur SQL ");
- System.err.println("Question > getResultat > "+ err);
+ logger.error("\nErreur SQL ");
+ logger.error("Question > getResultat > ", err);
}
- Tools.toConsole("getResultat","total vote = "+ total);
+ logger.debug("total vote = "+ total);
return question_value;
}
@@ -440,7 +443,7 @@
try {
String sqlSelect = "select nbre_check, reponse from reponse
where question_id='"+ stat +"' order by reponse_id";
- Tools.toConsole("viewStat","stat = "+ stat);
+ logger.debug("stat = "+ stat);
ResultSet rs = DB.executeQuery(sqlSelect);
while(rs.next()) {
@@ -451,9 +454,9 @@
resultReponseStat.add(reponse);
totalStat += checkInt;
- Tools.toConsole("viewStat","totalStat = "+ totalStat);
- Tools.toConsole("viewStat","resultatStat = "+
resultatStat);
- Tools.toConsole("viewStat","resultReponseStat = "+
resultReponseStat);
+ logger.debug("totalStat = "+ totalStat);
+ logger.debug("resultatStat = "+ resultatStat);
+ logger.debug("resultReponseStat = "+
resultReponseStat);
}
sqlSelect = "select question from question where
question_id='"+ stat +"'";
@@ -464,10 +467,10 @@
}
}
catch (SQLException err) {
- System.err.println("\nErreur SQL ");
- System.err.println("Question > viewStat > "+ err);
+ logger.error("\nErreur SQL ");
+ logger.error("Question > viewStat > ", err);
}
- Tools.toConsole("viewStat","question_value = "+ question_value);
+ logger.debug("question_value = "+ question_value);
return question_value;
}
@@ -493,15 +496,15 @@
try {
String sqlQuery = "UPDATE user set user_id='"+ user +"'";
- Tools.toConsole("changeLogin","new user = "+ user);
+ logger.debug("new user = "+ user);
DB.executeQuery(sqlQuery);
sqlQuery = "UPDATE user set user_passwd='"+ pass1 +"'";
- Tools.toConsole("changeLogin","new user = "+ pass1);
+ logger.debug("new user = "+ pass1);
DB.executeQuery(sqlQuery);
}
catch (SQLException err) {
- System.err.println("\nErreur SQL ");
- System.err.println("Question > changeLogin > "+ err);
+ logger.error("\nErreur SQL ");
+ logger.error("Question > changeLogin > ", err);
}
}
@@ -527,8 +530,8 @@
public String getEditTheQuestion() {
try{
- Tools.toConsole("getEditTheQuestion", "begin....");
- Tools.toConsole("getEditTheQuestion","no id question = "+
editQ);
+ logger.debug("begin....");
+ logger.debug("no id question = "+ editQ);
String sqlSelect = "select question from question WHERE
question_id='"+ editQ+"'";
ResultSet rs = DB.executeQuery(sqlSelect);
@@ -537,10 +540,10 @@
}
}
catch (SQLException err){
- System.err.println("\nErreur SQL ");
- System.err.println("Question > getEditTheQuestion > "+ err);
+ logger.error("\nErreur SQL ");
+ logger.error("Question > getEditTheQuestion > ", err);
}
- Tools.toConsole("getEditTheQuestion"," ...end");
+ logger.debug(" ...end");
return question_value;
}
@@ -564,8 +567,8 @@
*/
public Vector getEditTheAnswers() {
try{
- Tools.toConsole("getEditTheAnswers", "begin....");
- Tools.toConsole("getEditTheAnswers","no id question = "+
editQ);
+ logger.debug( "begin....");
+ logger.debug("no id question = "+ editQ);
String sqlSelect = "select reponse from reponse WHERE
question_id='"+ editQ +"' order by reponse_id";
ResultSet rs = DB.executeQuery(sqlSelect);
@@ -576,11 +579,11 @@
}
catch (SQLException err) {
- System.err.println("\nErreur SQL ");
- System.err.println("Question > getEditTheAnswers > "+ err);
+ logger.error("\nErreur SQL ");
+ logger.error("Question > getEditTheAnswers > ", err);
}
- Tools.toConsole("getEditTheAnswers","Vector = "+ editAnswers);
- Tools.toConsole("getEditTheAnswers"," ...end");
+ logger.debug("Vector = "+ editAnswers);
+ logger.debug(" ...end");
return editAnswers;
}
@@ -612,8 +615,8 @@
}
}
catch (SQLException err) {
- System.err.println("\nErreur SQL ");
- System.err.println("Question > getMaxAnswer > "+ err);
+ logger.error("\nErreur SQL ");
+ logger.error("Question > getMaxAnswer > ", err);
}
return maxAnswer;
}
Index: web.xml
===================================================================
RCS file: /home/cvs/repository/poll/war/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 16 Sep 2004 15:33:54 -0000 1.1
+++ web.xml 17 Sep 2004 09:57:06 -0000 1.2
@@ -8,7 +8,7 @@
<servlet>
<servlet-name>
Poll
- </servlet-name>
+ </servlet-name>
<servlet-class>
org.jahia.webapps.poll.PollServlet
</servlet-class>
@@ -24,6 +24,21 @@
<role-name>manager</role-name>
<role-link>manager</role-link>
</security-role-ref>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>
+ InitServlet
+ </servlet-name>
+ <servlet-class>
+ org.jahia.webapps.poll.InitServlet
+ </servlet-class>
+ <init-param>
+ <param-name>log4j-xml-init-file</param-name>
+ <param-value>/WEB-INF/etc/log4j.xml</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
</servlet>
<!-- [INSERT FRAGMENT HERE] -->
Index: log4j.xml
====================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
<!--
<appender name="Chainsaw" class="org.apache.log4j.net.SocketAppender">
<param name="RemoteHost" value="localhost"/>
<param name="Port" value="4445"/>
<param name="LocationInfo" value="true"/>
</appender>
-->
<appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
value="%6r %5p %c.%M:%L - %m%n"/>
</layout>
</appender>
<!--
<category name="org.apache.log4j.xml">
<priority value="debug"/>
<appender-ref ref="Chainsaw"/>
</category>
-->
<!-- Http client related levels -->
<category name="org.apache.commons.httpclient.ResponseInputStream">
<priority value="error"/>
<appender-ref ref="STDOUT"/>
</category>
<category name="httpclient.wire">
<priority value="error"/>
</category>
<category name="org.apache.commons.httpclient">
<priority value="error"/>
</category>
<!-- Struts related levels -->
<category name="org.apache.commons.digester">
<priority value="error"/>
</category>
<category name="org.apache.commons.beanutils">
<priority value="error"/>
</category>
<category name="org.apache.commons.validator">
<priority value="error"/>
</category>
<category name="org.apache.struts.util">
<priority value="error"/>
</category>
<!-- OJB related config -->
<category name="org.apache.ojb">
<priority value="warn"/>
</category>
<category name="DEFAULT">
<priority value="warn"/>
</category>
<category name="org.apache.ojb.broker.accesslayer.SqlGenerator">
<priority value="warn"/>
</category>
<category name="org.apache.ojb.broker.metadata.RepositoryXmlHandler">
<priority value="warn"/>
</category>
<!-- WebRaptor category configuration -->
<category name="com.jahia.webraptor.javascript">
<priority value="error"/>
</category>
<category name="com.jahia.webraptor.TidyHTMLTransformer">
<priority value="error"/>
</category>
<!-- Root config -->
<root>
<priority value="debug"/>
<appender-ref ref="STDOUT"/>
</root>
</log4j:configuration>
