Author: ktlili
Date: Thu Jun 21 19:04:33 2007
New Revision: 60
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D60&repname=3D=
addressbook
Log:
- remove system err println
- fix hsql bug
Added:
trunk/war/src/webapp/WEB-INF/db/xo3adb.properties
Modified:
trunk/portletJSR168/src/webapp/WEB-INF/portlet.xml
trunk/war/src/conf/java/log4j.xml
trunk/war/src/java/org/jahia/webapps/addressbook/InitServlet.java
trunk/war/src/webapp/jsp/menu.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=3D60&repname=3Daddressbook
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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 19:04:33 =
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>Address book</description>
<portlet-name>AddressBook</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=3D60&repname=3Daddressbook
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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 19:04:33 2007
@@ -77,12 +77,12 @@
</category>
=
<category name=3D"org.apache.ojb.broker.accesslayer.SqlGenerator">
- <priority value=3D"warn"/>
+ <priority value=3D"error"/>
<appender-ref ref=3D"STDOUT"/>
</category>
=
<category name=3D"org.apache.ojb.broker.metadata.RepositoryXmlHandler">
- <priority value=3D"warn"/>
+ <priority value=3D"error"/>
<appender-ref ref=3D"STDOUT"/>
</category>
=
@@ -101,7 +101,7 @@
<!-- Root config -->
=
<root>
- <priority value=3D"info"/>
+ <priority value=3D"error"/>
<appender-ref ref=3D"STDOUT"/>
</root>
</log4j:configuration>
\ No newline at end of file
Modified: trunk/war/src/java/org/jahia/webapps/addressbook/InitServlet.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/war/src/java/or=
g/jahia/webapps/addressbook/InitServlet.java&rev=3D60&repname=3Daddressbook
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/addressbook/InitServlet.java (orig=
inal)
+++ trunk/war/src/java/org/jahia/webapps/addressbook/InitServlet.java Thu J=
un 21 19:04:33 2007
@@ -39,7 +39,7 @@
DOMConfigurator.configure(prefix+xmlFile);
}
=
- logger.debug("Log4j configured, initializing the rest of the WebRa=
ptor...");
+ logger.debug("Log4j configured, initializing the rest of the adres=
s book...");
=
// the following line MUST be done before any call to the URL clas=
s,
// actually it should probably be done on the startup command line=
for
Added: trunk/war/src/webapp/WEB-INF/db/xo3adb.properties
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/trunk/war/src/=
webapp/WEB-INF/db/xo3adb.properties&rev=3D60&repname=3Daddressbook
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/WEB-INF/db/xo3adb.properties (added)
+++ trunk/war/src/webapp/WEB-INF/db/xo3adb.properties Thu Jun 21 19:04:33 2=
007
@@ -0,0 +1,17 @@
+#HSQL Database Engine
+#Thu Jun 21 18:54:43 CEST 2007
+hsqldb.script_format=3D0
+runtime.gc_interval=3D0
+sql.enforce_strict_size=3Dfalse
+hsqldb.cache_size_scale=3D8
+readonly=3Dfalse
+hsqldb.nio_data_file=3Dtrue
+hsqldb.cache_scale=3D14
+version=3D1.8.0
+hsqldb.default_table_type=3Dmemory
+hsqldb.cache_file_scale=3D1
+hsqldb.log_size=3D200
+modified=3Dyes
+hsqldb.cache_version=3D1.7.0
+hsqldb.original_version=3D1.8.0
+hsqldb.compatible_version=3D1.8.0
Modified: trunk/war/src/webapp/jsp/menu.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/war/src/webapp/=
jsp/menu.jsp&rev=3D60&repname=3Daddressbook
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/menu.jsp (original)
+++ trunk/war/src/webapp/jsp/menu.jsp Thu Jun 21 19:04:33 2007
@@ -24,9 +24,9 @@
<td class=3D"waNormal" align=3D"center">
<a class=3D"waMenu" href=3D"<%=3Dresponse.encodeURL(servlet + "?current_ac=
tion=3Dmanage_categories") %>">Manage categories</a>
</td>
-<td class=3D"waNormal" align=3D"center">
+<!--<td class=3D"waNormal" align=3D"center">
<a class=3D"waMenu" href=3D"<%=3Dservlet + "Download?current_action=3Dsave=
&addbook=3D" + myBook.getId() + "&owner=3D" + myBook.getOwnerId() %>">Expor=
t</a>
-</td>
+</td>-->
<% } %>
</tr>
</table>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
