--no commit message

--no commit message

h2/ant-build.properties

 #Sat Mar 29 10:53:56 CET 2008
 benchmark.drivers.dir=C\:/data/java
 javac=javac
-version.name.maven=1.0.69
+version.name.maven=1.0.70

h2/build.xml

@@ -118,7 +118,7 @@
 		</jar>
 	</target>
 
-	<target name="jarClient" depends="resources, manifest">
+	<target name="jarClient" depends="switchSourceAuto, resources, manifest">
 		<javac executable="${javac}" srcdir="src/main" destdir="bin" debug="true" debuglevel="lines,source">
 			<include name="org/h2/*" />
 			<include name="org/h2/jdbc/**" />
@@ -165,7 +165,7 @@
 		<mkdir dir="docs/javadocImpl"/>
 		<javadoc
 			sourcepath="src/main;src/test;src/tools"
-		    classpath="${path.lucene.jar};${path.servlet.jar};${java.class.path}"
+		    classpath="ext/servlet-api-2.4.jar;ext/lucene-core-2.2.0.jar;${java.class.path}"
 			packagenames="org.h2.*"
 			doclet="org.h2.build.doclet.Doclet"  
 		    docletpath="bin"
@@ -176,7 +176,7 @@
 		    noindex="true"
 			packagenames="org.h2.*"
 		    excludepackagenames="org.h2.build.*,org.h2.dev.*"
-		    classpath="${path.lucene.jar};${path.servlet.jar};${java.class.path}"
+		    classpath="ext/servlet-api-2.4.jar;ext/lucene-core-2.2.0.jar;${java.class.path}"
 			destDir="docs/javadocImpl"
 		/>
 		<copy todir="docs/javadoc">

h2/src/docsrc/html/build.html

@@ -84,7 +84,7 @@ Example:
 <dependency>
     <groupId>com.h2database</groupId>
     <artifactId>h2</artifactId>
-    <version>1.0.69</version>
+    <version>1.0.70</version>
 </dependency>
 </pre>
 <p>

h2/src/docsrc/html/changelog.html

@@ -15,6 +15,11 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>-
+</li></ul>
+
+<h2>Version 1.0.70 (2008-04-20)</h2>
+<ul>
 <li>The plan is to dual-license H2. The additional license is EPL (Eclipse Public License).
     The current license (MPL, Mozilla Public License) will stay.
     Current users are not affected because they can keep MPL. 
@@ -48,7 +53,7 @@ Change Log
     more by removing unneeded components.
 </li><li>Added shell scripts run.sh and build.sh. chmod +x is required, 
     but otherwise it should work. Feedback or improvements are welcome!
-</li><li>Databases in zip files: large queries are now support. Temp files are created in
+</li><li>Databases in zip files: large queries are now supported. Temp files are created in
     the temp directory if required. The documentation how to create
     the zip file has been corrected.
 </li><li>Invalid inline views threw confusing SQL exceptions.

h2/src/docsrc/html/download.html

@@ -15,16 +15,16 @@ H2 Database Engine
 
 <h1>Downloads</h1>
 
-<h3>Version 1.0.69 (2008-03-29, Current)</h3>
+<h3>Version 1.0.69 (2008-04-20, Current)</h3>
 <p>
-<a href="http://www.h2database.com/h2-setup-2008-03-29.exe">Windows Installer</a><br />
-<a href="http://www.h2database.com/h2-2008-03-29.zip">Platform-Independent Zip</a><br />
+<a href="http://www.h2database.com/h2-setup-2008-04-20.exe">Windows Installer</a><br />
+<a href="http://www.h2database.com/h2-2008-04-20.zip">Platform-Independent Zip</a><br />
 </p>
 
-<h3>Version 1.0.68 (2008-03-15, Last Stable)</h3>
+<h3>Version 1.0.68 (2008-03-29, Last Stable)</h3>
 <p>
-<a href="http://www.h2database.com/h2-setup-2008-03-15.exe">Windows Installer</a><br />
-<a href="http://www.h2database.com/h2-2008-03-15.zip">Platform-Independent Zip</a><br />
+<a href="http://www.h2database.com/h2-setup-2008-03-29.exe">Windows Installer</a><br />
+<a href="http://www.h2database.com/h2-2008-03-29.zip">Platform-Independent Zip</a><br />
 </p>
 
 <h3>Download Mirror and Older Versions</h3>

h2/src/docsrc/html/mainWeb.html

@@ -32,17 +32,17 @@ Welcome to H2, the Java SQL database. The main feature of H2 are:
         <table style="border: 0px; margin: 5px; background-color: #eee;">
               <tr><td style="border: 0px; background-color: #eee;" colspan="2">
                 <h3>Download</h3>
-                Version 1.0.69 (2008-03-29):
+                Version 1.0.70 (2008-04-20):
             </td></tr>
             <tr><td style="border: 0px; background-color: #eee;">
-                <a href="http://www.h2database.com/h2-setup-2008-03-29.exe"><img border="1" src="images/download.png" alt="download" /></a>
+                <a href="http://www.h2database.com/h2-setup-2008-04-20.exe"><img border="1" src="images/download.png" alt="download" /></a>
             </td><td style="vertical-align: middle; border: 0px; background-color: #eee;">
-                <a href="http://www.h2database.com/h2-setup-2008-03-29.exe">Windows Installer (3.0 MB)</a>
+                <a href="http://www.h2database.com/h2-setup-2008-04-20.exe">Windows Installer (3.1 MB)</a>
             </td></tr>
             <tr><td style="border: 0px; background-color: #eee;">
-                <a href="http://www.h2database.com/h2-2008-03-29.zip"><img border="1" src="images/download.png" alt="download" /></a>
+                <a href="http://www.h2database.com/h2-2008-04-20.zip"><img border="1" src="images/download.png" alt="download" /></a>
             </td><td style="vertical-align: middle; border: 0px; background-color: #eee;">
-                <a href="http://www.h2database.com/h2-2008-03-29.zip">All platforms (zip, 4.2 MB)</a>
+                <a href="http://www.h2database.com/h2-2008-04-20.zip">All platforms (zip, 4.5 MB)</a>
             </td></tr>
             <tr><td style="border: 0px; background-color: #eee;" colspan="2">
                 <a href="download.html">All Downloads</a>

h2/src/installer/h2.nsi

@@ -122,6 +122,8 @@ Section "All"
   SetOutPath "$INSTDIR\service"
   File /r /x CVS /x .cvsignore /x .svn ..\..\service\*.*
   SetOutPath "$INSTDIR"
+  File /r /x CVS /x .cvsignore ..\..\build.bat  
+  File /r /x CVS /x .cvsignore ..\..\build.sh  
   File /r /x CVS /x .cvsignore ..\..\build.xml  
   File /r /x CVS /x .cvsignore ..\..\ant-build.properties
   

h2/src/installer/h2.sh

-#! /bin/sh
+#!/bin/sh
 cp=h2.jar
 if [ -n "$H2DRIVERS" ] ; then
   cp="$cp:$H2DRIVERS"

h2/src/main/org/h2/constant/ErrorCode.java

@@ -93,8 +93,8 @@ public class ErrorCode {
     /**
      * The error with code <code>22025</code> is thrown when using an invalid
      * escape character sequence for LIKE or REGEXP. The default escape
-     * character is '\'. When searching for the characters '%', '_' and the
-     * escape character, you need to prepend the escape character. That means if
+     * character is '\'. The escape character is required when searching for
+     * the characters '%', '_' and the escape character itself. That means if
      * you want to search for the text '10%', you need to use LIKE '10\%'. If
      * you want to search for 'C:\temp' you need to use 'C:\\temp'. The escape
      * character can be changed using the ESCAPE clause as in LIKE '10+%' ESCAPE

h2/src/main/org/h2/engine/Constants.java

@@ -15,8 +15,8 @@ package org.h2.engine;
  * - Compile with JDK 1.4, 1.5 and 1.6:
  *   set path=C:\Programme\Java\jdk1.6.0\bin;%PATH%
  *   set JAVA_HOME=C:\Programme\Java\jdk1.6.0
- *   set path=C:\Program Files\Java\jdk1.6.0_03\bin;%PATH%
- *   set JAVA_HOME=C:\Program Files\Java\jdk1.6.0_03
+ *   set path=C:\Program Files\Java\jdk1.6.0_05\bin;%PATH%
+ *   set JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05
  *   ant compile
  *   set classpath=
  *   ant javadoc
@@ -76,8 +76,8 @@ package org.h2.engine;
  */
 public class Constants {
 
-    public static final int BUILD_ID = 69;
-    private static final String BUILD = "2008-03-29";
+    public static final int BUILD_ID = 70;
+    private static final String BUILD = "2008-04-20";
 
     public static final boolean ALLOW_EMPTY_BTREE_PAGES = true;
     public static final int ALLOW_LITERALS_NONE = 0;

h2/src/main/org/h2/server/web/res/_text_es.properties

@@ -142,4 +142,3 @@ tree.nonUnique=No único
 tree.sequences=Secuencias
 tree.unique=Único
 tree.users=Usuarios
-~login.goTools=\#Tools

h2/src/main/org/h2/server/web/res/_text_fr.properties

@@ -142,4 +142,3 @@ tree.nonUnique=Non unique
 tree.sequences=Séquences
 tree.unique=Unique
 tree.users=Utilisateurs
-~login.goTools=\#Tools

h2/src/main/org/h2/server/web/res/_text_hu.properties

@@ -142,4 +142,3 @@ tree.nonUnique=Nem egyedi
 tree.sequences=Szekvencia
 tree.unique=Egyedi
 tree.users=Felhasználók
-~login.goTools=\#Tools

h2/src/main/org/h2/server/web/res/_text_in.properties

@@ -142,4 +142,3 @@ tree.nonUnique=Tidak-Unik
 tree.sequences=Urut-urutan
 tree.unique=Unik
 tree.users=Para pengguna
-~login.goTools=\#Tools

h2/src/main/org/h2/server/web/res/_text_it.properties

@@ -142,4 +142,3 @@ tree.nonUnique=Non unico
 tree.sequences=Sequenze
 tree.unique=Unico
 tree.users=Utenti
-~login.goTools=\#Tools

h2/src/main/org/h2/server/web/res/_text_nl.properties

@@ -142,4 +142,3 @@ tree.nonUnique=Niet uniek
 tree.sequences=Sequenties
 tree.unique=Uniek
 tree.users=Gebruikers
-~login.goTools=\#Tools

h2/src/main/org/h2/server/web/res/_text_pl.properties

@@ -142,4 +142,3 @@ tree.nonUnique=Nie unikalny
 tree.sequences=Sekwencje
 tree.unique=Unikalny
 tree.users=U&\#380;ytkownicy
-~login.goTools=\#Tools

h2/src/main/org/h2/server/web/res/_text_pt_br.properties

@@ -142,4 +142,3 @@ tree.nonUnique=Não único
 tree.sequences=Sequências
 tree.unique=Único
 tree.users=Usuários
-~login.goTools=\#Tools

h2/src/main/org/h2/server/web/res/_text_pt_pt.properties

@@ -142,4 +142,3 @@ tree.nonUnique=Não único
 tree.sequences=Sequências
 tree.unique=Único
 tree.users=Utilizadoreses
-~login.goTools=\#Tools

h2/src/main/org/h2/server/web/res/_text_ru.properties

@@ -142,4 +142,3 @@ tree.nonUnique=&\#1053;&\#1077;&\#1091;&\#1085;&\#1080;&\#1082;&\#1072;&\#1083;&
 tree.sequences=&\#1055;&\#1086;&\#1089;&\#1083;&\#1077;&\#1076;&\#1086;&\#1074;&\#1072;&\#1090;&\#1077;&\#1083;&\#1100;&\#1085;&\#1086;&\#1089;&\#1090;&\#1100;
 tree.unique=&\#1059;&\#1085;&\#1080;&\#1082;&\#1072;&\#1083;&\#1100;&\#1085;&\#1086;&\#1077;
 tree.users=&\#1055;&\#1086;&\#1083;&\#1100;&\#1079;&\#1086;&\#1074;&\#1072;&\#1090;&\#1077;&\#1083;&\#1080;
-~login.goTools=\#Tools

h2/src/main/org/h2/server/web/res/_text_tr.properties

@@ -142,4 +142,3 @@ tree.nonUnique=e&\#351;siz de&\#287;il
 tree.sequences=Dizinler
 tree.unique=E&\#351;siz
 tree.users=Kullan&\#305;c&\#305;
-~login.goTools=\#Tools

h2/src/main/org/h2/server/web/res/_text_uk.properties

@@ -142,4 +142,3 @@ tree.nonUnique=&\#x041D;&\#x0435;&\#x0443;&\#x043D;&\#x0456;&\#x043A;&\#x0430;&\
 tree.sequences=&\#x041F;&\#x043E;&\#x0441;&\#x043B;&\#x0456;&\#x0434;&\#x043E;&\#x0432;&\#x043D;&\#x043E;&\#x0441;&\#x0442;&\#x0456;
 tree.unique=&\#x0423;&\#x043D;&\#x0456;&\#x043A;&\#x0430;&\#x043B;&\#x044C;&\#x043D;&\#x0435;
 tree.users=&\#x041A;&\#x043E;&\#x0440;&\#x0438;&\#x0441;&\#x0442;&\#x0443;&\#x0432;&\#x0430;&\#x0447;&\#x0456;
-~login.goTools=\#Tools

h2/src/main/org/h2/server/web/res/_text_zh_cn.properties

@@ -142,4 +142,3 @@ tree.nonUnique=\u4E0D\u552F\u4E00
 tree.sequences=\u5E8F\u5217
 tree.unique=\u552F\u4E00
 tree.users=\u7528\u6237
-~login.goTools=\#Tools

h2/src/test/org/h2/samples/newsfeed.sql

@@ -10,6 +10,62 @@ INSERT INTO CHANNEL VALUES('H2 Database Engine' ,
 
 CREATE TABLE ITEM(ID INT PRIMARY KEY, TITLE VARCHAR, ISSUED TIMESTAMP, DESC VARCHAR);
 
+INSERT INTO ITEM VALUES(40,
+'New version available: 1.0.70 (2008-04-20)', '2008-04-20 12:00:00',
+'A new version of H2 is available for <a href="http://www.h2database.com">download</a>.
+(You may have to click ''Refresh'').
+<br />
+<b>Changes and new functionality:</b>
+<ul><li>The plan is to dual-license H2. The additional license is EPL (Eclipse Public License).
+    The current license (MPL, Mozilla Public License) will stay.
+    Current users are not affected because they can keep MPL. 
+    EPL is very similar to MPL, the only bigger difference is related to patents
+    (EPL is a bit more business friendly in this regard).
+    See also http://opensource.org/licenses/eclipse-1.0.php,
+    http://www.eclipse.org/legal/eplfaq.php (FAQ),
+    http://blogs.zdnet.com/Burnette/?p=131
+</li><li>The ConvertTraceFile tool now generates SQL statement statistics.
+</li><li>New system property h2.enableAnonymousSSL (default: true).
+</li><li>The precision if SUBSTR is now calculated if possible.    
+</li><li>The autocomplete in the H2 Console has been improved a bit.
+</li><li>The tools in the H2 Console are now translatable.
+</li><li>The servlet and lucene jar files are now automatically downloaded when building.
+</li><li>The code switch tool has been replaced by a simpler tool. 
+</li><li>Started to write a Ant replacement (''JAnt'') that uses pure Java 
+    build definitions.Future plan: support creating custom h2 
+    distributions (for embedded use). Maybe create a new project ''Jant''
+    or ''Javen'' if other people are interested.
+</li><li>The jar file is now about 10% smaller because the variable debugging info 
+    is no longer included.
+</li><li>Added shell scripts run.sh and build.sh.
+</li><li>The Japanese translation of the error messages and the 
+  H2 Console has been improved. Thanks a lot to Masahiro IKEMOTO. 
+</li><li>Optimization for MIN() and MAX() when using MVCC.
+</li><li>To protect against remote brute force password attacks, 
+    the delay after each unsuccessful login now gets double as long.
+</li><li>The built-in connection pool is not called JdbcConnectionPool. 
+</li><li>Nested joins are now supported (A JOIN B JOIN C ON .. ON ..)
+</li></ul>
+<b>Bugfixes:</b>
+<ul><li>Multi version concurrency (MVCC): when a row was updated, 
+    and the updated column was not indexed, this update was visible sometimes 
+    for other sessions even if it was not committed.
+</li><li>Calling SHUTDOWN on one connection and starting a query on 
+    another connection concurrently could result in a Java level deadlock.
+</li><li>Databases in zip files: large queries are now supported.
+</li><li>Invalid inline views threw confusing SQL exceptions.
+</li><li>After setting the query timeout and then resetting it, the next query
+    would still timeout. Fixed.
+</li><li>Adding a IDENTITY column to a table with data threw a lock timeout.
+</li><li>OutOfMemoryError could occur when using EXISTS or IN(SELECT ..).
+</li></ul>
+For details, see the ''Change Log'' at
+http://www.h2database.com/html/changelog.html
+<br />
+For future plans, see the ''Roadmap'' page at
+http://www.h2database.com/html/roadmap.html
+');
+
 INSERT INTO ITEM VALUES(39,
 'New version available: 1.0.69 (2008-03-29)', '2008-03-29 12:00:00',
 'A new version of H2 is available for <a href="http://www.h2database.com">download</a>.

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -495,4 +495,4 @@ compressibility ext crc enumerate components mkdir jant downloading mismatch
 timebomb thinks technotes chmod overloading javase flux solves fastest 
 quickstarter bridge bpm trust guides improvements customizing easiest 
 workflow seque npl netstat ano spellcheck eplfaq opensource zdnet burnette 
-regard epl
+regard epl huge
\ No newline at end of file