From 1d79a22041e42e069a3cf2e13961ccf449ed5785 Mon Sep 17 00:00:00 2001 From: Willem Date: Tue, 15 Jul 2025 14:13:02 +0200 Subject: [PATCH] Moved Warpship to root and renamed override and cleaned log output --- .gitignore | 5 +- README.md | 5 +- .../Warpship => Warpship}/Hyperdrive/.root | 0 .../Warpship => Warpship}/logback.xml | 9 +--- Warpship/warp-override.xml | 27 ++++++++++ .../Warpship => Warpship}/warp-ship.xml | 0 .../Warpship/local-override.xml | 27 ---------- gdxapp4d-boot-desktop/pom.xml | 3 +- .../src/main/chain/warp-sea.xml | 2 +- .../gdxapp4d/tos4/GDXAppTos4Activator.java | 11 ++-- pom.xml | 50 +++++++++---------- 11 files changed, 63 insertions(+), 76 deletions(-) rename {gdxapp4d-boot-desktop/Warpship => Warpship}/Hyperdrive/.root (100%) rename {gdxapp4d-boot-desktop/Warpship => Warpship}/logback.xml (65%) create mode 100644 Warpship/warp-override.xml rename {gdxapp4d-boot-desktop/Warpship => Warpship}/warp-ship.xml (100%) delete mode 100644 gdxapp4d-boot-desktop/Warpship/local-override.xml diff --git a/.gitignore b/.gitignore index 9f889351..e2d72db8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,9 +3,8 @@ # # Ignore project resources -gdxapp4d-boot-desktop/warpcore.xml -gdxapp4d-boot-desktop/etc -gdxapp4d-boot-desktop/Warpship/etc +Warpship/etc +Warpship/Hyperdrive/* # Ignore maven resources target diff --git a/README.md b/README.md index c7d52896..9aa82911 100644 --- a/README.md +++ b/README.md @@ -37,12 +37,13 @@ Requirements; Test launch from command line; ``` -mvn verify -P test-none,run +mvn verify -P test-run ``` In an IDE setup an runner with the main class from gdxapp4d-boot-desktop module; `love.distributedrebirth.gdxapp4d.boot.desktop.GDXAppDesktopLauncher` -And append `use-local` as an argument of the main launcher to use the local chains. (as the real are fake) +And append `use-local` as an argument of the main launcher to use the local chains. (as the real are fake) +And set the working directory to the top level gdxapp4d. (in eclipse use other with: ${workspace_loc:gdxapp4d}) ## Duytschen Code diff --git a/gdxapp4d-boot-desktop/Warpship/Hyperdrive/.root b/Warpship/Hyperdrive/.root similarity index 100% rename from gdxapp4d-boot-desktop/Warpship/Hyperdrive/.root rename to Warpship/Hyperdrive/.root diff --git a/gdxapp4d-boot-desktop/Warpship/logback.xml b/Warpship/logback.xml similarity index 65% rename from gdxapp4d-boot-desktop/Warpship/logback.xml rename to Warpship/logback.xml index 2a5a4e18..db86530e 100644 --- a/gdxapp4d-boot-desktop/Warpship/logback.xml +++ b/Warpship/logback.xml @@ -21,14 +21,9 @@ - - - - + - - - + diff --git a/Warpship/warp-override.xml b/Warpship/warp-override.xml new file mode 100644 index 00000000..ae9ebddd --- /dev/null +++ b/Warpship/warp-override.xml @@ -0,0 +1,27 @@ + + + + ../gdxapp4d-chain-boot-ship-engine/target/chain + ../gdxapp4d-chain-boot-warp-sea/target/chain + + ../gdxapp4d-chain-dep-osgi-lib/target/chain + ../gdxapp4d-chain-dep-osgi-scr/target/chain + ../gdxapp4d-chain-font-unicode4d/target/chain + ../gdxapp4d-chain-default-music/target/chain + ../gdxapp4d-chain-default-apps/target/chain + ../gdxapp4d-app-calculator/target/classes + ../gdxapp4d-app-hewallet/target/classes + ../gdxapp4d-app-tosamp/target/classes + ../gdxapp4d-app-notepad/target/classes + ../gdxapp4d-app-glyphdemo/target/classes + ../gdxapp4d-app-mmdoc/target/classes + + ../gdxapp4d-chain-mod-vrgem4/target/chain + ../gdxapp4d-vrgem4/target/classes + + ../gdxapp4d-chain-mod-vrsys5/target/chain + ../gdxapp4d-vrsys5/target/classes + + ../gdxapp4d-chain-mod-unitxc/target/chain + ../gdxapp4d-unitxc/target/classes + diff --git a/gdxapp4d-boot-desktop/Warpship/warp-ship.xml b/Warpship/warp-ship.xml similarity index 100% rename from gdxapp4d-boot-desktop/Warpship/warp-ship.xml rename to Warpship/warp-ship.xml diff --git a/gdxapp4d-boot-desktop/Warpship/local-override.xml b/gdxapp4d-boot-desktop/Warpship/local-override.xml deleted file mode 100644 index b803f1b1..00000000 --- a/gdxapp4d-boot-desktop/Warpship/local-override.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - ../../gdxapp4d-chain-boot-ship-engine/target/chain - ../../gdxapp4d-chain-boot-warp-sea/target/chain - - ../../gdxapp4d-chain-dep-osgi-lib/target/chain - ../../gdxapp4d-chain-dep-osgi-scr/target/chain - ../../gdxapp4d-chain-font-unicode4d/target/chain - ../../gdxapp4d-chain-default-music/target/chain - ../../gdxapp4d-chain-default-apps/target/chain - ../../gdxapp4d-app-calculator/target/classes - ../../gdxapp4d-app-hewallet/target/classes - ../../gdxapp4d-app-tosamp/target/classes - ../../gdxapp4d-app-notepad/target/classes - ../../gdxapp4d-app-glyphdemo/target/classes - ../../gdxapp4d-app-mmdoc/target/classes - - ../../gdxapp4d-chain-mod-vrgem4/target/chain - ../../gdxapp4d-vrgem4/target/classes - - ../../gdxapp4d-chain-mod-vrsys5/target/chain - ../../gdxapp4d-vrsys5/target/classes - - ../../gdxapp4d-chain-mod-unitxc/target/chain - ../../gdxapp4d-unitxc/target/classes - diff --git a/gdxapp4d-boot-desktop/pom.xml b/gdxapp4d-boot-desktop/pom.xml index d02fb2a2..e0bf0e57 100644 --- a/gdxapp4d-boot-desktop/pom.xml +++ b/gdxapp4d-boot-desktop/pom.xml @@ -48,7 +48,7 @@ - run + test-run @@ -58,7 +58,6 @@ love.distributedrebirth.gdxapp4d.boot.desktop.GDXAppDesktopLauncher use-local - nosync diff --git a/gdxapp4d-chain-mod-vrgem4/src/main/chain/warp-sea.xml b/gdxapp4d-chain-mod-vrgem4/src/main/chain/warp-sea.xml index bc25cdbf..c4ae95cc 100644 --- a/gdxapp4d-chain-mod-vrgem4/src/main/chain/warp-sea.xml +++ b/gdxapp4d-chain-mod-vrgem4/src/main/chain/warp-sea.xml @@ -3,7 +3,7 @@ xmlns:link="http://warp-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-link" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://wrap-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-root http://warp-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-root-1.0.xsd"> - + diff --git a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4Activator.java b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4Activator.java index 408a1a49..909dc2ce 100644 --- a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4Activator.java +++ b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4Activator.java @@ -144,10 +144,7 @@ public class GDXAppTos4Activator implements BundleActivator { boolean useLocal = args.contains("use-local"); - warpshipHome = new File(".", WARPSHIP_HOME); - if (!warpshipHome.exists()) { - warpshipHome = new File("gdxapp4d-boot-desktop", WARPSHIP_HOME); // tmp for: mvn verify -P test-none,run - } + warpshipHome = new File(WARPSHIP_HOME); if (!warpshipHome.exists()) { bootScreen.bootLineError("ERROR: No Warpship home."); startError = true; @@ -180,7 +177,7 @@ public class GDXAppTos4Activator implements BundleActivator { localOverrides = new Properties(); if (useLocal) { - File localOverride = new File(warpshipHome, "local-override.xml"); + File localOverride = new File(warpshipHome, "warp-override.xml"); if (localOverride.exists()) { try { localOverrides.loadFromXML(new FileInputStream(localOverride)); @@ -192,9 +189,9 @@ public class GDXAppTos4Activator implements BundleActivator { String value = localOverrides.getProperty(key); localOverrides.setProperty(key, warpshipHome.getAbsolutePath() + "/" + value); } - bootScreen.bootLine("use-local: local-override.xml loaded: " + localOverrides.size()); + bootScreen.bootLine("use-local: warp-override.xml loaded: " + localOverrides.size()); } else { - bootScreen.bootLine("use-local: local-override.xml not found."); + bootScreen.bootLine("use-local: warp-override.xml not found."); } } diff --git a/pom.xml b/pom.xml index dfa3f1dc..d6e95d32 100644 --- a/pom.xml +++ b/pom.xml @@ -610,25 +610,10 @@ - build - - - - maven-source-plugin - - - attach-sources - - jar - - - - - - - - - run + test-run + + true + @@ -648,6 +633,24 @@ + + build + + + + maven-source-plugin + + + attach-sources + + jar + + + + + + + mvn-versions-check @@ -736,13 +739,6 @@ - - 3.2.2 Needs maven 3.2.2 for: maven.build.timestamp is in UTC @@ -754,7 +750,7 @@