Moved Warpship to root and renamed override and cleaned log output
This commit is contained in:
parent
ba99c5bdb6
commit
1d79a22041
11 changed files with 63 additions and 76 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -21,14 +21,9 @@
|
|||
<appender-ref ref="STDOUT" />
|
||||
</root>
|
||||
|
||||
<!-- Package opens. -->
|
||||
<logger level="DEBUG" name="ᒢᐩᐩ"/>
|
||||
|
||||
<!-- Package limits. -->
|
||||
<logger level="INFO" name="ᒢᐩᐩ"/>
|
||||
<logger level="INFO" name="com.badlogic"/>
|
||||
<logger level="INFO" name="org.x4o"/>
|
||||
<logger level="ERROR" name="ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᒃᐤᣔᐪ.BãßBȍőnBőatGrav͜eDigge͗ŕ"/>
|
||||
<logger level="ERROR" name="ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.BãßBȍőn𓄯"/>
|
||||
<logger level="ERROR" name="ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ.ᐪᓫᣗᔿᑊᣕᣔᐪᐤᣗ.ᐦ.Terminator𓄯"/>
|
||||
<logger level="INFO" name="org.apache.aries.spifly.BaseActivator"/>
|
||||
|
||||
</configuration>
|
||||
27
Warpship/warp-override.xml
Normal file
27
Warpship/warp-override.xml
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
|
||||
<properties>
|
||||
<entry key="1c2d010066a39d96ace8af0ecc37c72d6f79109f30939e2959befcd9ce25fc8d">../gdxapp4d-chain-boot-ship-engine/target/chain</entry>
|
||||
<entry key="f8be3b29da5b6b2cb464f781469ceede6ccfd848d158293a4cdffbc2c41a410b">../gdxapp4d-chain-boot-warp-sea/target/chain</entry>
|
||||
|
||||
<entry key="7777aa29da5b6b2cb464f781469ceede6ccfd848d158293a4cdffbc2c41b58de">../gdxapp4d-chain-dep-osgi-lib/target/chain</entry>
|
||||
<entry key="8833aa29da5b6b2cb464f781469ceede6ccfd848d158293a4cdffbc2c41b58de">../gdxapp4d-chain-dep-osgi-scr/target/chain</entry>
|
||||
<entry key="9944bb29da5b6b2cb464f781469ceede6ccfd848d158293a4cdffbc2c41b62ed">../gdxapp4d-chain-font-unicode4d/target/chain</entry>
|
||||
<entry key="ffee3329da5b6b2cb4befcc14aac55de6777d848d158293a4cdffbc2c41b12ad">../gdxapp4d-chain-default-music/target/chain</entry>
|
||||
<entry key="7744aa29da5b6b2cb4b8f781469c33de688fd848d158293a4cdddbc2c41b12aa">../gdxapp4d-chain-default-apps/target/chain</entry>
|
||||
<entry key="7744aa29da5b6b2cb4b8f781469c33de688fd848d158293a4cdddbc2c41b12aa.bundle/gdxapp4d-app-calculator.jar">../gdxapp4d-app-calculator/target/classes</entry>
|
||||
<entry key="7744aa29da5b6b2cb4b8f781469c33de688fd848d158293a4cdddbc2c41b12aa.bundle/gdxapp4d-app-hewallet.jar">../gdxapp4d-app-hewallet/target/classes</entry>
|
||||
<entry key="7744aa29da5b6b2cb4b8f781469c33de688fd848d158293a4cdddbc2c41b12aa.bundle/gdxapp4d-app-tosamp.jar">../gdxapp4d-app-tosamp/target/classes</entry>
|
||||
<entry key="7744aa29da5b6b2cb4b8f781469c33de688fd848d158293a4cdddbc2c41b12aa.bundle/gdxapp4d-app-notepad.jar">../gdxapp4d-app-notepad/target/classes</entry>
|
||||
<entry key="7744aa29da5b6b2cb4b8f781469c33de688fd848d158293a4cdddbc2c41b12aa.bundle/gdxapp4d-app-glyphdemo.jar">../gdxapp4d-app-glyphdemo/target/classes</entry>
|
||||
<entry key="7744aa29da5b6b2cb4b8f781469c33de688fd848d158293a4cdddbc2c41b12aa.bundle/gdxapp4d-app-mmdoc.jar">../gdxapp4d-app-mmdoc/target/classes</entry>
|
||||
|
||||
<entry key="2222010099a37897688af0ecc37c72d6faabb7709ee39e2959befcd9ce253333">../gdxapp4d-chain-mod-vrgem4/target/chain</entry>
|
||||
<entry key="2222010099a37897688af0ecc37c72d6faabb7709ee39e2959befcd9ce253333.bundle/gdxapp4d-vrgem4.jar">../gdxapp4d-vrgem4/target/classes</entry>
|
||||
|
||||
<entry key="ccba3b29da8b1b1cb444f381449beede3cbfd442d158293a4cdffbc3c41a31cc">../gdxapp4d-chain-mod-vrsys5/target/chain</entry>
|
||||
<entry key="ccba3b29da8b1b1cb444f381449beede3cbfd442d158293a4cdffbc3c41a31cc.bundle/gdxapp4d-vrsys5.jar">../gdxapp4d-vrsys5/target/classes</entry>
|
||||
|
||||
<entry key="12343b29da8b1b1cb444f381449beede3cbfd442d158293a4cdffbc3c41a7890">../gdxapp4d-chain-mod-unitxc/target/chain</entry>
|
||||
<entry key="12343b29da8b1b1cb444f381449beede3cbfd442d158293a4cdffbc3c41a7890.bundle/gdxapp4d-unitxc.jar">../gdxapp4d-unitxc/target/classes</entry>
|
||||
</properties>
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
|
||||
<properties>
|
||||
<entry key="1c2d010066a39d96ace8af0ecc37c72d6f79109f30939e2959befcd9ce25fc8d">../../gdxapp4d-chain-boot-ship-engine/target/chain</entry>
|
||||
<entry key="f8be3b29da5b6b2cb464f781469ceede6ccfd848d158293a4cdffbc2c41a410b">../../gdxapp4d-chain-boot-warp-sea/target/chain</entry>
|
||||
|
||||
<entry key="7777aa29da5b6b2cb464f781469ceede6ccfd848d158293a4cdffbc2c41b58de">../../gdxapp4d-chain-dep-osgi-lib/target/chain</entry>
|
||||
<entry key="8833aa29da5b6b2cb464f781469ceede6ccfd848d158293a4cdffbc2c41b58de">../../gdxapp4d-chain-dep-osgi-scr/target/chain</entry>
|
||||
<entry key="9944bb29da5b6b2cb464f781469ceede6ccfd848d158293a4cdffbc2c41b62ed">../../gdxapp4d-chain-font-unicode4d/target/chain</entry>
|
||||
<entry key="ffee3329da5b6b2cb4befcc14aac55de6777d848d158293a4cdffbc2c41b12ad">../../gdxapp4d-chain-default-music/target/chain</entry>
|
||||
<entry key="7744aa29da5b6b2cb4b8f781469c33de688fd848d158293a4cdddbc2c41b12aa">../../gdxapp4d-chain-default-apps/target/chain</entry>
|
||||
<entry key="7744aa29da5b6b2cb4b8f781469c33de688fd848d158293a4cdddbc2c41b12aa.bundle/gdxapp4d-app-calculator.jar">../../gdxapp4d-app-calculator/target/classes</entry>
|
||||
<entry key="7744aa29da5b6b2cb4b8f781469c33de688fd848d158293a4cdddbc2c41b12aa.bundle/gdxapp4d-app-hewallet.jar">../../gdxapp4d-app-hewallet/target/classes</entry>
|
||||
<entry key="7744aa29da5b6b2cb4b8f781469c33de688fd848d158293a4cdddbc2c41b12aa.bundle/gdxapp4d-app-tosamp.jar">../../gdxapp4d-app-tosamp/target/classes</entry>
|
||||
<entry key="7744aa29da5b6b2cb4b8f781469c33de688fd848d158293a4cdddbc2c41b12aa.bundle/gdxapp4d-app-notepad.jar">../../gdxapp4d-app-notepad/target/classes</entry>
|
||||
<entry key="7744aa29da5b6b2cb4b8f781469c33de688fd848d158293a4cdddbc2c41b12aa.bundle/gdxapp4d-app-glyphdemo.jar">../../gdxapp4d-app-glyphdemo/target/classes</entry>
|
||||
<entry key="7744aa29da5b6b2cb4b8f781469c33de688fd848d158293a4cdddbc2c41b12aa.bundle/gdxapp4d-app-mmdoc.jar">../../gdxapp4d-app-mmdoc/target/classes</entry>
|
||||
|
||||
<entry key="2222010099a37897688af0ecc37c72d6faabb7709ee39e2959befcd9ce253333">../../gdxapp4d-chain-mod-vrgem4/target/chain</entry>
|
||||
<entry key="2222010099a37897688af0ecc37c72d6faabb7709ee39e2959befcd9ce253333.bundle/gdxapp4d-vrgem4.jar">../../gdxapp4d-vrgem4/target/classes</entry>
|
||||
|
||||
<entry key="ccba3b29da8b1b1cb444f381449beede3cbfd442d158293a4cdffbc3c41a31cc">../../gdxapp4d-chain-mod-vrsys5/target/chain</entry>
|
||||
<entry key="ccba3b29da8b1b1cb444f381449beede3cbfd442d158293a4cdffbc3c41a31cc.bundle/gdxapp4d-vrsys5.jar">../../gdxapp4d-vrsys5/target/classes</entry>
|
||||
|
||||
<entry key="12343b29da8b1b1cb444f381449beede3cbfd442d158293a4cdffbc3c41a7890">../../gdxapp4d-chain-mod-unitxc/target/chain</entry>
|
||||
<entry key="12343b29da8b1b1cb444f381449beede3cbfd442d158293a4cdffbc3c41a7890.bundle/gdxapp4d-unitxc.jar">../../gdxapp4d-unitxc/target/classes</entry>
|
||||
</properties>
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
</dependencies>
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>run</id>
|
||||
<id>test-run</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
|
|
@ -58,7 +58,6 @@
|
|||
<mainClass>love.distributedrebirth.gdxapp4d.boot.desktop.GDXAppDesktopLauncher</mainClass>
|
||||
<arguments>
|
||||
<argument>use-local</argument>
|
||||
<argument>nosync</argument>
|
||||
</arguments>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
<link:sea name="Module vrGEM⁴" provider="gdxapp4d.system" author="للَّٰهِilLצسُو">
|
||||
<link:sea name="Module vrGEM4" provider="gdxapp4d.system" author="للَّٰهِilLצسُو">
|
||||
<link:magic file="bundle/gdxapp4d-vrgem4.jar" mime="application/vnd.osgi.bundle"/>
|
||||
</link:sea>
|
||||
</root:ocean>
|
||||
|
|
|
|||
|
|
@ -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.");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
50
pom.xml
50
pom.xml
|
|
@ -610,25 +610,10 @@
|
|||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>build</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-source-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-sources</id>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>run</id>
|
||||
<id>test-run</id>
|
||||
<properties>
|
||||
<skipTests>true</skipTests>
|
||||
</properties>
|
||||
<build>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
|
|
@ -648,6 +633,24 @@
|
|||
</pluginManagement>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>build</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-source-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-sources</id>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>mvn-versions-check</id>
|
||||
<build>
|
||||
|
|
@ -736,13 +739,6 @@
|
|||
</goals>
|
||||
<configuration>
|
||||
<rules>
|
||||
<!-- Sick this is not documented in examples but works fine, after i looked at the source code -->
|
||||
<!-- TODO: Maven4 adds xml namespace + xsd to each plugin so auto complete works in embedded plugin xml
|
||||
<enforcer:requireMavenVersion>
|
||||
<enforce:version>3.2.2</enforce:version>
|
||||
<enforce:message>Needs maven ${rule.version} or ${this.version} for: maven.build.timestamp is in UTC</enforce:message>
|
||||
</enforcer:requireMavenVersion>
|
||||
-->
|
||||
<requireMavenVersion>
|
||||
<version>3.2.2</version>
|
||||
<message>Needs maven 3.2.2 for: maven.build.timestamp is in UTC</message>
|
||||
|
|
@ -754,7 +750,7 @@
|
|||
<!--
|
||||
<requireMavenVersion>
|
||||
<version>3.9.0</version>
|
||||
<message>Needs maven 3.9.0 for: profile activation by pom packaging type</message>s
|
||||
<message>Needs maven 3.9.0 for: profile activation by pom packaging type</message>
|
||||
</requireMavenVersion>
|
||||
-->
|
||||
<requireJavaVersion>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue