Follow the changes of h2 database

yuu-nkjm · Nov 28, 2023 · 9d60b39 · 9d60b39
1 parent 156e90f
commit 9d60b39
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/sorm4j/src/main/java/org/nkjmlab/sorm4j/util/h2/server/H2WebConsoleServerProperties.java b/sorm4j/src/main/java/org/nkjmlab/sorm4j/util/h2/server/H2WebConsoleServerProperties.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import org.nkjmlab.sorm4j.annotation.Experimental;
 
 /**
@@ -31,8 +32,8 @@ public H2WebConsoleServerProperties build() {
           new ArrayList<>(List.of(javaCommand, "-cp", getH2ClassPath(), "org.h2.tools.Server"));
       args.addAll(List.of("-web", "-webPort", port + ""));
       args.addAll(Arrays.asList(options));
-      args.add("-webAdminPassword");
-      args.add(password);
+      //      args.add("-webAdminPassword");
+      //      args.add(password);
       return new H2WebConsoleServerProperties(
           serverType, port, password, args.toArray(String[]::new));
     }

diff --git a/sorm4j/src/test/java/org/nkjmlab/sorm4j/util/h2/server/H2WebConsoleServerProcessTest.java b/sorm4j/src/test/java/org/nkjmlab/sorm4j/util/h2/server/H2WebConsoleServerProcessTest.java
@@ -7,6 +7,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 class H2WebConsoleServerProcessTest {
+  static final org.apache.logging.log4j.Logger log =
+      org.apache.logging.log4j.LogManager.getLogger();
 
   @Test
   void testAwaitStart() throws StreamReadException, DatabindException, IOException {
@@ -19,6 +21,7 @@ void testAwaitStart() throws StreamReadException, DatabindException, IOException
 
     H2WebConsoleServerProcess server = new H2WebConsoleServerProcess(prop);
     server.awaitStart();
+    log.debug("started");
     ProcessUtils.stopProcessBindingPortIfExists(prop.port);
   }
 }
diff --git a/sorm4j/src/test/java/org/nkjmlab/sorm4j/util/h2/server/h2.tcpsrv.json.sample b/sorm4j/src/test/java/org/nkjmlab/sorm4j/util/h2/server/h2.tcpsrv.json.sample
@@ -1,5 +1,5 @@
 {
   "password": "password",
   "port": 65432,
-  "h2ClassPath": "~/tmp/h2/h2-2.1.214.jar"
+  "h2ClassPath": "~/.m2/repository/com/h2database/h2/2.2.224/h2-2.2.224.jar"
  }
diff --git a/sorm4j/src/test/java/org/nkjmlab/sorm4j/util/h2/server/h2.webcon.json.sample b/sorm4j/src/test/java/org/nkjmlab/sorm4j/util/h2/server/h2.webcon.json.sample
@@ -1,5 +1,4 @@
 {
-  "password": "password",
   "port": 65431,
-  "h2ClassPath": "~/tmp/h2/h2-2.1.214.jar"
+  "h2ClassPath": "~/.m2/repository/com/h2database/h2/2.2.224/h2-2.2.224.jar"
  }