less borders

but it's somehow not possible to restart jvm after destruction, so it has to be redone anyway

dhfs-parent/.run/Main 2.run.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="Main 2" type="QsApplicationConfigurationType" factoryName="QuarkusApplication">
     <option name="MAIN_CLASS_NAME" value="com.usatiuk.dhfsfuse.Main" />
     <module name="dhfs-fuse" />
-    <option name="VM_PARAMETERS" value="-XX:+UnlockDiagnosticVMOptions -XX:+UseParallelGC -XX:+DebugNonSafepoints --enable-preview --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-exports java.base/jdk.internal.access=ALL-UNNAMED -ea -Xmx512M -Ddhfs.webui.root=$ProjectFileDir$/../webui/dist -Ddhfs.fuse.root=${HOME}/dhfs_test/2/fuse -Ddhfs.objects.persistence.files.root=${HOME}/dhfs_test/2/data -Ddhfs.objects.persistence.stuff.root=${HOME}/dhfs_test/2/data/stuff -Ddhfs.objects.peerdiscovery.broadcast=false -Dquarkus.http.port=9020 -Dquarkus.http.ssl-port=9021 -Ddhfs.peerdiscovery.preset-uuid=22000000-0000-0000-0000-000000000000 -Ddhfs.peerdiscovery.static-peers=11000000-0000-0000-0000-000000000000:127.0.0.1:9010:9011" />
+    <option name="VM_PARAMETERS" value="-XX:+UnlockDiagnosticVMOptions -XX:+UseParallelGC -XX:+DebugNonSafepoints --enable-preview --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-exports java.base/jdk.internal.access=ALL-UNNAMED -ea -Xmx512M -Ddhfs.webui.root=$ProjectFileDir$/../webui/dist -Ddhfs.fuse.root=${HOME}/dhfs_test/2/fuse -Ddhfs.objects.persistence.root=${HOME}/dhfs_test/2/data -Ddhfs.objects.peerdiscovery.broadcast=false -Dquarkus.http.port=9020 -Dquarkus.http.ssl-port=9021 -Ddhfs.peerdiscovery.preset-uuid=22000000-0000-0000-0000-000000000000 -Ddhfs.peerdiscovery.static-peers=11000000-0000-0000-0000-000000000000:127.0.0.1:9010:9011" />
     <extension name="coverage">
       <pattern>
         <option name="PATTERN" value="com.usatiuk.dhfs.remoteobj.*" />

dhfs-parent/.run/Main.run.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="Main" type="QsApplicationConfigurationType" factoryName="QuarkusApplication" nameIsGenerated="true">
     <option name="MAIN_CLASS_NAME" value="com.usatiuk.dhfsfuse.Main" />
     <module name="dhfs-fuse" />
-    <option name="VM_PARAMETERS" value="-XX:+UnlockDiagnosticVMOptions -XX:+UseZGC -XX:+ZGenerational --enable-preview -XX:+DebugNonSafepoints --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-exports java.base/jdk.internal.access=ALL-UNNAMED -ea -Xmx1G -Ddhfs.webui.root=$ProjectFileDir$/../webui/dist -Ddhfs.fuse.root=${HOME}/dhfs_test/1/fuse -Ddhfs.objects.persistence.files.root=${HOME}/dhfs_test/1/data -Ddhfs.objects.persistence.stuff.root=${HOME}/dhfs_test/1/data/stuff -Ddhfs.objects.peerdiscovery.broadcast=true -Dquarkus.http.port=9010 -Dquarkus.http.ssl-port=9011 -Ddhfs.peerdiscovery.preset-uuid=11000000-0000-0000-0000-000000000000 -Ddhfs.peerdiscovery.static-peers=22000000-0000-0000-0000-000000000000:127.0.0.1:9020:9021 -Dquarkus.http.host=0.0.0.0" />
+    <option name="VM_PARAMETERS" value="-XX:+UnlockDiagnosticVMOptions -XX:+UseZGC -XX:+ZGenerational --enable-preview -XX:+DebugNonSafepoints --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-exports java.base/jdk.internal.access=ALL-UNNAMED -ea -Xmx1G -Ddhfs.webui.root=$ProjectFileDir$/../webui/dist -Ddhfs.fuse.root=${HOME}/dhfs_test/1/fuse -Ddhfs.objects.persistence.root=${HOME}/dhfs_test/1/data -Ddhfs.objects.peerdiscovery.broadcast=true -Dquarkus.http.port=9010 -Dquarkus.http.ssl-port=9011 -Ddhfs.peerdiscovery.preset-uuid=11000000-0000-0000-0000-000000000000 -Ddhfs.peerdiscovery.static-peers=22000000-0000-0000-0000-000000000000:127.0.0.1:9020:9021 -Dquarkus.http.host=0.0.0.0" />
     <extension name="coverage">
       <pattern>
         <option name="PATTERN" value="com.usatiuk.dhfs.remoteobj.*" />

dhfs-parent/dhfs-fs/docker-compose.yml

@@ -1,43 +0,0 @@
-version: "3.2"
-
-services:
-  dhfs1:
-    build: .
-    privileged: true
-    devices:
-      - /dev/fuse
-    volumes:
-      - $HOME/dhfs/dhfs1:/dhfs_root
-      - $HOME/dhfs/dhfs1_f:/dhfs_root/fuse:rshared
-      - ./target/quarkus-app:/app
-    command: "java --add-exports java.base/sun.nio.ch=ALL-UNNAMED
-     -Ddhfs.objects.persistence.files.root=/dhfs_root/p 
-     -Ddhfs.objects.root=/dhfs_root/d 
-     -Ddhfs.fuse.root=/dhfs_root/fuse -Dquarkus.http.host=0.0.0.0 
-     -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
-     -jar /app/quarkus-run.jar"
-    ports:
-      - 8080:8080
-      - 8081:8443
-      - 5005:5005
-  dhfs2:
-    build: .
-    privileged: true
-    devices:
-      - /dev/fuse
-    volumes:
-      - $HOME/dhfs/dhfs2:/dhfs_root
-      - $HOME/dhfs/dhfs2_f:/dhfs_root/fuse:rshared
-      - ./target/quarkus-app:/app
-    command: "java --add-exports java.base/sun.nio.ch=ALL-UNNAMED
-     --add-exports java.base/jdk.internal.access=ALL-UNNAMED
-     --add-opens=java.base/java.nio=ALL-UNNAMED
-     -Ddhfs.objects.persistence.files.root=/dhfs_root/p 
-     -Ddhfs.objects.root=/dhfs_root/d 
-     -Ddhfs.fuse.root=/dhfs_root/fuse -Dquarkus.http.host=0.0.0.0
-     -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5010
-     -jar /app/quarkus-run.jar"
-    ports:
-      - 8090:8080
-      - 8091:8443
-      - 5010:5010

dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/TempDataProfile.java

@@ -21,7 +21,7 @@ abstract public class TempDataProfile implements QuarkusTestProfile {
             throw new RuntimeException(e);
         }
         var ret = new HashMap<String, String>();
-        ret.put("dhfs.objects.persistence.files.root", tempDirWithPrefix.resolve("dhfs_root_test").toString());
+        ret.put("dhfs.objects.persistence.root", tempDirWithPrefix.resolve("dhfs_root_test").toString());
         ret.put("dhfs.fuse.root", tempDirWithPrefix.resolve("dhfs_fuse_root_test").toString());
         getConfigOverrides(ret);
         return ret;

dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/TestDataCleaner.java

@@ -15,7 +15,7 @@ import java.util.Objects;
 
 @ApplicationScoped
 public class TestDataCleaner {
-    @ConfigProperty(name = "dhfs.objects.persistence.files.root")
+    @ConfigProperty(name = "dhfs.objects.persistence.root")
     String tempDirectory;
 
     void init(@Observes @Priority(1) StartupEvent event) throws IOException {

dhfs-parent/dhfs-fs/src/test/resources/application.properties

@@ -1,5 +1,4 @@
-dhfs.objects.persistence.files.root=${HOME}/dhfs_data/dhfs_root_test
-dhfs.objects.root=${HOME}/dhfs_data/dhfs_root_d_test
+dhfs.objects.persistence.root=${HOME}/dhfs_data/dhfs_root_test
 dhfs.fuse.root=${HOME}/dhfs_data/dhfs_fuse_root_test
 dhfs.objects.ref_verification=true
 dhfs.objects.deletion.delay=0

dhfs-parent/dhfs-fuse/docker-compose.yml

@@ -11,8 +11,7 @@ services:
       - $HOME/dhfs/dhfs1_f:/dhfs_root/fuse:rshared
       - ./target/quarkus-app:/app
     command: "java --add-exports java.base/sun.nio.ch=ALL-UNNAMED
-     -Ddhfs.objects.persistence.files.root=/dhfs_root/p 
-     -Ddhfs.objects.root=/dhfs_root/d 
+     -Ddhfs.objects.persistence.root=/dhfs_root/p 
      -Ddhfs.fuse.root=/dhfs_root/fuse -Dquarkus.http.host=0.0.0.0 
      -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
      -jar /app/quarkus-run.jar"
@@ -32,8 +31,7 @@ services:
     command: "java --add-exports java.base/sun.nio.ch=ALL-UNNAMED
      --add-exports java.base/jdk.internal.access=ALL-UNNAMED
      --add-opens=java.base/java.nio=ALL-UNNAMED
-     -Ddhfs.objects.persistence.files.root=/dhfs_root/p 
-     -Ddhfs.objects.root=/dhfs_root/d 
+     -Ddhfs.objects.persistence.root=/dhfs_root/p 
      -Ddhfs.fuse.root=/dhfs_root/fuse -Dquarkus.http.host=0.0.0.0
      -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5010
      -jar /app/quarkus-run.jar"

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/TempDataProfile.java

@@ -21,7 +21,7 @@ abstract public class TempDataProfile implements QuarkusTestProfile {
             throw new RuntimeException(e);
         }
         var ret = new HashMap<String, String>();
-        ret.put("dhfs.objects.persistence.files.root", tempDirWithPrefix.resolve("dhfs_root_test").toString());
+        ret.put("dhfs.objects.persistence.root", tempDirWithPrefix.resolve("dhfs_root_test").toString());
         ret.put("dhfs.fuse.root", tempDirWithPrefix.resolve("dhfs_fuse_root_test").toString());
         getConfigOverrides(ret);
         return ret;

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/TestDataCleaner.java

@@ -15,7 +15,7 @@ import java.util.Objects;
 
 @ApplicationScoped
 public class TestDataCleaner {
-    @ConfigProperty(name = "dhfs.objects.persistence.files.root")
+    @ConfigProperty(name = "dhfs.objects.persistence.root")
     String tempDirectory;
 
     void init(@Observes @Priority(1) StartupEvent event) throws IOException {

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/integration/DhfsFuseIT.java

@@ -56,8 +56,8 @@ public class DhfsFuseIT {
         waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Listening"), 60, TimeUnit.SECONDS);
         waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Listening"), 60, TimeUnit.SECONDS);
 
-        c1uuid = container1.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/stuff/self_uuid").getStdout();
-        c2uuid = container2.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/stuff/self_uuid").getStdout();
+        c1uuid = container1.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/self_uuid").getStdout();
+        c2uuid = container2.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/self_uuid").getStdout();
 
         Assertions.assertDoesNotThrow(() -> UUID.fromString(c1uuid));
         Assertions.assertDoesNotThrow(() -> UUID.fromString(c2uuid));

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/integration/DhfsFusex3IT.java

@@ -72,9 +72,9 @@ public class DhfsFusex3IT {
         waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Listening"), 60, TimeUnit.SECONDS);
         waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Listening"), 60, TimeUnit.SECONDS);
 
-        c1uuid = container1.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/stuff/self_uuid").getStdout();
-        c2uuid = container2.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/stuff/self_uuid").getStdout();
-        c3uuid = container3.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/stuff/self_uuid").getStdout();
+        c1uuid = container1.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/self_uuid").getStdout();
+        c2uuid = container2.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/self_uuid").getStdout();
+        c3uuid = container3.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/self_uuid").getStdout();
 
         Log.info(container1.getContainerId() + "=" + c1uuid + " = 1");
         Log.info(container2.getContainerId() + "=" + c2uuid + " = 2");

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/integration/DhfsImage.java

@@ -87,7 +87,7 @@ public class DhfsImage implements Future<String> {
                                         "-Dquarkus.log.category.\"com.usatiuk.objects.transaction\".level=INFO",
                                         "-Ddhfs.objects.periodic-push-op-interval=5s",
                                         "-Ddhfs.fuse.root=/dhfs_test/fuse",
-                                        "-Ddhfs.objects.persistence.files.root=/dhfs_test/data",
+                                        "-Ddhfs.objects.persistence.root=/dhfs_test/data",
                                         "-Ddhfs.objects.persistence.stuff.root=/dhfs_test/data/stuff",
                                         "-jar", "/app/quarkus-run.jar")
                                 .run("mkdir /dhfs_test && chmod 777 /dhfs_test")

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/integration/KillIT.java

@@ -72,8 +72,8 @@ public class KillIT {
         waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Listening"), 60, TimeUnit.SECONDS);
         waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Listening"), 60, TimeUnit.SECONDS);
 
-        c1uuid = container1.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/stuff/self_uuid").getStdout();
-        c2uuid = container2.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/stuff/self_uuid").getStdout();
+        c1uuid = container1.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/self_uuid").getStdout();
+        c2uuid = container2.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/self_uuid").getStdout();
 
         Assertions.assertDoesNotThrow(() -> UUID.fromString(c1uuid));
         Assertions.assertDoesNotThrow(() -> UUID.fromString(c2uuid));

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/integration/LazyFsIT.java

@@ -23,6 +23,7 @@ import java.util.stream.Stream;
 
 import static org.awaitility.Awaitility.await;
 
+@Disabled
 public class LazyFsIT {
     GenericContainer<?> container1;
     GenericContainer<?> container2;
@@ -82,8 +83,8 @@ public class LazyFsIT {
         waitingConsumer2.waitUntil(frame -> frame.getUtf8String().contains("Listening"), 60, TimeUnit.SECONDS);
         waitingConsumer1.waitUntil(frame -> frame.getUtf8String().contains("Listening"), 60, TimeUnit.SECONDS);
 
-        c1uuid = container1.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/stuff/self_uuid").getStdout();
-        c2uuid = container2.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/stuff/self_uuid").getStdout();
+        c1uuid = container1.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/self_uuid").getStdout();
+        c2uuid = container2.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/self_uuid").getStdout();
 
         Assertions.assertDoesNotThrow(() -> UUID.fromString(c1uuid));
         Assertions.assertDoesNotThrow(() -> UUID.fromString(c2uuid));

dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/integration/ResyncIT.java

@@ -66,8 +66,8 @@ public class ResyncIT {
     @Test
     void readWriteFileTest() throws IOException, InterruptedException, TimeoutException {
         await().atMost(45, TimeUnit.SECONDS).until(() -> 0 == container1.execInContainer("/bin/sh", "-c", "echo tesempty > /dhfs_test/fuse/testf1").getExitCode());
-        c1uuid = container1.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/stuff/self_uuid").getStdout();
-        c2uuid = container2.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/stuff/self_uuid").getStdout();
+        c1uuid = container1.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/self_uuid").getStdout();
+        c2uuid = container2.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/self_uuid").getStdout();
 
         Assertions.assertDoesNotThrow(() -> UUID.fromString(c1uuid));
         Assertions.assertDoesNotThrow(() -> UUID.fromString(c2uuid));
@@ -106,8 +106,8 @@ public class ResyncIT {
         foundWc = container2.execInContainer("/bin/sh", "-c", "find /dhfs_test/fuse -type f | wc -l");
         Assertions.assertEquals(200, Integer.valueOf(foundWc.getStdout().strip()));
 
-        c1uuid = container1.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/stuff/self_uuid").getStdout();
-        c2uuid = container2.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/stuff/self_uuid").getStdout();
+        c1uuid = container1.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/self_uuid").getStdout();
+        c2uuid = container2.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/self_uuid").getStdout();
 
         Assertions.assertDoesNotThrow(() -> UUID.fromString(c1uuid));
         Assertions.assertDoesNotThrow(() -> UUID.fromString(c2uuid));
@@ -146,8 +146,8 @@ public class ResyncIT {
         await().atMost(45, TimeUnit.SECONDS).until(() -> 0 == container1.execInContainer("/bin/sh", "-c", "mv /dhfs_test/fuse/testd1 /dhfs_test/fuse/testd2").getExitCode());
         await().atMost(45, TimeUnit.SECONDS).until(() -> 0 == container1.execInContainer("/bin/sh", "-c", "echo tesempty2 > /dhfs_test/fuse/testd2/testf2").getExitCode());
 
-        c1uuid = container1.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/stuff/self_uuid").getStdout();
-        c2uuid = container2.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/stuff/self_uuid").getStdout();
+        c1uuid = container1.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/self_uuid").getStdout();
+        c2uuid = container2.execInContainer("/bin/sh", "-c", "cat /dhfs_test/data/self_uuid").getStdout();
 
         Assertions.assertDoesNotThrow(() -> UUID.fromString(c1uuid));
         Assertions.assertDoesNotThrow(() -> UUID.fromString(c2uuid));

dhfs-parent/dhfs-fuse/src/test/resources/application.properties

@@ -1,5 +1,4 @@
-dhfs.objects.persistence.files.root=${HOME}/dhfs_data/dhfs_root_test
-dhfs.objects.root=${HOME}/dhfs_data/dhfs_root_d_test
+dhfs.objects.persistence.root=${HOME}/dhfs_data/dhfs_root_test
 dhfs.fuse.root=${HOME}/dhfs_data/dhfs_fuse_root_test
 dhfs.objects.ref_verification=true
 dhfs.objects.deletion.delay=0

dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/LmdbObjectPersistentStore.java

@@ -58,7 +58,7 @@ public class LmdbObjectPersistentStore implements ObjectPersistentStore {
     private Dbi<ByteBuffer> _db;
     private boolean _ready = false;
 
-    public LmdbObjectPersistentStore(@ConfigProperty(name = "dhfs.objects.persistence.files.root") String root) {
+    public LmdbObjectPersistentStore(@ConfigProperty(name = "dhfs.objects.persistence.root") String root) {
         _root = Path.of(root).resolve("objects");
     }
 

dhfs-parent/objects/src/main/resources/application.properties

@@ -3,7 +3,7 @@ dhfs.objects.writeback.limit=16777216
 dhfs.objects.lru.limit=67108864
 dhfs.objects.lru.print-stats=false
 dhfs.objects.lock_timeout_secs=15
-dhfs.objects.persistence.files.root=${HOME}/dhfs_default/data/objs
+dhfs.objects.persistence.root=${HOME}/dhfs_default/data/objs
 dhfs.objects.persistence.snapshot-extra-checks=false
 dhfs.objects.last-seen.update=60
 dhfs.objects.last-seen.timeout=43200

dhfs-parent/objects/src/test/java/com/usatiuk/objects/TempDataProfile.java

@@ -21,7 +21,7 @@ public class TempDataProfile implements QuarkusTestProfile {
             throw new RuntimeException(e);
         }
         var ret = new HashMap<String, String>();
-        ret.put("dhfs.objects.persistence.files.root", tempDirWithPrefix.resolve("dhfs_root_test").toString());
+        ret.put("dhfs.objects.persistence.root", tempDirWithPrefix.resolve("dhfs_root_test").toString());
         ret.put("dhfs.fuse.root", tempDirWithPrefix.resolve("dhfs_fuse_root_test").toString());
         ret.put("dhfs.objects.persistence", "lmdb");
         getConfigOverrides(ret);

dhfs-parent/objects/src/test/java/com/usatiuk/objects/TestDataCleaner.java

@@ -15,7 +15,7 @@ import java.util.Objects;
 
 @ApplicationScoped
 public class TestDataCleaner {
-    @ConfigProperty(name = "dhfs.objects.persistence.files.root")
+    @ConfigProperty(name = "dhfs.objects.persistence.root")
     String tempDirectory;
 
     void init(@Observes @Priority(1) StartupEvent event) throws IOException {

dhfs-parent/sync-base/docker-compose.yml

@@ -1,43 +0,0 @@
-version: "3.2"
-
-services:
-  dhfs1:
-    build: .
-    privileged: true
-    devices:
-      - /dev/fuse
-    volumes:
-      - $HOME/dhfs/dhfs1:/dhfs_root
-      - $HOME/dhfs/dhfs1_f:/dhfs_root/fuse:rshared
-      - ./target/quarkus-app:/app
-    command: "java --add-exports java.base/sun.nio.ch=ALL-UNNAMED
-     -Ddhfs.objects.persistence.files.root=/dhfs_root/p 
-     -Ddhfs.objects.root=/dhfs_root/d 
-     -Ddhfs.fuse.root=/dhfs_root/fuse -Dquarkus.http.host=0.0.0.0 
-     -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
-     -jar /app/quarkus-run.jar"
-    ports:
-      - 8080:8080
-      - 8081:8443
-      - 5005:5005
-  dhfs2:
-    build: .
-    privileged: true
-    devices:
-      - /dev/fuse
-    volumes:
-      - $HOME/dhfs/dhfs2:/dhfs_root
-      - $HOME/dhfs/dhfs2_f:/dhfs_root/fuse:rshared
-      - ./target/quarkus-app:/app
-    command: "java --add-exports java.base/sun.nio.ch=ALL-UNNAMED
-     --add-exports java.base/jdk.internal.access=ALL-UNNAMED
-     --add-opens=java.base/java.nio=ALL-UNNAMED
-     -Ddhfs.objects.persistence.files.root=/dhfs_root/p 
-     -Ddhfs.objects.root=/dhfs_root/d 
-     -Ddhfs.fuse.root=/dhfs_root/fuse -Dquarkus.http.host=0.0.0.0
-     -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5010
-     -jar /app/quarkus-run.jar"
-    ports:
-      - 8090:8080
-      - 8091:8443
-      - 5010:5010

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/ShutdownChecker.java

@@ -19,7 +19,7 @@ import java.nio.file.Paths;
 @ApplicationScoped
 public class ShutdownChecker {
     private static final String dataFileName = "running";
-    @ConfigProperty(name = "dhfs.objects.persistence.files.root")
+    @ConfigProperty(name = "dhfs.objects.persistence.root")
     String dataRoot;
     boolean _cleanShutdown = true;
     boolean _initialized = false;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/DeferredInvalidationQueueService.java

@@ -32,7 +32,7 @@ public class DeferredInvalidationQueueService implements PeerConnectedEventListe
     ReachablePeerManager reachablePeerManager;
     @Inject
     InvalidationQueueService invalidationQueueService;
-    @ConfigProperty(name = "dhfs.objects.persistence.files.root")
+    @ConfigProperty(name = "dhfs.objects.persistence.root")
     String dataRoot;
     private DeferredInvalidationQueueData _persistentData = new DeferredInvalidationQueueData();
 

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PersistentPeerDataService.java

@@ -60,7 +60,7 @@ public class PersistentPeerDataService {
 
     @ConfigProperty(name = "dhfs.peerdiscovery.preset-uuid")
     Optional<String> presetUuid;
-    @ConfigProperty(name = "dhfs.objects.persistence.stuff.root")
+    @ConfigProperty(name = "dhfs.objects.persistence.root")
     String stuffRoot;
 
     private PeerId _selfUuid;

dhfs-parent/sync-base/src/main/resources/application.properties

@@ -8,7 +8,6 @@ dhfs.objects.reconnect_interval=5s
 dhfs.objects.write_log=false
 dhfs.objects.periodic-push-op-interval=5m
 dhfs.fuse.root=${HOME}/dhfs_default/fuse
-dhfs.objects.persistence.stuff.root=${HOME}/dhfs_default/data/stuff
 dhfs.fuse.debug=false
 dhfs.fuse.enabled=true
 dhfs.files.allow_recursive_delete=false

dhfs-parent/sync-base/src/test/java/com/usatiuk/dhfs/TempDataProfile.java

@@ -21,7 +21,7 @@ abstract public class TempDataProfile implements QuarkusTestProfile {
             throw new RuntimeException(e);
         }
         var ret = new HashMap<String, String>();
-        ret.put("dhfs.objects.persistence.files.root", tempDirWithPrefix.resolve("dhfs_root_test").toString());
+        ret.put("dhfs.objects.persistence.root", tempDirWithPrefix.resolve("dhfs_root_test").toString());
         ret.put("dhfs.fuse.root", tempDirWithPrefix.resolve("dhfs_fuse_root_test").toString());
         getConfigOverrides(ret);
         return ret;

dhfs-parent/sync-base/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java

@@ -15,7 +15,7 @@ import java.util.Objects;
 
 @ApplicationScoped
 public class TestDataCleaner {
-    @ConfigProperty(name = "dhfs.objects.persistence.files.root")
+    @ConfigProperty(name = "dhfs.objects.persistence.root")
     String tempDirectory;
 
     void init(@Observes @Priority(1) StartupEvent event) throws IOException {

dhfs-parent/sync-base/src/test/resources/application.properties

@@ -1,5 +1,4 @@
-dhfs.objects.persistence.files.root=${HOME}/dhfs_data/dhfs_root_test
-dhfs.objects.root=${HOME}/dhfs_data/dhfs_root_d_test
+dhfs.objects.persistence.root=${HOME}/dhfs_data/dhfs_root_test
 dhfs.fuse.root=${HOME}/dhfs_data/dhfs_fuse_root_test
 dhfs.objects.ref_verification=true
 dhfs.objects.deletion.delay=0

launcher/CMakeLists.txt

@@ -29,6 +29,5 @@ if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
 endif ()
 
 add_subdirectory(utils)
-add_subdirectory(libjvm_wrapper)
 add_subdirectory(backend)
 add_subdirectory(gui)

launcher/backend/CMakeLists.txt

@@ -1,9 +1,19 @@
+find_package(wxWidgets REQUIRED COMPONENTS base)
+if (wxWidgets_USE_FILE) # not defined in CONFIG mode
+    include(${wxWidgets_USE_FILE})
+endif ()
+
 add_library(backend
         src/DhfsInstance.cpp
         include_public/DhfsInstance.hpp
+        src/DhfsStartOptions.cpp
+        include_public/DhfsStartOptions.hpp
+        src/DhfsWxProcess.cpp
+        include_public/DhfsWxProcess.hpp
 )
 
 target_include_directories(backend PRIVATE include)
 target_include_directories(backend PUBLIC include_public)
 
-target_link_libraries(backend PUBLIC libjvm_wrapper utils)
+target_link_libraries(backend PRIVATE ${wxWidgets_LIBRARIES})
+target_link_libraries(backend PUBLIC utils)

launcher/backend/include_public/DhfsInstance.hpp

@@ -5,9 +5,14 @@
 #ifndef DHFSINSTANCE_HPP
 #define DHFSINSTANCE_HPP
 
-#include <jni.h>
+#include <wx/process.h>
 #include <string>
 #include <vector>
+#include <thread>
+#include<mutex>
+
+#include "DhfsStartOptions.hpp"
+#include "DhfsWxProcess.hpp"
 
 enum class DhfsInstanceState {
     RUNNING,
@@ -18,19 +23,26 @@ class DhfsInstance {
 public:
     DhfsInstance();
 
-    ~DhfsInstance();
+    virtual ~DhfsInstance();
 
     DhfsInstanceState state();
 
-    void start(const std::string& mount_path, const std::vector<std::string>& extra_options);
+    void start(DhfsStartOptions start_options);
 
     void stop();
 
+    virtual void OnTerminate(int pid, int status) = 0;
+
+    virtual void OnRead(std::string s) = 0;
+
+protected:
+    std::unique_ptr<DhfsWxProcess> process = std::make_unique<DhfsWxProcess>(*this);
+
 private:
     DhfsInstanceState _state = DhfsInstanceState::STOPPED;
-
-    JavaVM* _jvm = nullptr;
-    JNIEnv* _env = nullptr;
+    std::thread _readThread;
+    std::thread _readThreadErr;
+    std::mutex _mutex;
 };
 
 

launcher/backend/include_public/DhfsStartOptions.hpp

@@ -0,0 +1,25 @@
+//
+// Created by Stepan Usatiuk on 25.06.2025.
+//
+
+#ifndef DHFSSTARTOPTIONS_HPP
+#define DHFSSTARTOPTIONS_HPP
+
+#include <string>
+#include <vector>
+
+class DhfsStartOptions {
+public:
+    std::string java_home;
+    std::string xmx;
+    std::string mount_path;
+    std::string data_path;
+    std::string jar_path;
+    std::string webui_path;
+    std::vector<std::string> extra_options;
+
+    std::vector<std::string> getOptions();
+};
+
+
+#endif //DHFSSTARTOPTIONS_HPP

launcher/backend/include_public/DhfsWxProcess.hpp

@@ -0,0 +1,24 @@
+//
+// Created by Stepan Usatiuk on 25.06.2025.
+//
+
+#ifndef DHFSWXPROCESS_HPP
+#define DHFSWXPROCESS_HPP
+#include <wx/process.h>
+
+
+class DhfsInstance;
+
+class DhfsWxProcess : public wxProcess {
+public:
+    DhfsWxProcess(DhfsInstance& parent);
+
+protected:
+    void OnTerminate(int pid, int status) override;
+
+private:
+    DhfsInstance& _instance;
+};
+
+
+#endif //DHFSWXPROCESS_HPP

launcher/backend/src/DhfsInstance.cpp

@@ -8,19 +8,21 @@
 #include <vector>
 
 #include "Exception.h"
-#include "LibjvmWrapper.hpp"
 
 DhfsInstance::DhfsInstance() {
 }
 
 DhfsInstance::~DhfsInstance() {
+    stop();
 }
 
 DhfsInstanceState DhfsInstance::state() {
+    std::lock_guard<std::mutex> lock(_mutex);
     return _state;
 }
 
-void DhfsInstance::start(const std::string& mount_path, const std::vector<std::string>& extra_options) {
+void DhfsInstance::start(DhfsStartOptions options) {
+    std::lock_guard<std::mutex> lock(_mutex);
     switch (_state) {
         case DhfsInstanceState::RUNNING:
             return;
@@ -31,23 +33,51 @@ void DhfsInstance::start(const std::string& mount_path, const std::vector<std::s
     }
     _state = DhfsInstanceState::RUNNING;
 
-    JavaVMInitArgs args;
-    std::vector<JavaVMOption> options;
-    for (const auto& option: extra_options) {
-        options.emplace_back((char*) option.c_str(), nullptr);
+    std::vector<char*> args;
+    auto readyOptions = options.getOptions();
+    for (const auto& option: readyOptions) {
+        args.push_back(const_cast<char*>(option.c_str()));
     }
-    std::string mount_option = "-Ddhfs.fuse.root=";
-    mount_option += mount_path;
-    options.emplace_back((char*) mount_option.c_str(), nullptr);
-    args.version = JNI_VERSION_21;
-    args.nOptions = options.size();
-    args.options = options.data();
-    args.ignoreUnrecognized = false;
 
-    LibjvmWrapper::instance().get_JNI_CreateJavaVM()(&_jvm, (void**) &_env, &args);
+    long ret = wxExecute(args.data(), wxEXEC_ASYNC | wxEXEC_HIDE_CONSOLE | wxEXEC_MAKE_GROUP_LEADER, process.get(),
+                         nullptr);
+    if (ret == 0) {
+        _state = DhfsInstanceState::STOPPED;
+        throw Exception("Failed to start DHFS");
+    }
+
+    OnRead("Started! " + std::to_string(ret) + " PID: " + std::to_string(process->GetPid()) + "\n");
+
+    _readThread = std::thread([&]() {
+        auto stream = process->GetInputStream();
+        while (!stream->Eof() || stream->CanRead()) {
+            char buffer[1024];
+            size_t bytesRead = stream->Read(buffer, sizeof(buffer) - 1).LastRead();
+            if (bytesRead > 0) {
+                buffer[bytesRead] = '\0'; // Null-terminate the string
+                OnRead(std::string(buffer));
+            } else if (bytesRead == 0) {
+                break; // EOF reached
+            }
+        }
+    });
+    _readThreadErr = std::thread([&]() {
+        auto stream = process->GetErrorStream();
+        while (!stream->Eof() || stream->CanRead()) {
+            char buffer[1024];
+            size_t bytesRead = stream->Read(buffer, sizeof(buffer) - 1).LastRead();
+            if (bytesRead > 0) {
+                buffer[bytesRead] = '\0'; // Null-terminate the string
+                OnRead(std::string(buffer));
+            } else if (bytesRead == 0) {
+                break; // EOF reached
+            }
+        }
+    });
 }
 
 void DhfsInstance::stop() {
+    std::lock_guard<std::mutex> lock(_mutex);
     switch (_state) {
         case DhfsInstanceState::RUNNING:
             break;
@@ -57,12 +87,14 @@ void DhfsInstance::stop() {
             throw std::runtime_error("Unknown DhfsInstanceState");
     }
 
-    if (_jvm == nullptr)
-        throw Exception("JVM not running");
-
-    JNIEnv* env;
-    _jvm->AttachCurrentThread((void**) &env, nullptr);
-    _jvm->DestroyJavaVM();
-    _jvm = nullptr;
     _state = DhfsInstanceState::STOPPED;
+
+    int err = wxProcess::Kill(process->GetPid(), wxSIGTERM, wxKILL_CHILDREN);
+    _readThread.join();
+    _readThreadErr.join();
+    OnRead("Stopped!\n");
+    if (err != wxKILL_OK) {
+        OnRead("Failed to stop DHFS: " + std::to_string(err) + "\n");
+    }
+    OnTerminate(0, 0);
 }

launcher/backend/src/DhfsStartOptions.cpp

@@ -0,0 +1,31 @@
+//
+// Created by Stepan Usatiuk on 25.06.2025.
+//
+
+#include "DhfsStartOptions.hpp"
+
+std::vector<std::string> DhfsStartOptions::getOptions() {
+    std::vector<std::string> out;
+    out.emplace_back(java_home + "/bin/java");
+    out.emplace_back("--enable-preview");
+    out.emplace_back("-Xmx" + xmx);
+    out.emplace_back("-Ddhfs.objects.writeback.limit=16777216");
+    out.emplace_back("-Ddhfs.objects.lru.limit=67108864");
+    out.emplace_back("--add-exports");
+    out.emplace_back("java.base/sun.nio.ch=ALL-UNNAMED");
+    out.emplace_back("--add-exports");
+    out.emplace_back("java.base/jdk.internal.access=ALL-UNNAMED");
+    out.emplace_back("--add-opens=java.base/java.nio=ALL-UNNAMED");
+    out.emplace_back("-Dquarkus.http.host=0.0.0.0");
+    out.emplace_back("-Dquarkus.log.category.\"com.usatiuk\".level=INFO");
+    out.emplace_back("-Dquarkus.log.category.\"com.usatiuk.dhfs\".level=INFO");
+    out.emplace_back("-Ddhfs.fuse.root=" + mount_path);
+    out.emplace_back("-Ddhfs.objects.persistence.root=" + data_path);
+    out.emplace_back("-Ddhfs.webui.root=" + webui_path);
+    for (auto option: extra_options) {
+        out.emplace_back(option);
+    }
+    out.emplace_back("-jar");
+    out.emplace_back(jar_path);
+    return out;
+}

launcher/backend/src/DhfsWxProcess.cpp

@@ -0,0 +1,14 @@
+//
+// Created by Stepan Usatiuk on 25.06.2025.
+//
+
+#include "DhfsWxProcess.hpp"
+
+#include "DhfsInstance.hpp"
+
+DhfsWxProcess::DhfsWxProcess(DhfsInstance& parent): wxProcess(wxPROCESS_REDIRECT), _instance(parent) {
+}
+
+void DhfsWxProcess::OnTerminate(int pid, int status) {
+    _instance.stop();
+}

launcher/gui/CMakeLists.txt

@@ -8,6 +8,8 @@ add_executable(launcher
         src/LauncherApp.cpp
         src/GLauncherApp.cpp
         src/LauncherAppMainFrame.cpp
+        src/DhfsGuiInstance.cpp
+        src/DhfsGuiInstance.hpp
 )
 
 target_link_libraries(launcher ${wxWidgets_LIBRARIES})

launcher/gui/src/DhfsGuiInstance.cpp

@@ -0,0 +1,23 @@
+//
+// Created by Stepan Usatiuk on 25.06.2025.
+//
+
+#include "DhfsGuiInstance.hpp"
+
+#include "LauncherAppMainFrame.h"
+
+DhfsGuiInstance::DhfsGuiInstance(LauncherAppMainFrame& parent): _parent(parent) {
+}
+
+void DhfsGuiInstance::OnTerminate(int pid, int status) {
+    wxCommandEvent* event = new wxCommandEvent(SHUTDOWN_EVENT, _parent.GetId());
+    event->SetEventObject(&_parent);
+    _parent.GetEventHandler()->QueueEvent(event);
+}
+
+void DhfsGuiInstance::OnRead(std::string s) {
+    wxCommandEvent* event = new wxCommandEvent(NEW_LINE_OUTPUT_EVENT, _parent.GetId());
+    event->SetEventObject(&_parent);
+    event->SetString(std::move(s));
+    _parent.GetEventHandler()->QueueEvent(event);
+}

launcher/gui/src/DhfsGuiInstance.hpp

@@ -0,0 +1,25 @@
+//
+// Created by Stepan Usatiuk on 25.06.2025.
+//
+
+#ifndef DHFSGUIINSTANCE_HPP
+#define DHFSGUIINSTANCE_HPP
+#include "DhfsInstance.hpp"
+
+
+class LauncherAppMainFrame;
+
+class DhfsGuiInstance : public DhfsInstance {
+public:
+    DhfsGuiInstance(LauncherAppMainFrame& parent);
+
+    void OnTerminate(int pid, int status) override;
+
+    void OnRead(std::string s) override;
+
+protected:
+    LauncherAppMainFrame& _parent;
+};
+
+
+#endif //DHFSGUIINSTANCE_HPP

launcher/gui/src/GLauncherApp.cpp

@@ -11,13 +11,13 @@
 
 MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxFrame( parent, id, title, pos, size, style, name )
 {
-	this->SetSizeHints( wxSize( 100,50 ), wxDefaultSize );
+	this->SetSizeHints( wxSize( 600,400 ), wxDefaultSize );
 
 	m_statusBar1 = this->CreateStatusBar( 1, wxSTB_SIZEGRIP, wxID_ANY );
 	wxBoxSizer* bSizer3;
 	bSizer3 = new wxBoxSizer( wxVERTICAL );
 
-	m_notebook1 = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	m_notebook1 = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0|wxBORDER_NONE );
 	m_panel1 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer2;
 	bSizer2 = new wxBoxSizer( wxVERTICAL );
@@ -55,7 +55,17 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
 	bSizer2->Fit( m_panel1 );
 	m_notebook1->AddPage( m_panel1, _("Info"), false );
 	m_panel3 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_notebook1->AddPage( m_panel3, _("Logs"), false );
+	wxGridSizer* gSizer1;
+	gSizer1 = new wxGridSizer( 1, 1, 0, 0 );
+
+	m_logOutputTextCtrl = new wxTextCtrl( m_panel3, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxBORDER_NONE );
+	gSizer1->Add( m_logOutputTextCtrl, 0, wxALL|wxEXPAND, 5 );
+
+
+	m_panel3->SetSizer( gSizer1 );
+	m_panel3->Layout();
+	gSizer1->Fit( m_panel3 );
+	m_notebook1->AddPage( m_panel3, _("Logs"), true );
 	m_panel2 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer5;
 	bSizer5 = new wxBoxSizer( wxVERTICAL );
@@ -101,9 +111,16 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
 	m_staticText6->Wrap( -1 );
 	gbSizer3->Add( m_staticText6, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-	m_mountPathDirPicker = new wxDirPickerCtrl( sbSizer41->GetStaticBox(), wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, wxDIRP_DEFAULT_STYLE|wxDIRP_USE_TEXTCTRL );
+	m_staticText61 = new wxStaticText( sbSizer41->GetStaticBox(), wxID_ANY, _("Data path"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText61->Wrap( -1 );
+	gbSizer3->Add( m_staticText61, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+	m_mountPathDirPicker = new wxDirPickerCtrl( sbSizer41->GetStaticBox(), wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, wxDIRP_USE_TEXTCTRL );
 	gbSizer3->Add( m_mountPathDirPicker, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 );
 
+	m_dataPathDirPicker = new wxDirPickerCtrl( sbSizer41->GetStaticBox(), wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, wxDIRP_USE_TEXTCTRL );
+	gbSizer3->Add( m_dataPathDirPicker, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 );
+
 
 	gbSizer3->AddGrowableCol( 1 );
 
@@ -120,9 +137,9 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
 	m_panel4 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	m_notebook1->AddPage( m_panel4, _("Advanced Settings"), false );
 	m_panel5 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_notebook1->AddPage( m_panel5, _("a page"), true );
+	m_notebook1->AddPage( m_panel5, _("a page"), false );
 
-	bSizer3->Add( m_notebook1, 1, wxALL|wxEXPAND, 5 );
+	bSizer3->Add( m_notebook1, 1, wxEXPAND, 5 );
 
 
 	this->SetSizer( bSizer3 );
@@ -131,9 +148,12 @@ MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, co
 	this->Centre( wxBOTH );
 
 	// Connect Events
+	m_notebook1->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( MainFrame::OnNotebookPageChanged ), NULL, this );
+	m_notebook1->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, wxNotebookEventHandler( MainFrame::OnNotebookPageChanging ), NULL, this );
 	m_startStopButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrame::OnStartStopButtonClick ), NULL, this );
 	m_javaHomeDirPicker->Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainFrame::OnJavaHomeChanged ), NULL, this );
 	m_mountPathDirPicker->Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainFrame::OnMountPathChanged ), NULL, this );
+	m_dataPathDirPicker->Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainFrame::OnDataPathChanged ), NULL, this );
 }
 
 MainFrame::~MainFrame()

launcher/gui/src/GLauncherApp.h

@@ -25,6 +25,7 @@
 #include <wx/sizer.h>
 #include <wx/statbox.h>
 #include <wx/panel.h>
+#include <wx/textctrl.h>
 #include <wx/filepicker.h>
 #include <wx/notebook.h>
 #include <wx/frame.h>
@@ -45,24 +46,30 @@ class MainFrame : public wxFrame
 		wxStaticText* m_statusText;
 		wxButton* m_startStopButton;
 		wxPanel* m_panel3;
+		wxTextCtrl* m_logOutputTextCtrl;
 		wxPanel* m_panel2;
 		wxButton* m_button2;
 		wxDirPickerCtrl* m_javaHomeDirPicker;
 		wxStaticText* m_staticText2;
 		wxStaticText* m_staticText6;
+		wxStaticText* m_staticText61;
 		wxDirPickerCtrl* m_mountPathDirPicker;
+		wxDirPickerCtrl* m_dataPathDirPicker;
 		wxPanel* m_panel4;
 		wxPanel* m_panel5;
 
 		// Virtual event handlers, override them in your derived class
+		virtual void OnNotebookPageChanged( wxNotebookEvent& event ) { event.Skip(); }
+		virtual void OnNotebookPageChanging( wxNotebookEvent& event ) { event.Skip(); }
 		virtual void OnStartStopButtonClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnJavaHomeChanged( wxFileDirPickerEvent& event ) { event.Skip(); }
 		virtual void OnMountPathChanged( wxFileDirPickerEvent& event ) { event.Skip(); }
+		virtual void OnDataPathChanged( wxFileDirPickerEvent& event ) { event.Skip(); }
 
 
 	public:
 
-		MainFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("DHFS"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 499,341 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("DHFS") );
+		MainFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("DHFS"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 600,400 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("DHFS") );
 
 		~MainFrame();
 

launcher/gui/src/LauncherAppMainFrame.cpp

@@ -4,43 +4,71 @@
 #include <wx/fileconf.h>
 
 #include "Exception.h"
-#include "LibjvmWrapper.hpp"
+
+wxDEFINE_EVENT(NEW_LINE_OUTPUT_EVENT, wxCommandEvent);
+wxDEFINE_EVENT(SHUTDOWN_EVENT, wxCommandEvent);
 
 LauncherAppMainFrame::LauncherAppMainFrame(wxWindow* parent)
     : MainFrame(parent) {
     m_javaHomeDirPicker->SetPath(wxFileConfig::Get()->Read(kJavaHomeSettingsKey));
     m_mountPathDirPicker->SetPath(wxFileConfig::Get()->Read(kMountPointSettingsKey));
-    wxGridSizer* bSizer4;
-    bSizer4 = new wxGridSizer(1, 0, 0);
+    m_dataPathDirPicker->SetPath(wxFileConfig::Get()->Read(kDataDirSettingsKey));
 
-    m_panel5->SetSizer(bSizer4);
+    m_webViewSizer = new wxGridSizer(1, 0, 0);
+    m_panel5->SetSizer(m_webViewSizer);
     m_panel5->Layout();
-    bSizer4->Fit(m_panel5);
-    m_webView = wxWebView::New(m_panel5, wxID_ANY);
-    bSizer4->Add(m_webView, 0, wxALL | wxEXPAND);
-    m_webView->LoadURL("http://localhost:8080");
+    m_webViewSizer->Fit(m_panel5);
+
+    Bind(NEW_LINE_OUTPUT_EVENT, &LauncherAppMainFrame::onNewLineOutput, this);
+    Bind(SHUTDOWN_EVENT, &LauncherAppMainFrame::onShutdown, this);
+    wxFont font = wxFont(wxSize(16, 16),
+                         wxFontFamily::wxFONTFAMILY_TELETYPE,
+                         wxFontStyle::wxFONTSTYLE_NORMAL,
+                         wxFontWeight::wxFONTWEIGHT_NORMAL);
+    m_logOutputTextCtrl->SetFont(font);
+    updateState();
+}
+
+void LauncherAppMainFrame::updateState() {
+    switch (_dhfsInstance.state()) {
+        case DhfsInstanceState::RUNNING:
+            m_statusText->SetLabel("Running");
+            m_startStopButton->SetLabel("Stop");
+            m_statusBar1->SetStatusText("Running", 0);
+            break;
+        case DhfsInstanceState::STOPPED: {
+            m_statusText->SetLabel("Stopped");
+            m_startStopButton->SetLabel("Start");
+            m_statusBar1->SetStatusText("Stopped", 0);
+            break;
+        }
+        default:
+            throw Exception("Unhandled switch case");
+    }
 }
 
 void LauncherAppMainFrame::OnStartStopButtonClick(wxCommandEvent& event) {
     switch (_dhfsInstance.state()) {
         case DhfsInstanceState::RUNNING:
-            m_statusText->SetLabel("Stopped");
-            m_startStopButton->SetLabel("Start");
-            m_statusBar1->SetStatusText("Stopped", 0);
             _dhfsInstance.stop();
             break;
-        case DhfsInstanceState::STOPPED:
-            LibjvmWrapper::instance().setJavaHome(wxFileConfig::Get()->Read(kJavaHomeSettingsKey).ToStdString());
-            m_statusText->SetLabel("Running");
-            m_startStopButton->SetLabel("Stop");
-            m_statusBar1->SetStatusText("Running", 0);
-            _dhfsInstance.start(wxFileConfig::Get()->Read(kMountPointSettingsKey).ToStdString(), {
+        case DhfsInstanceState::STOPPED: {
+            DhfsStartOptions options;
+            options.java_home = wxFileConfig::Get()->Read(kJavaHomeSettingsKey);
+            options.xmx = "512m";
+            options.mount_path = wxFileConfig::Get()->Read(kMountPointSettingsKey);
+            options.data_path = wxFileConfig::Get()->Read(kDataDirSettingsKey);
+            std::string bundlePath = wxGetenv("DHFS_BUNDLE_PATH");
+            options.jar_path = bundlePath + "/app/Server/quarkus-run.jar";
+            options.webui_path = bundlePath + "/app/Webui";
 
-                                });
+            _dhfsInstance.start(options);
             break;
+        }
         default:
             throw Exception("Unhandled switch case");
     }
+    updateState();
 }
 
 void LauncherAppMainFrame::OnJavaHomeChanged(wxFileDirPickerEvent& event) {
@@ -50,3 +78,38 @@ void LauncherAppMainFrame::OnJavaHomeChanged(wxFileDirPickerEvent& event) {
 void LauncherAppMainFrame::OnMountPathChanged(wxFileDirPickerEvent& event) {
     wxFileConfig::Get()->Write(kMountPointSettingsKey, event.GetPath());
 }
+
+void LauncherAppMainFrame::OnDataPathChanged(wxFileDirPickerEvent& event) {
+    wxFileConfig::Get()->Write(kDataDirSettingsKey, event.GetPath());
+}
+
+void LauncherAppMainFrame::onNewLineOutput(wxCommandEvent& event) {
+    m_logOutputTextCtrl->AppendText(event.GetString());
+}
+
+void LauncherAppMainFrame::OnNotebookPageChanged(wxBookCtrlEvent& event) {
+}
+
+void LauncherAppMainFrame::OnNotebookPageChanging(wxBookCtrlEvent& event) {
+    if (event.GetSelection() == 4) prepareWebview();
+    else unloadWebview();
+}
+
+void LauncherAppMainFrame::onShutdown(wxCommandEvent& event) {
+    updateState();
+}
+
+void LauncherAppMainFrame::unloadWebview() {
+    if (m_webView != nullptr) {
+        m_webViewSizer->Detach(m_webView);
+        m_webView->Destroy();
+        m_webView = nullptr;
+    }
+}
+
+void LauncherAppMainFrame::prepareWebview() {
+    m_webView = wxWebView::New(m_panel5, wxID_ANY);
+    m_webViewSizer->Add(m_webView, 0, wxALL | wxEXPAND);
+    m_webView->LoadURL("http://localhost:8080");
+    m_panel5->Layout();
+}

launcher/gui/src/LauncherAppMainFrame.h

@@ -10,10 +10,16 @@ Subclass of MainFrame, which is generated by wxFormBuilder.
 
 //// end generated include
 
-#include "DhfsInstance.hpp"
 #include <wx/webview.h>
+
+#include "DhfsGuiInstance.hpp"
+
 static constexpr auto kJavaHomeSettingsKey = "DHFS/JavaHome";
 static constexpr auto kMountPointSettingsKey = "DHFS/MountDir";
+static constexpr auto kDataDirSettingsKey = "DHFS/DataDir";
+
+wxDECLARE_EVENT(NEW_LINE_OUTPUT_EVENT, wxCommandEvent);
+wxDECLARE_EVENT(SHUTDOWN_EVENT, wxCommandEvent);
 
 /** Implementing MainFrame */
 class LauncherAppMainFrame : public MainFrame {
@@ -25,6 +31,21 @@ protected:
 
     void OnMountPathChanged(wxFileDirPickerEvent& event) override;
 
+    void OnDataPathChanged(wxFileDirPickerEvent& event) override;
+
+    void OnNotebookPageChanged(wxNotebookEvent& event) override;
+
+    void OnNotebookPageChanging(wxNotebookEvent& event) override;
+
+    void onNewLineOutput(wxCommandEvent& event);
+
+    void onShutdown(wxCommandEvent& event);
+
+    void updateState();
+
+    void unloadWebview();
+    void prepareWebview();
+
 public:
     /** Constructor */
     LauncherAppMainFrame(wxWindow* parent);
@@ -32,9 +53,10 @@ public:
     //// end generated class members
 
 private:
-    wxWebView* m_webView;
+    wxWebView* m_webView = nullptr;
+    wxGridSizer* m_webViewSizer;
 
-    DhfsInstance _dhfsInstance;
+    DhfsGuiInstance _dhfsInstance{*this};
 };
 
 #endif // __LauncherAppMainFrame__

launcher/gui/src/launcher.fbp

@@ -47,10 +47,10 @@
       <property name="hidden">0</property>
       <property name="id">wxID_ANY</property>
       <property name="maximum_size"></property>
-      <property name="minimum_size">100,50</property>
+      <property name="minimum_size">600,400</property>
       <property name="name">MainFrame</property>
       <property name="pos"></property>
-      <property name="size">499,341</property>
+      <property name="size">600,400</property>
       <property name="style">wxDEFAULT_FRAME_STYLE</property>
       <property name="subclass">; ; forward_declare</property>
       <property name="title">DHFS</property>
@@ -91,7 +91,7 @@
         <property name="permission">none</property>
         <object class="sizeritem" expanded="true">
           <property name="border">5</property>
-          <property name="flag">wxALL|wxEXPAND</property>
+          <property name="flag">wxEXPAND</property>
           <property name="proportion">1</property>
           <object class="wxNotebook" expanded="true">
             <property name="BottomDockable">1</property>
@@ -146,7 +146,9 @@
             <property name="tooltip"></property>
             <property name="window_extra_style"></property>
             <property name="window_name"></property>
-            <property name="window_style"></property>
+            <property name="window_style">wxBORDER_NONE</property>
+            <event name="OnNotebookPageChanged">OnNotebookPageChanged</event>
+            <event name="OnNotebookPageChanging">OnNotebookPageChanging</event>
             <object class="notebookpage" expanded="true">
               <property name="bitmap"></property>
               <property name="label">Info</property>
@@ -203,16 +205,16 @@
                 <property name="window_extra_style"></property>
                 <property name="window_name"></property>
                 <property name="window_style">wxTAB_TRAVERSAL</property>
-                <object class="wxBoxSizer" expanded="true">
+                <object class="wxBoxSizer" expanded="false">
                   <property name="minimum_size"></property>
                   <property name="name">bSizer2</property>
                   <property name="orient">wxVERTICAL</property>
                   <property name="permission">none</property>
-                  <object class="sizeritem" expanded="true">
+                  <object class="sizeritem" expanded="false">
                     <property name="border">5</property>
                     <property name="flag">wxALL|wxEXPAND</property>
                     <property name="proportion">1</property>
-                    <object class="wxStaticBoxSizer" expanded="true">
+                    <object class="wxStaticBoxSizer" expanded="false">
                       <property name="id">wxID_ANY</property>
                       <property name="label">Status</property>
                       <property name="minimum_size"></property>
@@ -402,7 +404,7 @@
             <object class="notebookpage" expanded="true">
               <property name="bitmap"></property>
               <property name="label">Logs</property>
-              <property name="select">0</property>
+              <property name="select">1</property>
               <object class="wxPanel" expanded="true">
                 <property name="BottomDockable">1</property>
                 <property name="LeftDockable">1</property>
@@ -455,13 +457,87 @@
                 <property name="window_extra_style"></property>
                 <property name="window_name"></property>
                 <property name="window_style">wxTAB_TRAVERSAL</property>
+                <object class="wxGridSizer" expanded="true">
+                  <property name="cols">1</property>
+                  <property name="hgap">0</property>
+                  <property name="minimum_size"></property>
+                  <property name="name">gSizer1</property>
+                  <property name="permission">none</property>
+                  <property name="rows">1</property>
+                  <property name="vgap">0</property>
+                  <object class="sizeritem" expanded="true">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL|wxEXPAND</property>
+                    <property name="proportion">0</property>
+                    <object class="wxTextCtrl" expanded="true">
+                      <property name="BottomDockable">1</property>
+                      <property name="LeftDockable">1</property>
+                      <property name="RightDockable">1</property>
+                      <property name="TopDockable">1</property>
+                      <property name="aui_layer">0</property>
+                      <property name="aui_name"></property>
+                      <property name="aui_position">0</property>
+                      <property name="aui_row">0</property>
+                      <property name="best_size"></property>
+                      <property name="bg"></property>
+                      <property name="caption"></property>
+                      <property name="caption_visible">1</property>
+                      <property name="center_pane">0</property>
+                      <property name="close_button">1</property>
+                      <property name="context_help"></property>
+                      <property name="context_menu">1</property>
+                      <property name="default_pane">0</property>
+                      <property name="dock">Dock</property>
+                      <property name="dock_fixed">0</property>
+                      <property name="docking">Left</property>
+                      <property name="drag_accept_files">0</property>
+                      <property name="enabled">1</property>
+                      <property name="fg"></property>
+                      <property name="floatable">1</property>
+                      <property name="font"></property>
+                      <property name="gripper">0</property>
+                      <property name="hidden">0</property>
+                      <property name="id">wxID_ANY</property>
+                      <property name="max_size"></property>
+                      <property name="maximize_button">0</property>
+                      <property name="maximum_size"></property>
+                      <property name="maxlength">0</property>
+                      <property name="min_size"></property>
+                      <property name="minimize_button">0</property>
+                      <property name="minimum_size"></property>
+                      <property name="moveable">1</property>
+                      <property name="name">m_logOutputTextCtrl</property>
+                      <property name="pane_border">1</property>
+                      <property name="pane_position"></property>
+                      <property name="pane_size"></property>
+                      <property name="permission">protected</property>
+                      <property name="pin_button">1</property>
+                      <property name="pos"></property>
+                      <property name="resize">Resizable</property>
+                      <property name="show">1</property>
+                      <property name="size"></property>
+                      <property name="style">wxTE_MULTILINE|wxTE_READONLY</property>
+                      <property name="subclass">; ; forward_declare</property>
+                      <property name="toolbar_pane">0</property>
+                      <property name="tooltip"></property>
+                      <property name="validator_data_type"></property>
+                      <property name="validator_style">wxFILTER_NONE</property>
+                      <property name="validator_type">wxDefaultValidator</property>
+                      <property name="validator_variable"></property>
+                      <property name="value"></property>
+                      <property name="window_extra_style"></property>
+                      <property name="window_name"></property>
+                      <property name="window_style">wxBORDER_NONE</property>
+                    </object>
+                  </object>
+                </object>
               </object>
             </object>
             <object class="notebookpage" expanded="true">
               <property name="bitmap"></property>
               <property name="label">Settings</property>
               <property name="select">0</property>
-              <object class="wxPanel" expanded="false">
+              <object class="wxPanel" expanded="true">
                 <property name="BottomDockable">1</property>
                 <property name="LeftDockable">1</property>
                 <property name="RightDockable">1</property>
@@ -513,16 +589,16 @@
                 <property name="window_extra_style"></property>
                 <property name="window_name"></property>
                 <property name="window_style">wxTAB_TRAVERSAL</property>
-                <object class="wxBoxSizer" expanded="false">
+                <object class="wxBoxSizer" expanded="true">
                   <property name="minimum_size"></property>
                   <property name="name">bSizer5</property>
                   <property name="orient">wxVERTICAL</property>
                   <property name="permission">none</property>
-                  <object class="sizeritem" expanded="false">
+                  <object class="sizeritem" expanded="true">
                     <property name="border">5</property>
                     <property name="flag">wxALL|wxEXPAND|wxFIXED_MINSIZE</property>
                     <property name="proportion">1</property>
-                    <object class="wxStaticBoxSizer" expanded="false">
+                    <object class="wxStaticBoxSizer" expanded="true">
                       <property name="id">wxID_ANY</property>
                       <property name="label">JVM</property>
                       <property name="minimum_size"></property>
@@ -530,11 +606,11 @@
                       <property name="orient">wxVERTICAL</property>
                       <property name="parent">1</property>
                       <property name="permission">none</property>
-                      <object class="sizeritem" expanded="false">
+                      <object class="sizeritem" expanded="true">
                         <property name="border">5</property>
                         <property name="flag">wxEXPAND</property>
                         <property name="proportion">1</property>
-                        <object class="wxGridBagSizer" expanded="false">
+                        <object class="wxGridBagSizer" expanded="true">
                           <property name="empty_cell_size"></property>
                           <property name="flexible_direction">wxBOTH</property>
                           <property name="growablecols">1</property>
@@ -773,11 +849,11 @@
                       </object>
                     </object>
                   </object>
-                  <object class="sizeritem" expanded="false">
+                  <object class="sizeritem" expanded="true">
                     <property name="border">5</property>
                     <property name="flag">wxALL|wxEXPAND</property>
                     <property name="proportion">1</property>
-                    <object class="wxStaticBoxSizer" expanded="false">
+                    <object class="wxStaticBoxSizer" expanded="true">
                       <property name="id">wxID_ANY</property>
                       <property name="label">Paths</property>
                       <property name="minimum_size"></property>
@@ -785,11 +861,11 @@
                       <property name="orient">wxVERTICAL</property>
                       <property name="parent">1</property>
                       <property name="permission">none</property>
-                      <object class="sizeritem" expanded="false">
+                      <object class="sizeritem" expanded="true">
                         <property name="border">5</property>
                         <property name="flag">wxEXPAND</property>
                         <property name="proportion">1</property>
-                        <object class="wxGridBagSizer" expanded="false">
+                        <object class="wxGridBagSizer" expanded="true">
                           <property name="empty_cell_size"></property>
                           <property name="flexible_direction">wxBOTH</property>
                           <property name="growablecols">1</property>
@@ -865,6 +941,71 @@
                               <property name="wrap">-1</property>
                             </object>
                           </object>
+                          <object class="gbsizeritem" expanded="true">
+                            <property name="border">5</property>
+                            <property name="colspan">1</property>
+                            <property name="column">0</property>
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
+                            <property name="row">1</property>
+                            <property name="rowspan">1</property>
+                            <object class="wxStaticText" expanded="true">
+                              <property name="BottomDockable">1</property>
+                              <property name="LeftDockable">1</property>
+                              <property name="RightDockable">1</property>
+                              <property name="TopDockable">1</property>
+                              <property name="aui_layer">0</property>
+                              <property name="aui_name"></property>
+                              <property name="aui_position">0</property>
+                              <property name="aui_row">0</property>
+                              <property name="best_size"></property>
+                              <property name="bg"></property>
+                              <property name="caption"></property>
+                              <property name="caption_visible">1</property>
+                              <property name="center_pane">0</property>
+                              <property name="close_button">1</property>
+                              <property name="context_help"></property>
+                              <property name="context_menu">1</property>
+                              <property name="default_pane">0</property>
+                              <property name="dock">Dock</property>
+                              <property name="dock_fixed">0</property>
+                              <property name="docking">Left</property>
+                              <property name="drag_accept_files">0</property>
+                              <property name="enabled">1</property>
+                              <property name="fg"></property>
+                              <property name="floatable">1</property>
+                              <property name="font"></property>
+                              <property name="gripper">0</property>
+                              <property name="hidden">0</property>
+                              <property name="id">wxID_ANY</property>
+                              <property name="label">Data path</property>
+                              <property name="markup">0</property>
+                              <property name="max_size"></property>
+                              <property name="maximize_button">0</property>
+                              <property name="maximum_size"></property>
+                              <property name="min_size"></property>
+                              <property name="minimize_button">0</property>
+                              <property name="minimum_size"></property>
+                              <property name="moveable">1</property>
+                              <property name="name">m_staticText61</property>
+                              <property name="pane_border">1</property>
+                              <property name="pane_position"></property>
+                              <property name="pane_size"></property>
+                              <property name="permission">protected</property>
+                              <property name="pin_button">1</property>
+                              <property name="pos"></property>
+                              <property name="resize">Resizable</property>
+                              <property name="show">1</property>
+                              <property name="size"></property>
+                              <property name="style"></property>
+                              <property name="subclass">; ; forward_declare</property>
+                              <property name="toolbar_pane">0</property>
+                              <property name="tooltip"></property>
+                              <property name="window_extra_style"></property>
+                              <property name="window_name"></property>
+                              <property name="window_style"></property>
+                              <property name="wrap">-1</property>
+                            </object>
+                          </object>
                           <object class="gbsizeritem" expanded="false">
                             <property name="border">5</property>
                             <property name="colspan">1</property>
@@ -919,7 +1060,7 @@
                               <property name="resize">Resizable</property>
                               <property name="show">1</property>
                               <property name="size"></property>
-                              <property name="style">wxDIRP_DEFAULT_STYLE|wxDIRP_USE_TEXTCTRL</property>
+                              <property name="style">wxDIRP_USE_TEXTCTRL</property>
                               <property name="subclass">; ; forward_declare</property>
                               <property name="toolbar_pane">0</property>
                               <property name="tooltip"></property>
@@ -934,6 +1075,75 @@
                               <event name="OnDirChanged">OnMountPathChanged</event>
                             </object>
                           </object>
+                          <object class="gbsizeritem" expanded="true">
+                            <property name="border">5</property>
+                            <property name="colspan">1</property>
+                            <property name="column">1</property>
+                            <property name="flag">wxALL|wxEXPAND</property>
+                            <property name="row">1</property>
+                            <property name="rowspan">1</property>
+                            <object class="wxDirPickerCtrl" expanded="true">
+                              <property name="BottomDockable">1</property>
+                              <property name="LeftDockable">1</property>
+                              <property name="RightDockable">1</property>
+                              <property name="TopDockable">1</property>
+                              <property name="aui_layer">0</property>
+                              <property name="aui_name"></property>
+                              <property name="aui_position">0</property>
+                              <property name="aui_row">0</property>
+                              <property name="best_size"></property>
+                              <property name="bg"></property>
+                              <property name="caption"></property>
+                              <property name="caption_visible">1</property>
+                              <property name="center_pane">0</property>
+                              <property name="close_button">1</property>
+                              <property name="context_help"></property>
+                              <property name="context_menu">1</property>
+                              <property name="default_pane">0</property>
+                              <property name="dock">Dock</property>
+                              <property name="dock_fixed">0</property>
+                              <property name="docking">Left</property>
+                              <property name="drag_accept_files">0</property>
+                              <property name="enabled">1</property>
+                              <property name="fg"></property>
+                              <property name="floatable">1</property>
+                              <property name="font"></property>
+                              <property name="gripper">0</property>
+                              <property name="hidden">0</property>
+                              <property name="id">wxID_ANY</property>
+                              <property name="max_size"></property>
+                              <property name="maximize_button">0</property>
+                              <property name="maximum_size"></property>
+                              <property name="message">Select a folder</property>
+                              <property name="min_size"></property>
+                              <property name="minimize_button">0</property>
+                              <property name="minimum_size"></property>
+                              <property name="moveable">1</property>
+                              <property name="name">m_dataPathDirPicker</property>
+                              <property name="pane_border">1</property>
+                              <property name="pane_position"></property>
+                              <property name="pane_size"></property>
+                              <property name="permission">protected</property>
+                              <property name="pin_button">1</property>
+                              <property name="pos"></property>
+                              <property name="resize">Resizable</property>
+                              <property name="show">1</property>
+                              <property name="size"></property>
+                              <property name="style">wxDIRP_USE_TEXTCTRL</property>
+                              <property name="subclass">; ; forward_declare</property>
+                              <property name="toolbar_pane">0</property>
+                              <property name="tooltip"></property>
+                              <property name="validator_data_type"></property>
+                              <property name="validator_style">wxFILTER_NONE</property>
+                              <property name="validator_type">wxDefaultValidator</property>
+                              <property name="validator_variable"></property>
+                              <property name="value"></property>
+                              <property name="window_extra_style"></property>
+                              <property name="window_name"></property>
+                              <property name="window_style"></property>
+                              <event name="OnDirChanged">OnDataPathChanged</event>
+                            </object>
+                          </object>
                         </object>
                       </object>
                     </object>
@@ -1002,7 +1212,7 @@
             <object class="notebookpage" expanded="true">
               <property name="bitmap"></property>
               <property name="label">a page</property>
-              <property name="select">1</property>
+              <property name="select">0</property>
               <object class="wxPanel" expanded="true">
                 <property name="BottomDockable">1</property>
                 <property name="LeftDockable">1</property>
@@ -1055,23 +1265,6 @@
                 <property name="window_extra_style"></property>
                 <property name="window_name"></property>
                 <property name="window_style">wxTAB_TRAVERSAL</property>
-                <object class="wxBoxSizer" expanded="true">
-                  <property name="minimum_size"></property>
-                  <property name="name">bSizer4</property>
-                  <property name="orient">wxVERTICAL</property>
-                  <property name="permission">none</property>
-                  <object class="sizeritem" expanded="true">
-                    <property name="border">5</property>
-                    <property name="flag">wxEXPAND</property>
-                    <property name="proportion">1</property>
-                    <object class="wxBoxSizer" expanded="true">
-                      <property name="minimum_size"></property>
-                      <property name="name">bSizer51</property>
-                      <property name="orient">wxHORIZONTAL</property>
-                      <property name="permission">none</property>
-                    </object>
-                  </object>
-                </object>
               </object>
             </object>
           </object>

launcher/libjvm_wrapper/CMakeLists.txt

@@ -1,12 +0,0 @@
-add_library(libjvm_wrapper
-        src/LibjvmWrapper.cpp
-        include_public/LibjvmWrapper.hpp
-)
-
-target_include_directories(libjvm_wrapper PRIVATE include)
-target_include_directories(libjvm_wrapper PUBLIC include_public)
-
-find_package(JNI REQUIRED)
-target_include_directories(libjvm_wrapper PUBLIC ${JNI_INCLUDE_DIRS})
-
-target_link_libraries(libjvm_wrapper PUBLIC utils)

launcher/libjvm_wrapper/include_public/LibjvmWrapper.hpp

@@ -1,34 +0,0 @@
-//
-// Created by Stepan Usatiuk on 24.06.2025.
-//
-
-#ifndef LIBJVMWRAPPER_HPP
-#define LIBJVMWRAPPER_HPP
-
-#include <jni.h>
-#include <string>
-
-class LibjvmWrapper {
-public:
-    static LibjvmWrapper& instance();
-
-    void setJavaHome(const std::string& javaHome);
-
-    decltype(JNI_CreateJavaVM)* get_JNI_CreateJavaVM();
-
-private:
-    void load();
-
-    void unload();
-
-    LibjvmWrapper();
-
-    ~LibjvmWrapper();
-
-    void* _lib_handle = nullptr;
-    decltype(JNI_CreateJavaVM)* WJNI_CreateJavaVM = nullptr;
-    std::string _java_home;
-};
-
-
-#endif //LIBJVMWRAPPER_HPP

launcher/libjvm_wrapper/src/LibjvmWrapper.cpp

@@ -1,59 +0,0 @@
-//
-// Created by Stepan Usatiuk on 24.06.2025.
-//
-
-#include "LibjvmWrapper.hpp"
-#include <dlfcn.h>
-#include <jni.h>
-
-#include "Exception.h"
-
-LibjvmWrapper& LibjvmWrapper::instance() {
-    static LibjvmWrapper instance;
-    return instance;
-}
-
-LibjvmWrapper::LibjvmWrapper() {
-}
-
-void LibjvmWrapper::load() {
-    if (_java_home == "")
-        throw Exception("Java home not set");
-    if (_lib_handle != nullptr)
-        throw Exception("load() called when already loaded");
-
-    std::string javaHomeAppended;
-    javaHomeAppended = _java_home + "/lib/server/libjvm.so";
-
-    _lib_handle = dlopen(javaHomeAppended.c_str(), RTLD_NOW | RTLD_GLOBAL);
-    if (_lib_handle == nullptr)
-        throw Exception(dlerror());
-    WJNI_CreateJavaVM = reinterpret_cast<decltype(WJNI_CreateJavaVM)>(
-        dlsym(_lib_handle, "JNI_CreateJavaVM"));
-    if (WJNI_CreateJavaVM == nullptr)
-        throw Exception(dlerror());
-}
-
-void LibjvmWrapper::unload() {
-    if (_lib_handle != nullptr) {
-        dlclose(_lib_handle);
-        _lib_handle = nullptr;
-        WJNI_CreateJavaVM = nullptr;
-    }
-}
-
-decltype(JNI_CreateJavaVM)* LibjvmWrapper::get_JNI_CreateJavaVM() {
-    if (WJNI_CreateJavaVM == nullptr) {
-        load();
-    }
-    return WJNI_CreateJavaVM;
-}
-
-LibjvmWrapper::~LibjvmWrapper() {
-    unload();
-}
-
-void LibjvmWrapper::setJavaHome(const std::string& javaHome) {
-    unload();
-    _java_home = javaHome;
-}

launcher/utils/src/Exception.cpp

@@ -7,8 +7,6 @@
 #include <execinfo.h>
 #include <sstream>
 
-#include <openssl/err.h>
-
 Exception::Exception(const std::string& text) : runtime_error(text + "\n" + getStacktrace()) {
 }
 

run-wrapper/run

@@ -42,8 +42,7 @@ fi
     --add-exports java.base/sun.nio.ch=ALL-UNNAMED \
     --add-exports java.base/jdk.internal.access=ALL-UNNAMED \
     --add-opens=java.base/java.nio=ALL-UNNAMED \
-    -Ddhfs.objects.persistence.files.root="$SCRIPT_DIR"/../data/objects \
-    -Ddhfs.objects.persistence.stuff.root="$SCRIPT_DIR"/../data/stuff \
+    -Ddhfs.objects.persistence.root="$SCRIPT_DIR"/../data \
     -Ddhfs.fuse.root="$SCRIPT_DIR"/../fuse \
     -Dquarkus.http.host=0.0.0.0 \
     -Dquarkus.log.category.\"com.usatiuk\".level=INFO \