--no commit message

--no commit message

h2/src/docsrc/html/links.html

@@ -328,6 +328,11 @@ SemanticWeb-Middleware. It supports all W3C Semantic Web recommendations:
 OWL, RDF, RDFS, SPARQL, and F-Logic.
 </p>
 
+<p><a href="http://www.openanzo.org">
+Open Anzo </a><br />
+Semantic Application Server.
+</p>
+
 <p><a href="http://www.orionserver.com/">
 Orion</a><br />
 J2EE Application Server.

h2/src/docsrc/text/_docs_en.utf8.txt

@@ -5282,153 +5282,159 @@ Ontoprise OntoBroker
 SemanticWeb-Middleware. It supports all W3C Semantic Web recommendations: OWL, RDF, RDFS, SPARQL, and F-Logic.
 
 @links_1122_a
-Orion
+Open Anzo
 
 @links_1123_p
-J2EE Application Server.
+Semantic Application Server.
 
 @links_1124_a
-P5H2
+Orion
 
 @links_1125_p
-A library for the <a href="http://www.processing.org">Processing</a> programming language and environment.
+J2EE Application Server.
 
 @links_1126_a
-Phase-6
+P5H2
 
 @links_1127_p
-A computer based learning software.
+A library for the <a href="http://www.processing.org">Processing</a> programming language and environment.
 
 @links_1128_a
-Pickle
+Phase-6
 
 @links_1129_p
-Pickle is a Java library containing classes for persistence, concurrency, and logging.
+A computer based learning software.
 
 @links_1130_a
-Piman
+Pickle
 
 @links_1131_p
-Water treatment projects data management.
+Pickle is a Java library containing classes for persistence, concurrency, and logging.
 
 @links_1132_a
-PolePosition
+Piman
 
 @links_1133_p
-Open source database benchmark.
+Water treatment projects data management.
 
 @links_1134_a
-Poormans
+PolePosition
 
 @links_1135_p
-Very basic CMS running as a SWT application and generating static html pages.
+Open source database benchmark.
 
 @links_1136_a
-Railo
+Poormans
 
 @links_1137_p
-Railo is an alternative engine for the Cold Fusion Markup Language, that compiles code programmed in CFML into Java bytecode and executes it on a servlet engine.
+Very basic CMS running as a SWT application and generating static html pages.
 
 @links_1138_a
-Razuna
+Railo
 
 @links_1139_p
-Open source Digital Asset Management System with integrated Web Content Management.
+Railo is an alternative engine for the Cold Fusion Markup Language, that compiles code programmed in CFML into Java bytecode and executes it on a servlet engine.
 
 @links_1140_a
-Rutema
+Razuna
 
 @links_1141_p
-Rutema is a test execution and management tool for heterogeneous development environments written in Ruby.
+Open source Digital Asset Management System with integrated Web Content Management.
 
 @links_1142_a
-Sava
+Rutema
 
 @links_1143_p
-Open-source web-based content management system.
+Rutema is a test execution and management tool for heterogeneous development environments written in Ruby.
 
 @links_1144_a
-Scriptella
+Sava
 
 @links_1145_p
-ETL (Extract-Transform-Load) and script execution tool.
+Open-source web-based content management system.
 
 @links_1146_a
-Sesar
+Scriptella
 
 @links_1147_p
-Dependency Injection Container with Aspect Oriented Programming.
+ETL (Extract-Transform-Load) and script execution tool.
 
 @links_1148_a
-SemmleCode
+Sesar
 
 @links_1149_p
-Eclipse plugin to help you improve software quality.
+Dependency Injection Container with Aspect Oriented Programming.
 
 @links_1150_a
-Shellbook
+SemmleCode
 
 @links_1151_p
-Desktop publishing application.
+Eclipse plugin to help you improve software quality.
 
 @links_1152_a
-Signsoft intelliBO
+Shellbook
 
 @links_1153_p
-Persistence middleware supporting the JDO specification.
+Desktop publishing application.
 
 @links_1154_a
-SmartFoxServer
+Signsoft intelliBO
 
 @links_1155_p
-Platform for developing multiuser applications and games with Macromedia Flash.
+Persistence middleware supporting the JDO specification.
 
 @links_1156_a
-StorYBook
+SmartFoxServer
 
 @links_1157_p
-A summary-based tool for novelist and script writers. It helps to keep the overview over the various traces a story has.
+Platform for developing multiuser applications and games with Macromedia Flash.
 
 @links_1158_a
-StreamCruncher
+StorYBook
 
 @links_1159_p
-Event (stream) processing kernel.
+A summary-based tool for novelist and script writers. It helps to keep the overview over the various traces a story has.
 
 @links_1160_a
-Tamava
+StreamCruncher
 
 @links_1161_p
-Newsgroups Reader.
+Event (stream) processing kernel.
 
 @links_1162_a
-Tune Backup
+Tamava
 
 @links_1163_p
-Easy-to-use backup solution for your iTunes library.
+Newsgroups Reader.
 
 @links_1164_a
-weblica
+Tune Backup
 
 @links_1165_p
-Desktop CMS.
+Easy-to-use backup solution for your iTunes library.
 
 @links_1166_a
-Web of Web
+weblica
 
 @links_1167_p
-Collaborative and realtime interactive media platform for the web.
+Desktop CMS.
 
 @links_1168_a
-Werkzeugkasten
+Web of Web
 
 @links_1169_p
-Minimum Java Toolset.
+Collaborative and realtime interactive media platform for the web.
 
 @links_1170_a
-Volunteer database
+Werkzeugkasten
 
 @links_1171_p
+Minimum Java Toolset.
+
+@links_1172_a
+Volunteer database
+
+@links_1173_p
 A database front end to register volunteers, partnership and donation for a Non Profit organization.
 
 @mainWeb_1000_h1

h2/src/docsrc/text/_docs_ja.utf8.txt

@@ -5284,153 +5284,159 @@ Sourceファイル
 #SemanticWeb-Middleware. It supports all W3C Semantic Web recommendations: OWL, RDF, RDFS, SPARQL, and F-Logic.
 
 @links_1122_a
-#Orion
+#Open Anzo
 
 @links_1123_p
-#J2EE Application Server.
+#Semantic Application Server.
 
 @links_1124_a
-#P5H2
+#Orion
 
 @links_1125_p
-#A library for the <a href="http://www.processing.org">Processing</a> programming language and environment.
+#J2EE Application Server.
 
 @links_1126_a
-#Phase-6
+#P5H2
 
 @links_1127_p
-#A computer based learning software.
+#A library for the <a href="http://www.processing.org">Processing</a> programming language and environment.
 
 @links_1128_a
-#Pickle
+#Phase-6
 
 @links_1129_p
-#Pickle is a Java library containing classes for persistence, concurrency, and logging.
+#A computer based learning software.
 
 @links_1130_a
-#Piman
+#Pickle
 
 @links_1131_p
-#Water treatment projects data management.
+#Pickle is a Java library containing classes for persistence, concurrency, and logging.
 
 @links_1132_a
-#PolePosition
+#Piman
 
 @links_1133_p
-#Open source database benchmark.
+#Water treatment projects data management.
 
 @links_1134_a
-#Poormans
+#PolePosition
 
 @links_1135_p
-#Very basic CMS running as a SWT application and generating static html pages.
+#Open source database benchmark.
 
 @links_1136_a
-#Railo
+#Poormans
 
 @links_1137_p
-#Railo is an alternative engine for the Cold Fusion Markup Language, that compiles code programmed in CFML into Java bytecode and executes it on a servlet engine.
+#Very basic CMS running as a SWT application and generating static html pages.
 
 @links_1138_a
-#Razuna
+#Railo
 
 @links_1139_p
-#Open source Digital Asset Management System with integrated Web Content Management.
+#Railo is an alternative engine for the Cold Fusion Markup Language, that compiles code programmed in CFML into Java bytecode and executes it on a servlet engine.
 
 @links_1140_a
-#Rutema
+#Razuna
 
 @links_1141_p
-#Rutema is a test execution and management tool for heterogeneous development environments written in Ruby.
+#Open source Digital Asset Management System with integrated Web Content Management.
 
 @links_1142_a
-#Sava
+#Rutema
 
 @links_1143_p
-#Open-source web-based content management system.
+#Rutema is a test execution and management tool for heterogeneous development environments written in Ruby.
 
 @links_1144_a
-#Scriptella
+#Sava
 
 @links_1145_p
-#ETL (Extract-Transform-Load) and script execution tool.
+#Open-source web-based content management system.
 
 @links_1146_a
-#Sesar
+#Scriptella
 
 @links_1147_p
-#Dependency Injection Container with Aspect Oriented Programming.
+#ETL (Extract-Transform-Load) and script execution tool.
 
 @links_1148_a
-#SemmleCode
+#Sesar
 
 @links_1149_p
-#Eclipse plugin to help you improve software quality.
+#Dependency Injection Container with Aspect Oriented Programming.
 
 @links_1150_a
-#Shellbook
+#SemmleCode
 
 @links_1151_p
-#Desktop publishing application.
+#Eclipse plugin to help you improve software quality.
 
 @links_1152_a
-#Signsoft intelliBO
+#Shellbook
 
 @links_1153_p
-#Persistence middleware supporting the JDO specification.
+#Desktop publishing application.
 
 @links_1154_a
-#SmartFoxServer
+#Signsoft intelliBO
 
 @links_1155_p
-#Platform for developing multiuser applications and games with Macromedia Flash.
+#Persistence middleware supporting the JDO specification.
 
 @links_1156_a
-#StorYBook
+#SmartFoxServer
 
 @links_1157_p
-#A summary-based tool for novelist and script writers. It helps to keep the overview over the various traces a story has.
+#Platform for developing multiuser applications and games with Macromedia Flash.
 
 @links_1158_a
-#StreamCruncher
+#StorYBook
 
 @links_1159_p
-#Event (stream) processing kernel.
+#A summary-based tool for novelist and script writers. It helps to keep the overview over the various traces a story has.
 
 @links_1160_a
-#Tamava
+#StreamCruncher
 
 @links_1161_p
-#Newsgroups Reader.
+#Event (stream) processing kernel.
 
 @links_1162_a
-#Tune Backup
+#Tamava
 
 @links_1163_p
-#Easy-to-use backup solution for your iTunes library.
+#Newsgroups Reader.
 
 @links_1164_a
-#weblica
+#Tune Backup
 
 @links_1165_p
-#Desktop CMS.
+#Easy-to-use backup solution for your iTunes library.
 
 @links_1166_a
-#Web of Web
+#weblica
 
 @links_1167_p
-#Collaborative and realtime interactive media platform for the web.
+#Desktop CMS.
 
 @links_1168_a
-#Werkzeugkasten
+#Web of Web
 
 @links_1169_p
-#Minimum Java Toolset.
+#Collaborative and realtime interactive media platform for the web.
 
 @links_1170_a
-#Volunteer database
+#Werkzeugkasten
 
 @links_1171_p
+#Minimum Java Toolset.
+
+@links_1172_a
+#Volunteer database
+
+@links_1173_p
 #A database front end to register volunteers, partnership and donation for a Non Profit organization.
 
 @mainWeb_1000_h1

h2/src/docsrc/textbase/_docs_en.properties

@@ -1759,56 +1759,58 @@ links_1118_a=Ontology Works
 links_1119_p=This company provides semantic technologies including deductive information repositories (the Ontology Works Knowledge Servers), semantic information fusion and semantic federation of legacy databases, ontology-based domain modeling, and management of the distributed enterprise.
 links_1120_a=Ontoprise OntoBroker
 links_1121_p=SemanticWeb-Middleware. It supports all W3C Semantic Web recommendations\: OWL, RDF, RDFS, SPARQL, and F-Logic.
-links_1122_a=Orion
-links_1123_p=J2EE Application Server.
-links_1124_a=P5H2
-links_1125_p=A library for the <a href\="http\://www.processing.org">Processing</a> programming language and environment.
-links_1126_a=Phase-6
-links_1127_p=A computer based learning software.
-links_1128_a=Pickle
-links_1129_p=Pickle is a Java library containing classes for persistence, concurrency, and logging.
-links_1130_a=Piman
-links_1131_p=Water treatment projects data management.
-links_1132_a=PolePosition
-links_1133_p=Open source database benchmark.
-links_1134_a=Poormans
-links_1135_p=Very basic CMS running as a SWT application and generating static html pages.
-links_1136_a=Railo
-links_1137_p=Railo is an alternative engine for the Cold Fusion Markup Language, that compiles code programmed in CFML into Java bytecode and executes it on a servlet engine.
-links_1138_a=Razuna
-links_1139_p=Open source Digital Asset Management System with integrated Web Content Management.
-links_1140_a=Rutema
-links_1141_p=Rutema is a test execution and management tool for heterogeneous development environments written in Ruby.
-links_1142_a=Sava
-links_1143_p=Open-source web-based content management system.
-links_1144_a=Scriptella
-links_1145_p=ETL (Extract-Transform-Load) and script execution tool.
-links_1146_a=Sesar
-links_1147_p=Dependency Injection Container with Aspect Oriented Programming.
-links_1148_a=SemmleCode
-links_1149_p=Eclipse plugin to help you improve software quality.
-links_1150_a=Shellbook
-links_1151_p=Desktop publishing application.
-links_1152_a=Signsoft intelliBO
-links_1153_p=Persistence middleware supporting the JDO specification.
-links_1154_a=SmartFoxServer
-links_1155_p=Platform for developing multiuser applications and games with Macromedia Flash.
-links_1156_a=StorYBook
-links_1157_p=A summary-based tool for novelist and script writers. It helps to keep the overview over the various traces a story has.
-links_1158_a=StreamCruncher
-links_1159_p=Event (stream) processing kernel.
-links_1160_a=Tamava
-links_1161_p=Newsgroups Reader.
-links_1162_a=Tune Backup
-links_1163_p=Easy-to-use backup solution for your iTunes library.
-links_1164_a=weblica
-links_1165_p=Desktop CMS.
-links_1166_a=Web of Web
-links_1167_p=Collaborative and realtime interactive media platform for the web.
-links_1168_a=Werkzeugkasten
-links_1169_p=Minimum Java Toolset.
-links_1170_a=Volunteer database
-links_1171_p=A database front end to register volunteers, partnership and donation for a Non Profit organization.
+links_1122_a=Open Anzo
+links_1123_p=Semantic Application Server.
+links_1124_a=Orion
+links_1125_p=J2EE Application Server.
+links_1126_a=P5H2
+links_1127_p=A library for the <a href\="http\://www.processing.org">Processing</a> programming language and environment.
+links_1128_a=Phase-6
+links_1129_p=A computer based learning software.
+links_1130_a=Pickle
+links_1131_p=Pickle is a Java library containing classes for persistence, concurrency, and logging.
+links_1132_a=Piman
+links_1133_p=Water treatment projects data management.
+links_1134_a=PolePosition
+links_1135_p=Open source database benchmark.
+links_1136_a=Poormans
+links_1137_p=Very basic CMS running as a SWT application and generating static html pages.
+links_1138_a=Railo
+links_1139_p=Railo is an alternative engine for the Cold Fusion Markup Language, that compiles code programmed in CFML into Java bytecode and executes it on a servlet engine.
+links_1140_a=Razuna
+links_1141_p=Open source Digital Asset Management System with integrated Web Content Management.
+links_1142_a=Rutema
+links_1143_p=Rutema is a test execution and management tool for heterogeneous development environments written in Ruby.
+links_1144_a=Sava
+links_1145_p=Open-source web-based content management system.
+links_1146_a=Scriptella
+links_1147_p=ETL (Extract-Transform-Load) and script execution tool.
+links_1148_a=Sesar
+links_1149_p=Dependency Injection Container with Aspect Oriented Programming.
+links_1150_a=SemmleCode
+links_1151_p=Eclipse plugin to help you improve software quality.
+links_1152_a=Shellbook
+links_1153_p=Desktop publishing application.
+links_1154_a=Signsoft intelliBO
+links_1155_p=Persistence middleware supporting the JDO specification.
+links_1156_a=SmartFoxServer
+links_1157_p=Platform for developing multiuser applications and games with Macromedia Flash.
+links_1158_a=StorYBook
+links_1159_p=A summary-based tool for novelist and script writers. It helps to keep the overview over the various traces a story has.
+links_1160_a=StreamCruncher
+links_1161_p=Event (stream) processing kernel.
+links_1162_a=Tamava
+links_1163_p=Newsgroups Reader.
+links_1164_a=Tune Backup
+links_1165_p=Easy-to-use backup solution for your iTunes library.
+links_1166_a=weblica
+links_1167_p=Desktop CMS.
+links_1168_a=Web of Web
+links_1169_p=Collaborative and realtime interactive media platform for the web.
+links_1170_a=Werkzeugkasten
+links_1171_p=Minimum Java Toolset.
+links_1172_a=Volunteer database
+links_1173_p=A database front end to register volunteers, partnership and donation for a Non Profit organization.
 mainWeb_1000_h1=H2 Database Engine
 mainWeb_1001_p=Welcome to H2, the Java SQL database. The main feature of H2 are\:
 mainWeb_1002_li=Very fast, free for everybody, source code is included

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

@@ -296,6 +296,8 @@ public class SessionRemote implements SessionInterface, DataHandler {
             ci.setProperty("CLUSTER", serverList);
         }
         autoReconnect = Boolean.valueOf(ci.getProperty("AUTO_RECONNECT", "false")).booleanValue();
+        // AUTO_SERVER implies AUTO_RECONNECT
+        autoReconnect |= Boolean.valueOf(ci.getProperty("AUTO_SERVER", "false")).booleanValue();
         if (autoReconnect && serverList != null) {
             throw Message.getSQLException(ErrorCode.FEATURE_NOT_SUPPORTED);
         }

h2/src/test/org/h2/test/TestAll.java

@@ -276,43 +276,37 @@ java org.h2.test.TestAll timer
 
 /*
 
-Open Anzo 
-http://www.openanzo.org
-Semantic Application Server
+extend server protocol to keep stuff on client 
+(temporary linked tables, variables; identity)
 
 H2 Dialect for TopLink
 http://www.marciowb.net/blog/2008/08/quickly-using-h2-database-with
 
 osgi (derby, hsqldb)
 
-private=true
-
 auto_reconnect
 implemented:
+- auto_server includes auto_reconnect
 - works with server mode
 - works with auto_server mode
-- use the same property name as in MySQL (reconnect?)
 - statements
 - prepared statements
 - small result sets (up to fetch size)
 - throws an error when autocommit is false
+- an error is thrown when the connection is lost 
+  while looping over large result sets (larger than fetch size)
 untested:
 - batch updates
-- throw error for large result sets
 - throw error in cluster mode
 - ignored in embedded mode
-- server mode, embedded (ignored)
-not implemented
-- temporary linked tables
-- temporary tables
-- variables
-- in cluster mode (error)
-- identity, getGeneratedKeys
+not implemented / not tested
+- keep temporary linked tables, variables on client
+- keep temporary tables (including data) on client
+- keep identity, getGeneratedKeys on client
+- throw error when in cluster mode
 
 check all version(s) before the release
 
-Patch.zip
-
 document url parameter auto_server
 document url parameter auto_reconnect
 document url parameter private
@@ -320,8 +314,6 @@ document url parameter private
 Add version number. Install directory: h2-1.1, jar file: h2-1.1.100.jar. 
 Micro version: use build number, staring with 1.1.100
 
-test on linux
-
 TestMVCC:
 Concurrent update in table test: another transaction has updated or 
 deleted the same row when exactly does it occur in other databases 

h2/src/test/org/h2/test/server/TestAutoReconnect.java

@@ -58,7 +58,7 @@ public class TestAutoReconnect extends TestBase {
         deleteDb("autoReconnect");
         if (autoServer) {
             url = "jdbc:h2:" + baseDir + "/autoReconnect;" + 
-                "FILE_LOCK=SOCKET;AUTO_RECONNECT=TRUE;" + 
+                "FILE_LOCK=SOCKET;" + 
                 "AUTO_SERVER=TRUE;OPEN_NEW=TRUE";
             restart();
         } else {

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

@@ -562,3 +562,4 @@ monitoring razuna asset drag pekar devx dmitry fragments onmouseup nav
 onmousedown olap valign army blitz backgammon knife abbreviate berger dhuse 
 strictly greg germany abbreviates frontends cleversafe payload cloneable 
 scripting jaks reconnected serverlist safes somewhere anzo war contacts helpful
+implies looping