Merge branch 'release/2.4.0'

Author: Johannes Donath

pom.xml

@@ -22,18 +22,20 @@
 
   <groupId>tv.dotstart.beacon</groupId>
   <artifactId>parent</artifactId>
-  <version>2.3.0</version>
+  <version>2.4.0</version>
   <packaging>pom</packaging>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
+    <kotlin.version>1.4.20</kotlin.version>
     <mmupnp.version>3.1.1</mmupnp.version>
     <jackson.version>2.10.0.pr1</jackson.version>
-    <kotlin.version>1.3.41</kotlin.version>
     <log4j.version>2.12.0</log4j.version>
     <openjfx.version>11</openjfx.version>
     <protobuf.version>3.9.0</protobuf.version>
+
+    <raygun.token/>
   </properties>
 
   <licenses>
@@ -85,7 +87,7 @@
       <dependency>
         <groupId>tv.dotstart.beacon</groupId>
         <artifactId>repository-model</artifactId>
-        <version>2.3.0</version>
+        <version>2.4.0</version>
       </dependency>
 
       <dependency>
@@ -130,7 +132,7 @@
       <dependency>
         <groupId>com.jfoenix</groupId>
         <artifactId>jfoenix</artifactId>
-        <version>9.0.9</version>
+        <version>9.0.10</version>
       </dependency>
       <dependency>
         <groupId>com.github.ajalt</groupId>
@@ -144,6 +146,12 @@
         <version>${mmupnp.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>com.mindscapehq</groupId>
+        <artifactId>core</artifactId>
+        <version>3.0.0</version>
+      </dependency>
+
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>

repository-compiler/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <artifactId>parent</artifactId>
     <groupId>tv.dotstart.beacon</groupId>
-    <version>2.3.0</version>
+    <version>2.4.0</version>
   </parent>
 
   <artifactId>repository-compiler</artifactId>
@@ -66,6 +66,12 @@
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <scope>runtime</scope>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 
   <build>

repository-compiler/src/main/resources/log4j2.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2020 Johannes Donath <[email protected]>
+  ~ and other copyright owners as documented in the project's IP log.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ 	http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<Configuration status="WARN">
+  <Properties>
+    <Property name="LOG_PATTERN">
+      <![CDATA[%style{[%d{HH:mm:ss}]}{dim,blue} %style{[%25.25t]}{dim,cyan} %highlight{[%level]}: %highlight{%msg}%n]]></Property>
+  </Properties>
+  <Appenders>
+    <Console name="Console" target="SYSTEM_OUT" follow="true">
+      <PatternLayout pattern="${LOG_PATTERN}"/>
+    </Console>
+  </Appenders>
+  <Loggers>
+    <Root level="info">
+      <AppenderRef ref="Console"/>
+    </Root>
+  </Loggers>
+</Configuration>

repository-model/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <artifactId>parent</artifactId>
     <groupId>tv.dotstart.beacon</groupId>
-    <version>2.3.0</version>
+    <version>2.4.0</version>
   </parent>
 
   <artifactId>repository-model</artifactId>

repository-model/src/main/proto/model.proto

@@ -67,6 +67,14 @@ message ServiceDefinition {
 enum Category {
   GAME = 0;
   TOOL = 1;
+
+  /**
+   * Service Editor Marker Category
+   *
+   * This category enables editor features within the Beacon UIs. It should thus be avoided in
+   * distributed repositories as changes cannot be persisted.
+   */
+  CUSTOM = 999;
 }
 
 /**

ui/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <artifactId>parent</artifactId>
     <groupId>tv.dotstart.beacon</groupId>
-    <version>2.3.0</version>
+    <version>2.4.0</version>
   </parent>
 
   <artifactId>ui</artifactId>
@@ -82,6 +82,11 @@
       <artifactId>mmupnp</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.mindscapehq</groupId>
+      <artifactId>core</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
@@ -151,6 +156,16 @@
 
         <includes>
           <include>beacon.properties</include>
+          <include>raygun.token</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>${project.basedir}/src/main/resources/META-INF</directory>
+        <targetPath>META-INF</targetPath>
+        <filtering>false</filtering>
+
+        <includes>
+          <include>services/*</include>
         </includes>
       </resource>
       <resource>

ui/src/main/kotlin/tv/dotstart/beacon/Beacon.kt

@@ -20,6 +20,7 @@ import javafx.application.Application
 import javafx.scene.image.Image
 import javafx.stage.Stage
 import tv.dotstart.beacon.config.Configuration
+import tv.dotstart.beacon.controller.SplashController
 import tv.dotstart.beacon.preload.Preloader
 import tv.dotstart.beacon.util.OperatingSystem
 import tv.dotstart.beacon.util.logger
@@ -62,9 +63,14 @@ class Beacon : Application() {
 
     Configuration.load()
 
-    logger.info("Displaying splash screen")
-    stage.splashWindow("splash.fxml")
-    stage.show()
+    try {
+      logger.info("Displaying splash screen")
+      stage.splashWindow<SplashController>("splash.fxml")
+      stage.show()
+    } catch (ex: Throwable) {
+      logger.error("Application startup failed due to unknown error", ex)
+      throw ex
+    }
   }
 
   override fun stop() {

ui/src/main/kotlin/tv/dotstart/beacon/BeaconCli.kt

@@ -52,7 +52,7 @@ object BeaconCli : CliktCommand(name = "Beacon") {
    * an unpublished system repository).
    */
   val systemRepositories: List<URI> by option(
-      names = *arrayOf("--repository", "-r"),
+      names = arrayOf("--repository", "-r"),
       help = "Specifies a custom system repository (Overrides any default system repositories)")
       .convert { URI.create(it) }
       .multiple(defaultSystemRepositories)
@@ -105,6 +105,8 @@ object BeaconCli : CliktCommand(name = "Beacon") {
   }
 
   override fun run() {
+    // stash the desired logging path as early as possible to make sure Logger construction does not
+    // fail due to missing system properties
     configureLogStorage(this.logDirectory)
 
     val logger = LogManager.getLogger(Beacon::class.java)