From 5e3a2c2103c715b056a57f7d9f31632f1c11cd5a Mon Sep 17 00:00:00 2001 From: Willem Date: Sat, 14 Dec 2024 20:04:14 +0100 Subject: [PATCH] Moved zerofungus --- .../conf/logback-server-console.xml | 0 .../conf/logback-server.xml | 0 .../pom.xml | 2 +- .../nx01/zerofungus/server}/ZFunRtsServer.java | 2 +- .../nx01/zerofungus/server}/ZFunRtsServerBooted.java | 2 +- .../nx01/zerofungus/server}/ZeroFungus.java | 9 ++++----- .../server}/service/ZFunRtsConfigJetty.java | 4 ++-- .../server}/service/ZFunRtsConfigLogger.java | 2 +- .../zerofungus/server}/service/ZFunRtsInitJdbc.java | 2 +- .../nx01/zerofungus/server}/web/RedirectServlet.java | 2 +- .../resources/db/migration/V00/V00_01__init_db.sql | 0 .../resources/db/migration/V00/V00_02__init_data.sql | 0 .../db/migration/V00/V00_03__h2-wcontest-428.sql | 0 .../src/main/resources/static/powp/error/errmsg.css | 0 .../src/main/resources/static/powp/error/errmsg.html | 0 pom.xml | 12 ++++++------ 16 files changed, 18 insertions(+), 19 deletions(-) rename {nx01-no2all-zerofungus => nx01-zerofungus-server}/conf/logback-server-console.xml (100%) rename {nx01-no2all-zerofungus => nx01-zerofungus-server}/conf/logback-server.xml (100%) rename {nx01-no2all-zerofungus => nx01-zerofungus-server}/pom.xml (96%) rename {nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus => nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server}/ZFunRtsServer.java (97%) rename {nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus => nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server}/ZFunRtsServerBooted.java (94%) rename {nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus => nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server}/ZeroFungus.java (87%) rename {nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus => nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server}/service/ZFunRtsConfigJetty.java (97%) rename {nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus => nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server}/service/ZFunRtsConfigLogger.java (96%) rename {nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus => nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server}/service/ZFunRtsInitJdbc.java (97%) rename {nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus => nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server}/web/RedirectServlet.java (88%) rename {nx01-no2all-zerofungus => nx01-zerofungus-server}/src/main/resources/db/migration/V00/V00_01__init_db.sql (100%) rename {nx01-no2all-zerofungus => nx01-zerofungus-server}/src/main/resources/db/migration/V00/V00_02__init_data.sql (100%) rename {nx01-no2all-zerofungus => nx01-zerofungus-server}/src/main/resources/db/migration/V00/V00_03__h2-wcontest-428.sql (100%) rename {nx01-no2all-zerofungus => nx01-zerofungus-server}/src/main/resources/static/powp/error/errmsg.css (100%) rename {nx01-no2all-zerofungus => nx01-zerofungus-server}/src/main/resources/static/powp/error/errmsg.html (100%) diff --git a/nx01-no2all-zerofungus/conf/logback-server-console.xml b/nx01-zerofungus-server/conf/logback-server-console.xml similarity index 100% rename from nx01-no2all-zerofungus/conf/logback-server-console.xml rename to nx01-zerofungus-server/conf/logback-server-console.xml diff --git a/nx01-no2all-zerofungus/conf/logback-server.xml b/nx01-zerofungus-server/conf/logback-server.xml similarity index 100% rename from nx01-no2all-zerofungus/conf/logback-server.xml rename to nx01-zerofungus-server/conf/logback-server.xml diff --git a/nx01-no2all-zerofungus/pom.xml b/nx01-zerofungus-server/pom.xml similarity index 96% rename from nx01-no2all-zerofungus/pom.xml rename to nx01-zerofungus-server/pom.xml index e429bba..dec12c3 100644 --- a/nx01-no2all-zerofungus/pom.xml +++ b/nx01-zerofungus-server/pom.xml @@ -6,7 +6,7 @@ nx01 〇一。壬寅。一〄-SNAPSHOT - nx01-no2all-zerofungus + nx01-zerofungus-server org.junit.jupiter diff --git a/nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/ZFunRtsServer.java b/nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/ZFunRtsServer.java similarity index 97% rename from nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/ZFunRtsServer.java rename to nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/ZFunRtsServer.java index d6f0c45..c754dfb 100644 --- a/nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/ZFunRtsServer.java +++ b/nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/ZFunRtsServer.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.no2all.zerofungus; +package love.distributedrebirth.nx01.zerofungus.server; import java.io.StringWriter; import java.sql.Connection; diff --git a/nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/ZFunRtsServerBooted.java b/nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/ZFunRtsServerBooted.java similarity index 94% rename from nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/ZFunRtsServerBooted.java rename to nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/ZFunRtsServerBooted.java index 290ace0..7d24bea 100644 --- a/nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/ZFunRtsServerBooted.java +++ b/nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/ZFunRtsServerBooted.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.no2all.zerofungus; +package love.distributedrebirth.nx01.zerofungus.server; import java.util.logging.Logger; diff --git a/nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/ZeroFungus.java b/nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/ZeroFungus.java similarity index 87% rename from nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/ZeroFungus.java rename to nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/ZeroFungus.java index 0f31d64..65703e6 100644 --- a/nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/ZeroFungus.java +++ b/nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/ZeroFungus.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.no2all.zerofungus; +package love.distributedrebirth.nx01.zerofungus.server; import java.io.File; import java.util.ArrayList; @@ -13,12 +13,11 @@ import love.distributedrebirth.no2all.react.nostr.server.relay.NoStrRtsServerRel import love.distributedrebirth.no2all.react.wire.client.No2AllRtsClient; import love.distributedrebirth.no2all.react.wire.server.No2AllRtsServer; import love.distributedrebirth.no2all.react.wire.server.No2AllRtsServerLog; -import love.distributedrebirth.no2all.zerofungus.service.ZFunRtsConfigJetty; -import love.distributedrebirth.no2all.zerofungus.service.ZFunRtsConfigLogger; -//import ᒢᐩᐩ.ᔿᐤᒄʸ.ᣔᒃᣔᒼᓑᔆ.BãßBȍőnAbacusInstanceMBeanʸᴰ; -import love.distributedrebirth.no2all.zerofungus.service.ZFunRtsInitJdbc; import love.distributedrebirth.nx01.warp.core.WarpCoreReactor; import love.distributedrebirth.nx01.warp.core.WarpCoreSpeedMonitor; +import love.distributedrebirth.nx01.zerofungus.server.service.ZFunRtsConfigJetty; +import love.distributedrebirth.nx01.zerofungus.server.service.ZFunRtsConfigLogger; +import love.distributedrebirth.nx01.zerofungus.server.service.ZFunRtsInitJdbc; public enum ZeroFungus /* implements BãßBȍőnAbacusInstanceMBeanʸᴰ */ { INSTANCE; diff --git a/nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/service/ZFunRtsConfigJetty.java b/nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/service/ZFunRtsConfigJetty.java similarity index 97% rename from nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/service/ZFunRtsConfigJetty.java rename to nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/service/ZFunRtsConfigJetty.java index 9fc09ec..d5214c9 100644 --- a/nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/service/ZFunRtsConfigJetty.java +++ b/nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/service/ZFunRtsConfigJetty.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.no2all.zerofungus.service; +package love.distributedrebirth.nx01.zerofungus.server.service; import java.io.IOException; import java.net.URL; @@ -23,12 +23,12 @@ import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerI import love.distributedrebirth.no2all.react.wire.server.No2AllActServer; import love.distributedrebirth.no2all.react.wire.server.No2AllRtsServer; import love.distributedrebirth.no2all.wire.jetty.JettyWireServerEndpoint; -import love.distributedrebirth.no2all.zerofungus.web.RedirectServlet; import love.distributedrebirth.nx01.warp.core.react.WarpReact; import love.distributedrebirth.nx01.warp.core.react.WarpReactPlasma; import love.distributedrebirth.nx01.warp.core.react.WarpReactPlasmaPulse; import love.distributedrebirth.nx01.warp.core.react.WarpReactTypeScript; import love.distributedrebirth.nx01.warp.core.space.WarpSpaceAntimatterInducer; +import love.distributedrebirth.nx01.zerofungus.server.web.RedirectServlet; public final class ZFunRtsConfigJetty implements WarpReactTypeScript { diff --git a/nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/service/ZFunRtsConfigLogger.java b/nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/service/ZFunRtsConfigLogger.java similarity index 96% rename from nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/service/ZFunRtsConfigLogger.java rename to nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/service/ZFunRtsConfigLogger.java index f010d07..20420f7 100644 --- a/nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/service/ZFunRtsConfigLogger.java +++ b/nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/service/ZFunRtsConfigLogger.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.no2all.zerofungus.service; +package love.distributedrebirth.nx01.zerofungus.server.service; import java.util.logging.Logger; diff --git a/nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/service/ZFunRtsInitJdbc.java b/nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/service/ZFunRtsInitJdbc.java similarity index 97% rename from nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/service/ZFunRtsInitJdbc.java rename to nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/service/ZFunRtsInitJdbc.java index a94c99f..2dc7ce0 100644 --- a/nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/service/ZFunRtsInitJdbc.java +++ b/nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/service/ZFunRtsInitJdbc.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.no2all.zerofungus.service; +package love.distributedrebirth.nx01.zerofungus.server.service; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/web/RedirectServlet.java b/nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/web/RedirectServlet.java similarity index 88% rename from nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/web/RedirectServlet.java rename to nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/web/RedirectServlet.java index a0d8008..6644d8a 100644 --- a/nx01-no2all-zerofungus/src/main/java/love/distributedrebirth/no2all/zerofungus/web/RedirectServlet.java +++ b/nx01-zerofungus-server/src/main/java/love/distributedrebirth/nx01/zerofungus/server/web/RedirectServlet.java @@ -1,4 +1,4 @@ -package love.distributedrebirth.no2all.zerofungus.web; +package love.distributedrebirth.nx01.zerofungus.server.web; import java.io.IOException; diff --git a/nx01-no2all-zerofungus/src/main/resources/db/migration/V00/V00_01__init_db.sql b/nx01-zerofungus-server/src/main/resources/db/migration/V00/V00_01__init_db.sql similarity index 100% rename from nx01-no2all-zerofungus/src/main/resources/db/migration/V00/V00_01__init_db.sql rename to nx01-zerofungus-server/src/main/resources/db/migration/V00/V00_01__init_db.sql diff --git a/nx01-no2all-zerofungus/src/main/resources/db/migration/V00/V00_02__init_data.sql b/nx01-zerofungus-server/src/main/resources/db/migration/V00/V00_02__init_data.sql similarity index 100% rename from nx01-no2all-zerofungus/src/main/resources/db/migration/V00/V00_02__init_data.sql rename to nx01-zerofungus-server/src/main/resources/db/migration/V00/V00_02__init_data.sql diff --git a/nx01-no2all-zerofungus/src/main/resources/db/migration/V00/V00_03__h2-wcontest-428.sql b/nx01-zerofungus-server/src/main/resources/db/migration/V00/V00_03__h2-wcontest-428.sql similarity index 100% rename from nx01-no2all-zerofungus/src/main/resources/db/migration/V00/V00_03__h2-wcontest-428.sql rename to nx01-zerofungus-server/src/main/resources/db/migration/V00/V00_03__h2-wcontest-428.sql diff --git a/nx01-no2all-zerofungus/src/main/resources/static/powp/error/errmsg.css b/nx01-zerofungus-server/src/main/resources/static/powp/error/errmsg.css similarity index 100% rename from nx01-no2all-zerofungus/src/main/resources/static/powp/error/errmsg.css rename to nx01-zerofungus-server/src/main/resources/static/powp/error/errmsg.css diff --git a/nx01-no2all-zerofungus/src/main/resources/static/powp/error/errmsg.html b/nx01-zerofungus-server/src/main/resources/static/powp/error/errmsg.html similarity index 100% rename from nx01-no2all-zerofungus/src/main/resources/static/powp/error/errmsg.html rename to nx01-zerofungus-server/src/main/resources/static/powp/error/errmsg.html diff --git a/pom.xml b/pom.xml index a990ce1..29ab63b 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,6 @@ nx01-no2all-wire-jetty nx01-no2all-wire-jre nx01-no2all-wire-ojw - nx01-no2all-zerofungus nx01-poop-scripts nx01-popcorn nx01-popcorn-duytsdoc @@ -54,6 +53,7 @@ nx01-x4o-tool-ant-plugin nx01-x4o-tool-maven-plugin nx01-x4o-html + nx01-zerofungus-server @@ -318,11 +318,6 @@ nx01-no2all-wire-ojw ${project.version} - - love.distributedrebirth.nx01 - nx01-no2all-zerofungus - ${project.version} - love.distributedrebirth.nx01 nx01-poop-scripts @@ -414,6 +409,11 @@ nx01-x4o-tool-maven-plugin ${project.version} + + love.distributedrebirth.nx01 + nx01-zerofungus-server + ${project.version} +