vgritsenko 2002/07/23 20:38:44
Modified: . changes.xml
lib jars.xml
src/java/org/apache/cocoon/components/hsqldb ServerImpl.java
Added: lib/optional hsqldb-1.7.0.jar
Removed: lib/optional hsqldb-1.61.jar
Log:
update hsqldb; implement proper shutdown
Revision Changes Path
1.221 +4 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- changes.xml 23 Jul 2002 19:37:59 -0000 1.220
+++ changes.xml 24 Jul 2002 03:38:44 -0000 1.221
@@ -39,6 +39,9 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="VG" type="update">
+ Update HSQLDB to version 1.7.0. Now it properly shuts down with Cocoon.
+ </action>
<action dev="TC" type="add">
Moved the SWF generator and serializer from the scratchpad into the main trunk.
Added a hello-world sample for SWF
1.26 +1 -1 xml-cocoon2/lib/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/lib/jars.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- jars.xml 23 Jul 2002 19:37:59 -0000 1.25
+++ jars.xml 24 Jul 2002 03:38:44 -0000 1.26
@@ -186,7 +186,7 @@
driver, supporting a subset of ANSI-92 SQL. It offers a small, fast
database engine which offers both in memory and disk based
tables.</description>
<used-by>?</used-by>
- <lib>optional/hsqldb-1.61.jar</lib>
+ <lib>optional/hsqldb-1.7.0.jar</lib>
<homepage>http://hsqldb.sourceforge.net/</homepage>
</file>
<file>
1.1 xml-cocoon2/lib/optional/hsqldb-1.7.0.jar
<<Binary file>>
1.11 +7 -11
xml-cocoon2/src/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
Index: ServerImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/hsqldb/ServerImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ServerImpl.java 22 Feb 2002 07:00:07 -0000 1.10
+++ ServerImpl.java 24 Jul 2002 03:38:44 -0000 1.11
@@ -112,6 +112,8 @@
arguments[3] = params.getParameter("silent","true");
arguments[4] = "-trace";
arguments[5] = params.getParameter("trace","false");
+ arguments[4] = "-no_system_exit";
+ arguments[5] = "true";
if (this.getLogger().isDebugEnabled()) {
this.getLogger().debug("Configure ServerImpl with port: " + arguments[1]
+ ", silent: " + arguments[3]
@@ -162,10 +164,7 @@
/** Stop the server */
public void stop() {
if (started) {
- // TODO: Execute shutdown. Now HSQLDB have a System.exit() call
-/*
try {
- System.out.println("Shutting down HSQLDB");
getLogger().debug("Shutting down HSQLDB");
Connection connection =
DriverManager.getConnection("jdbc:hsqldb:hsql://localhost:" + this.port, "sa", "");
Statement statement = connection.createStatement();
@@ -173,14 +172,12 @@
try {
connection.close();
} catch (SQLException e) {
- System.out.println("Shutting down HSQLDB: Ignoring exception: "
+ e);
+ getLogger().debug("Shutting down HSQLDB: Ignoring exception: "
+ e);
}
} catch (Exception e){
- System.out.println("Shutting down HSQLDB: Exception.");
- e.printStackTrace();
+ getLogger().error("Error while shutting down HSQLDB", e);
}
- System.out.println("Shutting down HSQLDB: Done");
-*/
+ getLogger().debug("Shutting down HSQLDB: Done");
}
}
@@ -196,8 +193,7 @@
org.hsqldb.Server.main(arguments);
} catch(Exception e){
- System.out.println("run got exception: ");
- e.printStackTrace();
+ getLogger().error("Got exception", e);
} finally {
started = false;
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
