New system property h2.browser to set the browser to use.

To start the browser, java.awt.Desktop.browse is now used if available.

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,8 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>-
+<ul><li>New system property h2.browser to set the browser to use.
+</li><li>To start the browser, java.awt.Desktop.browse is now used if available.
 </li></ul>
 
 <h2>Version 1.1.102 (2008-10-24)</h2>

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

@@ -104,6 +104,12 @@ public class SysProperties {
      */
     public static final String ALLOWED_CLASSES = getStringSetting("h2.allowedClasses", "*");
 
+    /**
+     * System property <code>h2.browser</code> (default: null).<br />
+     * The preferred browser to use. If not set, the default browser is used.
+     */
+    public static final String BROWSER = getStringSetting("h2.browser", null);
+
     /**
      * System property <code>h2.enableAnonymousSSL</code> (default: true).<br />
      * When using SSL connection, the anonymous cipher suite

h2/src/main/org/h2/util/StartBrowser.java

@@ -7,6 +7,7 @@
 package org.h2.util;
 
 import java.io.IOException;
+import java.net.URI;
 
 import org.h2.constant.SysProperties;
 
@@ -28,6 +29,36 @@ public class StartBrowser {
         String osName = SysProperties.getStringSetting("os.name", "linux").toLowerCase();
         Runtime rt = Runtime.getRuntime();
         try {
+            String browser = SysProperties.BROWSER;
+            if (browser != null) {
+                if (osName.indexOf("windows") >= 0) {
+                    rt.exec(new String[] { "cmd.exe", "/C",  browser, url });
+                } else {
+                    rt.exec(new String[] { browser, url });
+                }
+                return;
+            }
+            
+            try {
+                Class desktopClass = Class.forName("java.awt.Desktop");
+                // Desktop.isDesktopSupported()
+                Boolean supported = (Boolean) desktopClass.
+                    getMethod("isDesktopSupported", new Class[0]).
+                    invoke(null, new Object[0]);
+                URI uri = new URI(url);
+                if (supported.booleanValue()) {
+                    // Desktop.getDesktop();
+                    Object desktop = desktopClass.getMethod("getDesktop", new Class[0]).
+                        invoke(null, new Object[0]);
+                    // desktop.browse(uri);
+                    desktopClass.getMethod("browse", new Class[] { URI.class }).
+                        invoke(desktop, new Object[] { uri });
+                    return;
+                }
+            } catch (Exception e) {
+                // ignore
+            }
+            
             if (osName.indexOf("windows") >= 0) {
                 rt.exec(new String[] { "rundll32", "url.dll,FileProtocolHandler", url });
             } else if (osName.indexOf("mac") >= 0) {