Servers can now be started as a daemon thread.

h2/src/main/org/h2/res/javadoc.properties

@@ -3,7 +3,7 @@ org.h2.tools.Backup.main=Options are case sensitive. Supported options are\:\n[-
 org.h2.tools.ChangeFileEncryption=Allows changing the database file encryption password or algorithm.\nThis tool can not be used to change a password of a user.\n The database must be closed before using this tool.
 org.h2.tools.ChangeFileEncryption.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]   Print the list of options\n[-cipher type]    The encryption type (AES or XTEA)\n[-dir <dir>]      The database directory (default\: .)\n[-db <database>]  Database name (all databases if not set)\n[-decrypt <pwd>]  The decryption password (if not set\: not yet encrypted)\n[-encrypt <pwd>]  The encryption password (if not set\: do not encrypt)\n[-quiet]          Do not print progress information
 org.h2.tools.Console=Starts the H2 Console (web-) server, as well as the TCP and PG server.
-org.h2.tools.Console.main=When running without options, -tcp, -web, -browser and -pg are started.\nOptions are case sensitive. Supported options are\:\n[-help] or [-?]  Print the list of options\n[-web]           Start the web server with the H2 Console\n[-tool]          Start the icon or window that allows to start a browser\n[-browser]       Start a browser and open a page to connect to the web server\n[-tcp]           Start the TCP server\n[-pg]            Start the PG server\nFor each Server, additional options are available;\n for details, see the Server tool.\nIf a service can not be started, the program\n terminates with an exit code of 1.
+org.h2.tools.Console.main=When running without options, -tcp, -web, -browser and -pg are started.\nOptions are case sensitive. Supported options are\:\n[-help] or [-?]  Print the list of options\n[-web]           Start the web server with the H2 Console\n[-tool]          Start the icon or window that allows to start a browser\n[-browser]       Start a browser connecting to the web server\n[-tcp]           Start the TCP server\n[-pg]            Start the PG server\nFor each Server, additional options are available;\n for details, see the Server tool.\nIf a service can not be started, the program\n terminates with an exit code of 1.
 org.h2.tools.ConvertTraceFile=Converts a .trace.db file to a SQL script and Java source code.\nSQL statement statistics are listed as well.
 org.h2.tools.ConvertTraceFile.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]      Print the list of options\n[-traceFile <file>]  The trace file name (default\: test.trace.db)\n[-script <file>]     The script file name (default\: test.sql)\n[-javaClass <file>]  The Java directory and class file name (default\: Test)
 org.h2.tools.CreateCluster=Creates a cluster from a standalone database.\nCopies a database to another location if required.
@@ -19,6 +19,6 @@ org.h2.tools.RunScript.main=Options are case sensitive. Supported options are\:\
 org.h2.tools.Script=Creates a SQL script file by extracting the schema and data of a database.
 org.h2.tools.Script.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url "<url>"]     The database URL (jdbc\:...)\n[-user <user>]     The user name (default\: sa)\n[-password <pwd>]  The password\n[-script <file>]   The target script file name (default\: backup.sql)\n[-options ...]     A list of options (only for embedded H2, see RUNSCRIPT)\n[-quiet]           Do not print progress information
 org.h2.tools.Server=Starts the H2 Console (web-) server, TCP, and PG server.
-org.h2.tools.Server.main=When running without options, -tcp, -web, -browser and -pg are started.\nOptions are case sensitive. Supported options are\:\n[-help] or [-?]         Print the list of options\n[-web]                  Start the web server with the H2 Console\n[-webAllowOthers]       Allow other computers to connect - see below\n[-webPort <port>]       The port (default\: 8082)\n[-webSSL]               Use encrypted (HTTPS) connections\n[-browser]              Start a browser and open a page to connect to the web server\n[-tcp]                  Start the TCP server\n[-tcpAllowOthers]       Allow other computers to connect - see below\n[-tcpPort <port>]       The port (default\: 9092)\n[-tcpSSL]               Use encrypted (SSL) connections\n[-tcpPassword <pwd>]    The password for shutting down a TCP server\n[-tcpShutdown "<url>"]  Stop the TCP server; example\: tcp\://localhost\:9094\n[-tcpShutdownForce]     Do not wait until all connections are closed\n[-pg]                   Start the PG server\n[-pgAllowOthers]        Allow other computers to connect - see below\n[-pgPort <port>]        The port (default\: 5435)\n[-baseDir <dir>]        The base directory for H2 databases; for all servers\n[-ifExists]             Only existing databases may be opened; for all servers\n[-trace]                Print additional trace information; for all servers\nThe options -xAllowOthers are potentially risky.\nFor details, see Advanced Topics / Protection against Remote Access.
+org.h2.tools.Server.main=When running without options, -tcp, -web, -browser and -pg are started.\nOptions are case sensitive. Supported options are\:\n[-help] or [-?]         Print the list of options\n[-web]                  Start the web server with the H2 Console\n[-webAllowOthers]       Allow other computers to connect - see below\n[-webDaemon]            Use a daemon thread\n[-webPort <port>]       The port (default\: 8082)\n[-webSSL]               Use encrypted (HTTPS) connections\n[-browser]              Start a browser connecting to the web server\n[-tcp]                  Start the TCP server\n[-tcpAllowOthers]       Allow other computers to connect - see below\n[-tcpDaemon]            Use a daemon thread\n[-tcpPort <port>]       The port (default\: 9092)\n[-tcpSSL]               Use encrypted (SSL) connections\n[-tcpPassword <pwd>]    The password for shutting down a TCP server\n[-tcpShutdown "<url>"]  Stop the TCP server; example\: tcp\://localhost\n[-tcpShutdownForce]     Do not wait until all connections are closed\n[-pg]                   Start the PG server\n[-pgAllowOthers]        Allow other computers to connect - see below\n[-pgDaemon]             Use a daemon thread\n[-pgPort <port>]        The port (default\: 5435)\n[-baseDir <dir>]        The base directory for H2 databases (all servers)\n[-ifExists]             Only existing databases may be opened (all servers)\n[-trace]                Print additional trace information (all servers)\nThe options -xAllowOthers are potentially risky.\nFor details, see Advanced Topics / Protection against Remote Access.
 org.h2.tools.Shell=Interactive command line tool to access a database using JDBC.
 org.h2.tools.Shell.main=Options are case sensitive. Supported options are\:\n[-help] or [-?]    Print the list of options\n[-url "<url>"]     The database URL (jdbc\:h2\:...)\n[-user <user>]     The user name\n[-password <pwd>]  The password\n[-driver <class>]  The JDBC driver class to use (not required in most cases)\nIf special characters don't work as expected, you may need to use\n -Dfile.encoding\=UTF-8 (Mac OS X) or CP850 (Windows).

h2/src/main/org/h2/server/Service.java

@@ -83,4 +83,11 @@ public interface Service {
      */
     int getPort();
 
+    /**
+     * Check if a daemon thread should be used.
+     *
+     * @return true if a daemon thread should be used
+     */
+    boolean isDaemon();
+
 }

h2/src/main/org/h2/server/TcpServer.java

@@ -59,6 +59,7 @@ public class TcpServer implements Service {
     private Set<TcpServerThread> running = Collections.synchronizedSet(new HashSet<TcpServerThread>());
     private String baseDir;
     private boolean allowOthers;
+    private boolean isDaemon;
     private boolean ifExists;
     private Connection managementDb;
     private PreparedStatement managementDbAdd;
@@ -161,6 +162,8 @@ public class TcpServer implements Service {
                 keyDatabase = args[++i];
             } else if ("-tcpAllowOthers".equals(a)) {
                 allowOthers = true;
+            } else if ("-tcpDaemon".equals(a)) {
+                isDaemon = true;
             } else if ("-ifExists".equals(a)) {
                 ifExists = true;
             }
@@ -211,6 +214,7 @@ public class TcpServer implements Service {
                 TcpServerThread c = new TcpServerThread(s, this, nextThreadId++);
                 running.add(c);
                 Thread thread = new Thread(c);
+                thread.setDaemon(isDaemon);
                 thread.setName(threadName + " thread");
                 c.setThread(thread);
                 thread.start();
@@ -455,4 +459,8 @@ public class TcpServer implements Service {
         throw DbException.get(ErrorCode.WRONG_USER_OR_PASSWORD);
     }
 
+    public boolean isDaemon() {
+        return isDaemon;
+    }
+
 }

h2/src/main/org/h2/server/pg/PgServer.java

@@ -72,6 +72,7 @@ public class PgServer implements Service {
     private Set<PgServerThread> running = Collections.synchronizedSet(new HashSet<PgServerThread>());
     private String baseDir;
     private boolean allowOthers;
+    private boolean isDaemon;
     private boolean ifExists;
 
     public void init(String... args) {
@@ -86,6 +87,8 @@ public class PgServer implements Service {
                 baseDir = args[++i];
             } else if ("-pgAllowOthers".equals(a)) {
                 allowOthers = true;
+            } else if ("-pgDaemon".equals(a)) {
+                isDaemon = true;
             } else if ("-ifExists".equals(a)) {
                 ifExists = true;
             }
@@ -167,6 +170,7 @@ public class PgServer implements Service {
                     running.add(c);
                     c.setProcessId(running.size());
                     Thread thread = new Thread(c);
+                    thread.setDaemon(isDaemon);
                     thread.setName(threadName+" thread");
                     c.setThread(thread);
                     thread.start();
@@ -450,4 +454,8 @@ public class PgServer implements Service {
         }
     }
 
+    public boolean isDaemon() {
+        return isDaemon;
+    }
+
 }

h2/src/main/org/h2/server/web/WebServer.java

@@ -109,6 +109,7 @@ public class WebServer implements Service {
     // private URLClassLoader urlClassLoader;
     private int port;
     private boolean allowOthers;
+    private boolean isDaemon;
     private Set<WebThread> running = Collections.synchronizedSet(new HashSet<WebThread>());
     private boolean ssl;
     private HashMap<String, ConnectionInfo> connInfoMap = New.hashMap();
@@ -227,6 +228,8 @@ public class WebServer implements Service {
                 ssl = true;
             } else if ("-webAllowOthers".equals(a)) {
                 allowOthers = true;
+            } else if ("-webDaemon".equals(a)) {
+                isDaemon = true;
             } else if ("-baseDir".equals(a)) {
                 String baseDir = args[++i];
                 SysProperties.setBaseDir(baseDir);
@@ -691,4 +694,8 @@ public class WebServer implements Service {
         return translateThread.getFileName();
     }
 
+    public boolean isDaemon() {
+        return isDaemon;
+    }
+
 }

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

@@ -69,7 +69,7 @@ ShutdownHandler {
      * <tr><td>[-tool]</td>
      * <td>Start the icon or window that allows to start a browser</td></tr>
      * <tr><td>[-browser]</td>
-     * <td>Start a browser and open a page to connect to the web server</td></tr>
+     * <td>Start a browser connecting to the web server</td></tr>
      * <tr><td>[-tcp]</td>
      * <td>Start the TCP server</td></tr>
      * <tr><td>[-pg]</td>

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

@@ -62,16 +62,20 @@ public class Server extends Tool implements Runnable, ShutdownHandler {
      * <td>Start the web server with the H2 Console</td></tr>
      * <tr><td>[-webAllowOthers]</td>
      * <td>Allow other computers to connect - see below</td></tr>
+     * <tr><td>[-webDaemon]</td>
+     * <td>Use a daemon thread</td></tr>
      * <tr><td>[-webPort &lt;port&gt;]</td>
      * <td>The port (default: 8082)</td></tr>
      * <tr><td>[-webSSL]</td>
      * <td>Use encrypted (HTTPS) connections</td></tr>
      * <tr><td>[-browser]</td>
-     * <td>Start a browser and open a page to connect to the web server</td></tr>
+     * <td>Start a browser connecting to the web server</td></tr>
      * <tr><td>[-tcp]</td>
      * <td>Start the TCP server</td></tr>
      * <tr><td>[-tcpAllowOthers]</td>
      * <td>Allow other computers to connect - see below</td></tr>
+     * <tr><td>[-tcpDaemon]</td>
+     * <td>Use a daemon thread</td></tr>
      * <tr><td>[-tcpPort &lt;port&gt;]</td>
      * <td>The port (default: 9092)</td></tr>
      * <tr><td>[-tcpSSL]</td>
@@ -79,21 +83,23 @@ public class Server extends Tool implements Runnable, ShutdownHandler {
      * <tr><td>[-tcpPassword &lt;pwd&gt;]</td>
      * <td>The password for shutting down a TCP server</td></tr>
      * <tr><td>[-tcpShutdown "&lt;url&gt;"]</td>
-     * <td>Stop the TCP server; example: tcp://localhost:9094</td></tr>
+     * <td>Stop the TCP server; example: tcp://localhost</td></tr>
      * <tr><td>[-tcpShutdownForce]</td>
      * <td>Do not wait until all connections are closed</td></tr>
      * <tr><td>[-pg]</td>
      * <td>Start the PG server</td></tr>
      * <tr><td>[-pgAllowOthers]</td>
      * <td>Allow other computers to connect - see below</td></tr>
+     * <tr><td>[-pgDaemon]</td>
+     * <td>Use a daemon thread</td></tr>
      * <tr><td>[-pgPort &lt;port&gt;]</td>
      * <td>The port (default: 5435)</td></tr>
      * <tr><td>[-baseDir &lt;dir&gt;]</td>
-     * <td>The base directory for H2 databases; for all servers</td></tr>
+     * <td>The base directory for H2 databases (all servers)</td></tr>
      * <tr><td>[-ifExists]</td>
-     * <td>Only existing databases may be opened; for all servers</td></tr>
+     * <td>Only existing databases may be opened (all servers)</td></tr>
      * <tr><td>[-trace]</td>
-     * <td>Print additional trace information; for all servers</td></tr>
+     * <td>Print additional trace information (all servers)</td></tr>
      * </table>
      * The options -xAllowOthers are potentially risky.
      * <br />
@@ -126,6 +132,8 @@ public class Server extends Tool implements Runnable, ShutdownHandler {
                     webStart = true;
                 } else if ("-webAllowOthers".equals(arg)) {
                     // no parameters
+                } else if ("-webDaemon".equals(arg)) {
+                    // no parameters
                 } else if ("-webSSL".equals(arg)) {
                     // no parameters
                 } else if ("-webPort".equals(arg)) {
@@ -144,6 +152,8 @@ public class Server extends Tool implements Runnable, ShutdownHandler {
                     tcpStart = true;
                 } else if ("-tcpAllowOthers".equals(arg)) {
                     // no parameters
+                } else if ("-tcpDaemon".equals(arg)) {
+                    // no parameters
                 } else if ("-tcpSSL".equals(arg)) {
                     // no parameters
                 } else if ("-tcpPort".equals(arg)) {
@@ -165,6 +175,8 @@ public class Server extends Tool implements Runnable, ShutdownHandler {
                     pgStart = true;
                 } else if ("-pgAllowOthers".equals(arg)) {
                     // no parameters
+                } else if ("-pgDaemon".equals(arg)) {
+                    // no parameters
                 } else if ("-pgPort".equals(arg)) {
                     i++;
                 } else {
@@ -329,6 +341,7 @@ public class Server extends Tool implements Runnable, ShutdownHandler {
         try {
             service.start();
             Thread t = new Thread(this);
+            t.setDaemon(service.isDaemon());
             String name = service.getName() + " (" + service.getURL() + ")";
             t.setName(name);
             t.start();

h2/src/tools/org/h2/dev/ftp/server/FtpServer.java

@@ -552,4 +552,8 @@ public class FtpServer extends Tool implements Service {
         return new Server(new FtpServer(), args);
     }
 
+    public boolean isDaemon() {
+        return false;
+    }
+
 }