Author: ktlili
Date: Thu Jun 21 15:21:57 2007
New Revision: 53
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D53&repname=3D=
bookmark
Log:
-log less verbose
- remove system.out.println
Modified:
trunk/portletJSR168/src/webapp/WEB-INF/portlet.xml
trunk/war/src/java/org/jahia/tools/Tools.java
trunk/war/src/java/org/jahia/tools/db/DBServices.java
trunk/war/src/java/org/jahia/webapps/bookmark/controller/BookmarkServle=
t.java
trunk/war/src/java/org/jahia/webapps/bookmark/db/CategoryDB.java
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=3D53&repname=3Dbookmark
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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 15:21:57 =
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>Bookmark portlet</description>
<portlet-name>Bookmark</portlet-name>
<portlet-class>org.jahia.portlet.JahiaWebAppPortletBridge</portlet=
-class>
<!-- jahia webapp class -->
Modified: trunk/war/src/java/org/jahia/tools/Tools.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/war/src/java/or=
g/jahia/tools/Tools.java&rev=3D53&repname=3Dbookmark
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/Tools.java (original)
+++ trunk/war/src/java/org/jahia/tools/Tools.java Thu Jun 21 15:21:57 2007
@@ -1,5 +1,7 @@
package org.jahia.tools;
=
+import org.apache.log4j.Logger;
+
import java.util.*;
import java.text.*;
=
@@ -15,7 +17,7 @@
{
/** Boolean to test for console output or not */
private final static boolean debugInfo =3D false;
-
+ private static final Logger logger =3D Logger.getLogger(Tools.class);
/**
* Outputs an <code>int</code> value to the standard console.
*
@@ -24,8 +26,7 @@
*/
public static void toConsole(String method, int value) {
if (debugInfo) {
- System.out.println(">> " + method + "(): " + value);
- System.out.flush();
+ logger.info(">> " + method + "(): " + value);
}
}
=
@@ -37,8 +38,7 @@
*/
public static void toConsole(String method, String value) {
if (debugInfo) {
- System.out.println(">> " + method + "(): " + value);
- System.out.flush();
+ logger.info(">> " + method + "(): " + value);
}
}
=
@@ -50,8 +50,7 @@
*/
public static void toConsole(String method, float value) {
if (debugInfo) {
- System.out.println(">> " + method + "(): " + value);
- System.out.flush();
+ logger.info(">> " + method + "(): " + value);
}
}
=
@@ -63,8 +62,7 @@
*/
public static void toConsole(String method, long value) {
if (debugInfo) {
- System.out.println(">> " + method + "(): " + value);
- System.out.flush();
+ logger.info(">> " + method + "(): " + value);
}
}
=
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=3D53&repname=3Dbookmark
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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 15:21:=
57 2007
@@ -13,6 +13,7 @@
import org.apache.ojb.broker.*;
import org.apache.ojb.broker.query.*;
import org.apache.ojb.broker.accesslayer.*;
+import org.apache.log4j.Logger;
import org.jahia.webapps.bookmark.model.*;
=
/**
@@ -24,7 +25,7 @@
* @version 1.0
*/
public class DBServices {
-
+ private static final Logger logger =3D Logger.getLogger(DBServices.cla=
ss);
/** the database connection pool */
private static ConnectionPool Pool =3D null;
private static PersistenceBroker broker =3D null;
@@ -100,7 +101,7 @@
BookmarkManager bm =3D null;
=
try {
- System.out.println("je suis dans findWorkspacedb");
+ logger.debug("start...");
Criteria crit =3D new Criteria();
crit.addEqualTo("owner", owner);
crit.addEqualTo("context_id", new Integer(contextId));
@@ -164,7 +165,7 @@
// select * from Period where period_id =3D id
Vector books =3D new Vector();
Bookmark b =3D null;
- System.out.println("je suis dans bookmark avec catiD" + catId);
+ logger.debug("catiD" + catId);
try {
Criteria crit =3D new Criteria();
crit.addEqualTo("category_id", new Integer(catId));
@@ -181,7 +182,7 @@
}
for (int i =3D 0; i < books.size(); i++) {
b =3D (Bookmark) books.get(i);
- System.out.println("book_" + i + " " + b.getTitle());
+ logger.debug("book_" + i + " " + b.getTitle());
}
}
=
@@ -371,7 +372,7 @@
boolean ret =3D true;
BookmarkManager bm=3D null;
=
- System.out.println("je suis dans insertWorkspace");
+ logger.debug("start...");
bm=3Dnew BookmarkManager(id, owner, contextId);
try {
=
@@ -390,7 +391,7 @@
boolean ret =3D true;
Category cat=3D null;
=
- System.out.println("je suis dans insertCategory");
+ logger.debug("start...");
try {
cat=3Dnew Category(id, name, workspaceId,parentId,expanded);
broker.beginTransaction();
@@ -409,7 +410,7 @@
boolean ret =3D true;
Bookmark b=3D null;
=
- System.out.println("je suis dans insertBookmark");
+ logger.debug("start... insertBookmark");
try {
b=3Dnew Bookmark(id, title, url,catId);
broker.beginTransaction();
Modified: trunk/war/src/java/org/jahia/webapps/bookmark/controller/Bookmark=
Servlet.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/war/src/java/or=
g/jahia/webapps/bookmark/controller/BookmarkServlet.java&rev=3D53&repname=
=3Dbookmark
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/bookmark/controller/BookmarkServle=
t.java (original)
+++ trunk/war/src/java/org/jahia/webapps/bookmark/controller/BookmarkServle=
t.java Thu Jun 21 15:21:57 2007
@@ -154,8 +154,7 @@
=
}
catch (Throwable t) {
- logger.debug("AbsenceRequestServlet::init: error initializing =
PersistenceBroker");
- t.printStackTrace();
+ logger.error("AbsenceRequestServlet::init: error initializing =
PersistenceBroker",t);
throw new ServletException("error initializing database via OJ=
B", t);
}
=
@@ -211,7 +210,7 @@
=
=
} catch (java.io.IOException ex) {
- ex.printStackTrace();
+ logger.error(ex,ex);
return false;
}
return true;
Modified: trunk/war/src/java/org/jahia/webapps/bookmark/db/CategoryDB.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/war/src/java/or=
g/jahia/webapps/bookmark/db/CategoryDB.java&rev=3D53&repname=3Dbookmark
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/bookmark/db/CategoryDB.java (origi=
nal)
+++ trunk/war/src/java/org/jahia/webapps/bookmark/db/CategoryDB.java Thu Ju=
n 21 15:21:57 2007
@@ -255,7 +255,6 @@
=
} catch (Exception e) {
logger.error("CategoryDB - construct: ", e);
- e.printStackTrace();
}
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
