cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r494848 - in /cocoon/branches/BRANCH_2_1_X: ./ legal/ lib/ lib/optional/ src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/
Date Wed, 10 Jan 2007 15:19:44 GMT
Author: cziegeler
Date: Wed Jan 10 07:19:43 2007
New Revision: 494848

URL: http://svn.apache.org/viewvc?view=rev&rev=494848
Log:
Fix startup problems with newer HSQLDB versions and upgrade to 1.8.0.7

Added:
    cocoon/branches/BRANCH_2_1_X/legal/hsqldb-1.8.0.7.jar.license.txt
      - copied unchanged from r494758, cocoon/branches/BRANCH_2_1_X/legal/hsqldb-1.8.0.2.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/lib/optional/hsqldb-1.8.0.7.jar   (with props)
Removed:
    cocoon/branches/BRANCH_2_1_X/legal/hsqldb-1.8.0.2.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/lib/optional/hsqldb-1.8.0.2.jar
Modified:
    cocoon/branches/BRANCH_2_1_X/lib/jars.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/lib/jars.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/jars.xml?view=diff&rev=494848&r1=494847&r2=494848
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/lib/jars.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/lib/jars.xml Wed Jan 10 07:19:43 2007
@@ -459,7 +459,7 @@
       database engine which offers both in memory and disk based tables.
     </description>
     <used-by>Cocoon samples webapp</used-by>
-    <lib>optional/hsqldb-1.8.0.2.jar</lib>
+    <lib>optional/hsqldb-1.8.0.7.jar</lib>
     <homepage>http://hsqldb.sourceforge.net/</homepage>
   </file>
 

Added: cocoon/branches/BRANCH_2_1_X/lib/optional/hsqldb-1.8.0.7.jar
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/optional/hsqldb-1.8.0.7.jar?view=auto&rev=494848
==============================================================================
Binary file - no diff available.

Propchange: cocoon/branches/BRANCH_2_1_X/lib/optional/hsqldb-1.8.0.7.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java?view=diff&rev=494848&r1=494847&r2=494848
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
Wed Jan 10 07:19:43 2007
@@ -113,6 +113,7 @@
         String dbName = params.getParameter("name", DEFAULT_DB_NAME);
         try {
             hsqlServer.setDatabasePath(0, new File(dbPath).getCanonicalPath() + File.separator
+ dbName);
+            hsqlServer.setDatabaseName(0, dbName);
         } catch (IOException e) {
             throw new ParameterException("Could not get database directory <" + dbPath
+ ">", e);
         }

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?view=diff&rev=494848&r1=494847&r2=494848
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Wed Jan 10 07:19:43 2007
@@ -182,6 +182,9 @@
   <changes>
   <release version="2.1.11" date="TBD">
     <action dev="CZ" type="fix" fixes-bug="COCOON-1979" due-to="Rob Berens">
+      HSQLDB block: Fix startup problems with newer HSQLDB versions and upgrade to 1.8.0.7.
+    </action>
+    <action dev="CZ" type="fix" fixes-bug="COCOON-1979" due-to="Rob Berens">
       Core: Check for reloading of javascript files loaded by cocoon.load().
     </action>
     <action dev="JH" type="add" fixes-bug="COCOON-1471" due-to="Robin Wyles">



Mime
View raw message