Documentation

h2/src/docsrc/html/advanced.html

@@ -604,6 +604,15 @@ server.stop();
 By default, only connections from localhost are allowed. To allow remote connections, use
 <code>-pgAllowOthers</code> when starting the server.
 </p>
+<p>
+To map an ODBC database name to a different JDBC database name,
+use the option <code>-key</code> when starting the server.
+Please note only one mapping is allowed. The following will map the ODBC database named
+<code>TEST</code> to the database URL <code>jdbc:h2:~/data/test;cipher=aes</code>:
+</p>
+<pre>
+java org.h2.tools.Server -pg -key TEST "~/data/test;cipher=aes"
+</pre>
 
 <h3>ODBC Configuration</h3>
 <p>

h2/src/docsrc/html/changelog.html

@@ -19,9 +19,9 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul><li>To compile user defined functions, the javax.tools.JavaCompiler is now used if available,
-    and no temporary files are created. 
-    This should solve problems when multiple H2 database concurrently compile 
-    the same user defined functions.
+    and no temporary files are created. This should solve problems when 
+    multiple H2 database concurrently compile the same user defined functions.
+    To disable, system the system property "h2.javaSystemCompiler" to false.
 </li><li>Concurrently creating function aliases in different databases
     could result in the exception "javac: file not found".
 </li><li>The function "regexp_replace" threw the wrong kind of exception if the

h2/src/main/org/h2/tools/Server.java

@@ -105,6 +105,8 @@ public class Server extends Tool implements Runnable, ShutdownHandler {
      * <td>Only existing databases may be opened (all servers)</td></tr>
      * <tr><td>[-trace]</td>
      * <td>Print additional trace information (all servers)</td></tr>
+     * <tr><td>[-key &lt;from&gt; &lt;to&gt;]</td>
+     * <td>Allows to map a database name to another (all servers)</td></tr>
      * </table>
      * The options -xAllowOthers are potentially risky.
      * <br />
@@ -595,6 +597,7 @@ public class Server extends Tool implements Runnable, ShutdownHandler {
                 try {
                     browser = System.getenv("BROWSER");
                 } catch (SecurityException se) {
+                    // ignore
                 }
             }
             if (browser != null) {