--no commit message

--no commit message

h2/src/docsrc/html/build.html

@@ -47,14 +47,14 @@ A Java Runtime Environment (JRE) version 1.4 or higher is required to run this d
 To build the database executables, the following software stack was used.
 Newer version or compatible software works too.
 </p>
-<ul><li>Windows XP
-</li><li>Sun JDK Version 1.4 and 1.6
-</li><li>Eclipse Version 3.3
-</li><li>Eclipse Plugins: Subclipse 1.2.4, EclEmma Java Code Coverage 1.3.0, Eclipse Checkstyle Plug-in 4.4.0
+<ul><li>Mac OS X and Windows XP
+</li><li>Sun JDK Version 1.4, 1.5, and 1.6
+</li><li>Eclipse Version 3.4
+</li><li>Eclipse Plugins: Subclipse 1.4.6, EclEmma Java Code Coverage 1.3.0, Eclipse Checkstyle Plug-in 4.4.2
 </li><li>Mozilla Firefox 3.0
 </li><li>OpenOffice 3.0
 </li><li>NSIS 2.38 (Nullsoft Scriptable Install System)
-</li><li>Maven 2.0.7
+</li><li>Maven 2.0.9
 </li><li>YourKit Java Profiler
 </li></ul>
 
@@ -94,6 +94,7 @@ The build system can generate smaller jar files as well. The following targets a
 <ul><li>jarClient: Create the h2client.jar. This only contains the remote JDBC implementation.
 </li><li>jarSmall: Create the file h2small.jar. This only contains the embedded database. Debug information is disabled.
 </li><li>jarJaqu: Create the file h2jaqu.jar. This only contains the JaQu (Java Query) implementation. All other jar files do not include JaQu.
+</li><li>javadocImpl: Create the Javadocs of the implementation.
 </li></ul>
 <p>
 To create the h2client.jar file, go to the directory h2 and execute the following command:
@@ -162,16 +163,20 @@ using <code>build docs</code>.
 <p>
 If you like to provide patches, please consider the following guidelines to simplify merging them:
 </p>
-<ul><li>Only use Java 1.4 features (not use Java 1.5 or 1.6) (see Environment).
+<ul><li>Only use Java 1.4 features (do not use Java 1.5 or 1.6) (see Environment).
 </li><li>Follow the coding style used in the project, use Checkstyle (see above) to check the coding style.
+    The checkstyle configuration is in <code>src/installer/checkstyle.xml</code>.
 </li><li>Please provide test cases and integrate them into the test suite.
-    For Java level tests, see src/test/org/h2/test/TestAll.java.
-    For SQL level tests, see src/test/org/h2/test/test.in.txt or testSimple.in.txt
-</li><li>The test cases should cover at least 90% of the changed/new code; use a code coverage tool to verify that (see above).
-</li><li>Verify that you did not break other features: Run the test cases by executing build test.
-</li><li>Provide end user documentation if required (src/docsrc/html/*).
-</li><li>Document grammar changes in src/main/org/h2/res/help.csv
-</li><li>Provide a change log entry (src/docsrc/html/changelog.html).
+    For Java level tests, see <code>src/test/org/h2/test/TestAll.java</code>.
+    For SQL level tests, see <code>src/test/org/h2/test/test.in.txt</code> or <code>testSimple.in.txt</code>.
+</li><li>The test cases should cover at least 90% of the changed and new code; use a code coverage tool to verify that (see above).
+</li><li>Verify that you did not break other features: Run the test cases by executing <code>build test</code>.
+</li><li>Provide end user documentation if required (<code>src/docsrc/html/*</code>).
+</li><li>Document grammar changes in <code>src/main/org/h2/res/help.csv</code>
+</li><li>Provide a change log entry (<code>src/docsrc/html/changelog.html</code>).
+</li><li>Verify the spelling using <code>build spellcheck</code>. If required
+    add the new words to <code>src/tools/org/h2/build/doc/dictionary.txt</code>.
+</li><li>Verify the formatting using <code>build docs</code> and <code>build javadoc</code>.
 </li><li>Submit patches as .patch files (compressed if big). To create a patch, use for example Eclipse Team/Create Patch.
 </li></ul>
 

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,8 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>The MySQL compatibility extension fromUnixTime now used the English locale.
+<ul><li>Some DatabaseMetaData operations did not work for non-admin users for versions 1.1.x.
+</li><li>The MySQL compatibility extension fromUnixTime now used the English locale.
 </li><li>When using LOG=2 and repeatedly updating the last row rows of a table, the index file grew quickly.
 </li><li>In versions 1.1.105 and 1.1.106, encrypted script files of earlier versions could not be processed.
     This is now again possible. The problem was that such script files were stored in a special format

h2/src/docsrc/html/roadmap.html

@@ -392,6 +392,9 @@ Of course, patches are always welcome, but are not always applied as is. Patches
 </li><li>MySQL compatibility: support INSERT INTO table SET column1 = value1, column2 = value2
 </li><li>Docs: Add a one line description for each functions and SQL statements at the top (in the link section).
 </li><li>Javadoc search: weight for titles should be higher ('random' should list Functions as the best match).
+</li><li>Replace information_schema tables with regular tables that are automatically re-built when needed. Use indexes.
+</li><li>Support a special trigger on all tables.
+</li><li>Delete temporary files or objects using finalize.
 </li></ul>
 
 <h2>Not Planned</h2>

h2/src/main/org/h2/res/help.csv

@@ -964,11 +964,11 @@ SET LOCK_TIMEOUT 1000
 "Commands (Other)","SET LOG","
 SET LOG int
 ","
-Enabled or disables writing to the log file.
+Enabled or disables writing to the transaction log file.
 0: logging is disabled (faster)
 1: logging of the data is enabled, but logging of the index changes is disabled (default)
 2: logging of both data and index changes are enabled
-Logging can be disabled to improve the performance when durability is not important,
+Transaction logging can be disabled to improve the performance when durability is not important,
 for example while running tests or when loading the database.
 Warning: It may not be possible to recover the database if logging is disabled and
 the application terminates abnormally. If logging of index changes is enabled,

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

@@ -277,6 +277,9 @@ java org.h2.test.TestAll timer
         System.setProperty("h2.maxMemoryRowsDistinct", "128");
         System.setProperty("h2.check2", "true");
 
+
+// System.setProperty("h2.pageStore", "true");
+
 /*
 
 update copyright year to 2009 for changed files

h2/src/tools/org/h2/build/BuildBase.java

@@ -159,7 +159,8 @@ public class BuildBase {
         out.println("Targets:");
         for (int i = 0; i < methods.length; i++) {
             Method m = methods[i];
-            if ((m.getModifiers() & Modifier.STATIC) == 0 && m.getParameterTypes().length == 0) {
+            int mod = m.getModifiers();
+            if (!Modifier.isStatic(mod) && Modifier.isPublic(mod) && m.getParameterTypes().length == 0) {
                 out.println(m.getName());
             }
         }

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

@@ -578,4 +578,4 @@ connecturl problematic transformation lazy querydsl squill empire liq fle
 xive evolving mssqlserver eric respond faulhaber fixing northern lying
 federal santa america county clara courts california york venue away stages
 titles headers grew orchestration social razor finder ranging friend intervals
-bot jot delicious rife
+bot jot delicious rife appenders circles spelling