Author: ktlili
Date: Thu Jun 21 18:08:40 2007
New Revision: 37
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D37&repname=3D=
modificationrequest
Log:
- remove system.err.println
- add log4j.xml
- change portlet description
Modified:
trunk/portletJSR168/src/webapp/WEB-INF/portlet.xml
trunk/war/src/conf/java/log4j.xml
trunk/war/src/java/org/jahia/tools/db/DBServices.java
trunk/war/src/java/org/jahia/webapps/fichotheque/Card.java
trunk/war/src/java/org/jahia/webapps/fichotheque/FichothequeServlet.java
trunk/war/src/webapp/jsp/display_card.jsp
trunk/war/src/webapp/jsp/display_form.jsp
trunk/war/src/webapp/jsp/display_searchForm.jsp
trunk/war/src/webapp/jsp/index.jsp
Modified: trunk/portletJSR168/src/webapp/WEB-INF/portlet.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/portletJSR168/s=
rc/webapp/WEB-INF/portlet.xml&rev=3D37&repname=3Dmodificationrequest
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/portletJSR168/src/webapp/WEB-INF/portlet.xml (original)
+++ trunk/portletJSR168/src/webapp/WEB-INF/portlet.xml Thu Jun 21 18:08:40 =
2007
@@ -1,7 +1,7 @@
=C3=AF=C2=BB=C2=BF<?xml version=3D"1.0" encoding=3D"UTF-8"?>
<portlet-app version=3D"1.0">
<portlet>
- <description>Jahia WebApp Portlet Bridge</description>
+ <description>Modification request</description>
<portlet-name>ModificationRequest</portlet-name>
<portlet-class>org.jahia.portlet.JahiaWebAppPortletBridge</portlet=
-class>
<!-- jahia webapp class -->
Modified: trunk/war/src/conf/java/log4j.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/war/src/conf/ja=
va/log4j.xml&rev=3D37&repname=3Dmodificationrequest
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/war/src/conf/java/log4j.xml (original)
+++ trunk/war/src/conf/java/log4j.xml Thu Jun 21 18:08:40 2007
@@ -60,7 +60,7 @@
<!-- OJB related config -->
=
<category name=3D"org.apache.ojb">
- <priority value=3D"warn"/>
+ <priority value=3D"error"/>
=
</category>
=
Modified: trunk/war/src/java/org/jahia/tools/db/DBServices.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/war/src/java/or=
g/jahia/tools/db/DBServices.java&rev=3D37&repname=3Dmodificationrequest
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/war/src/java/org/jahia/tools/db/DBServices.java (original)
+++ trunk/war/src/java/org/jahia/tools/db/DBServices.java Thu Jun 21 18:08:=
40 2007
@@ -36,7 +36,6 @@
}
catch (SQLException se)
{
- System.out.println("Error in creation connectionPool : " +
se.getMess=
age() + "\n" );
logger.debug("FaqDBService: Error in creation connectionPool : ",
se=
);
}
}
@@ -70,7 +69,7 @@
{
if ( m_Instance =3D=3D null )
{
- System.out.println("Error m_Instance null !!!!!" );
+ logger.error("Error m_Instance null !!!!!" );
throw new SQLException();
}
else
Modified: trunk/war/src/java/org/jahia/webapps/fichotheque/Card.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/war/src/java/or=
g/jahia/webapps/fichotheque/Card.java&rev=3D37&repname=3Dmodificationrequest
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/war/src/java/org/jahia/webapps/fichotheque/Card.java (original)
+++ trunk/war/src/java/org/jahia/webapps/fichotheque/Card.java Thu Jun 21 1=
8:08:40 2007
@@ -85,7 +85,7 @@
public Card(int id, String cardLibraryName)
{
this.id =3D id;
- System.out.println("carlib dans create card "+cardLibraryName);
+ logger.debug("carlib dans create card "+cardLibraryName);
this.cardLibraryName =3D cardLibraryName;
this.setCardLibraryName(cardLibraryName);
this.loadFields();
@@ -289,7 +289,7 @@
public void loadFields() {
// select the right card in DB
try {
- System.out.println("Je suis dans loadfield");
+ logger.debug("Je suis dans loadfield");
ResultSet rs;
boolean flag =3D true;
Card crd =3D AccessDB.findCard(this.id);
Modified: trunk/war/src/java/org/jahia/webapps/fichotheque/FichothequeServl=
et.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/war/src/java/or=
g/jahia/webapps/fichotheque/FichothequeServlet.java&rev=3D37&repname=3Dmodi=
ficationrequest
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/war/src/java/org/jahia/webapps/fichotheque/FichothequeServlet.jav=
a (original)
+++ trunk/war/src/java/org/jahia/webapps/fichotheque/FichothequeServlet.jav=
a Thu Jun 21 18:08:40 2007
@@ -189,12 +189,11 @@
*/
protected void loadFieldsNames()
{
- logger.debug("je suis dans loadfieldname");
- System.out.println("dans load "+CARD_LIBRARY_NAME);
+ logger.debug("Card lib name "+CARD_LIBRARY_NAME);
Card crd =3D new Card(0,CARD_LIBRARY_NAME);
- System.out.println("dans load "+crd.getCardLibraryName());
+ logger.debug("Card lib name "+crd.getCardLibraryName());
CARD_FIELDS_NAMES =3D crd;
- System.out.println("dans load 2"+CARD_FIELDS_NAMES.getCardLibraryNam=
e());
+ logger.debug("Card fields name"+CARD_FIELDS_NAMES.getCardLibraryName=
());
=
}
=
@@ -215,7 +214,7 @@
fis.close();
=
CARD_LIBRARY_NAME =3D Props.getProperty( PROP_CARD_LIBRARY_NAM=
E );
- System.out.println("sans le s" + CARD_LIBRARY_NAME);
+ logger.debug("Card lib name" + CARD_LIBRARY_NAME);
NB_CARD_BY_PAGE =3D Props.getProperty( PROP_NB_CARD_BY_PAGE );
//m_DB_DRIVER =3D Props.getProperty( PROP_DB_DRIVER );
//m_DB_URL =3D replace(Props.getProperty( PROP_DB_URL ), CONTE=
XT_ROOT_REAL_PATH, m_ContextRootRealPath);
@@ -235,7 +234,7 @@
}
catch (java.io.IOException ex)
{
- ex.printStackTrace();
+ logger.error(ex,ex);
return false;
}
return true;
@@ -320,8 +319,6 @@
catch (Exception e)
{
logger.error("FichothequeServlet: doPost",e);
- e.printStackTrace();
- e.getCause();
=
}
logger.debug("FichothequeServlet: doPost: end");
@@ -399,7 +396,7 @@
request.setAttribute("username",userName);
=
// initialise user right
- System.out.println("lib: "+CARD_LIBRARY_NAME);
+ logger.debug("lib: "+CARD_LIBRARY_NAME);
String userRight =3D (String)session.getAttribute(CARD_LIBRARY_NAME
+ "_userRight");
if (userRight =3D=3D null)
@@ -415,8 +412,7 @@
logger.debug("FichothequeServlet: setParameters: sessionId=3D" + (=
String)session.getId());
if (session.getAttribute(CARD_LIBRARY_NAME + "_useMode") =3D=3D nu=
ll)
{
- System.out.println("je passe dans le if");
- System.out.println(CARD_LIBRARY_NAME);
+ logger.debug("Card lob name: "+CARD_LIBRARY_NAME);
try
{
Properties Prop_useMode =3D new Properties();
@@ -451,7 +447,6 @@
catch (java.io.IOException ex)
{
logger.error("FichothequeServlet: setParameters: Exception=
: " ,ex);
- ex.printStackTrace();
}
}
logger.debug("FichothequeServlet: setParameters: end useMode");
@@ -485,12 +480,12 @@
}
=
// set the fields names
- System.out.println("avant de set card " +CARD_FIELDS_NAMES.getCard=
LibraryName());
+ logger.debug("Card fields name" +CARD_FIELDS_NAMES.getCardLibraryN=
ame());
=
request.setAttribute("card", CARD_FIELDS_NAMES);
Card test =3D(Card)request.getAttribute("card");
- System.out.println("attributs "+test.getCardLibraryName());
- System.out.println("attributs "+test.getId());
+ logger.debug("attributs "+test.getCardLibraryName());
+ logger.debug("attributs "+test.getId());
=
// set the card library name
request.setAttribute("cardLibraryName", CARD_LIBRARY_NAME);
Modified: trunk/war/src/webapp/jsp/display_card.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/war/src/webapp/=
jsp/display_card.jsp&rev=3D37&repname=3Dmodificationrequest
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/war/src/webapp/jsp/display_card.jsp (original)
+++ trunk/war/src/webapp/jsp/display_card.jsp Thu Jun 21 18:08:40 2007
@@ -30,7 +30,6 @@
//Vector fieldsName =3D card.getFieldsName();
Vector fieldsName =3D new Vector();
if (fieldsName.size()=3D=3D0) {
- System.out.println("je passe");
fieldsName.add("CARD_ID");
fieldsName.add("TITLE");
fieldsName.add("RESPONSIBLE");
Modified: trunk/war/src/webapp/jsp/display_form.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/war/src/webapp/=
jsp/display_form.jsp&rev=3D37&repname=3Dmodificationrequest
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/war/src/webapp/jsp/display_form.jsp (original)
+++ trunk/war/src/webapp/jsp/display_form.jsp Thu Jun 21 18:08:40 2007
@@ -30,7 +30,6 @@
//Vector fieldsName =3D card.getFieldsName();
Vector fieldsName =3D new Vector();
if (fieldsName.size()=3D=3D0) {
- System.out.println("je passe dans form jsp");
fieldsName.add("CARD_ID");
fieldsName.add("TITLE");
fieldsName.add("RESPONSIBLE");
Modified: trunk/war/src/webapp/jsp/display_searchForm.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/war/src/webapp/=
jsp/display_searchForm.jsp&rev=3D37&repname=3Dmodificationrequest
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/war/src/webapp/jsp/display_searchForm.jsp (original)
+++ trunk/war/src/webapp/jsp/display_searchForm.jsp Thu Jun 21 18:08:40 2007
@@ -28,7 +28,6 @@
// Vector fieldsName =3D card.getFieldsName();
Vector fieldsName =3D new Vector();
if (fieldsName.size()=3D=3D0) {
- System.out.println("je passe");
fieldsName.add("CARD_ID");
fieldsName.add("TITLE");
fieldsName.add("RESPONSIBLE");
@@ -62,7 +61,6 @@
// get the useMode
String useMode =3D (String)request.getSession(true).getAttribute(cardL=
ibraryName + "_useMode");
=
- System.out.println("display_ModificationRequest_searchform.jsp userRig=
ht =3D "+userRight );
%>
<form name=3D"ModificationRequest<%=3DcontextId%>_searchform" action=3D"<%=
=3D response.encodeURL((String)request.getSession(true).getAttribute(cardLi=
braryName + "_servletURI"))%>" method=3D"post">
<input class=3D"waInput" type=3D"hidden" name=3D"current_action">
Modified: trunk/war/src/webapp/jsp/index.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/war/src/webapp/=
jsp/index.jsp&rev=3D37&repname=3Dmodificationrequest
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/war/src/webapp/jsp/index.jsp (original)
+++ trunk/war/src/webapp/jsp/index.jsp Thu Jun 21 18:08:40 2007
@@ -19,12 +19,9 @@
}
=
String nextPage =3D (String) request.getAttribute("next_page");
- System.out.println("next page jsp :"+nextPage);
String menuPage =3D (String) request.getAttribute("menu_page");
- System.out.println("menu page jsp :"+menuPage);
=
String bottomPage =3D (String) request.getAttribute("bottom_page");
- System.out.println("bottom page jsp :"+bottomPage);
=
%>
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list