From 8e5450486eb2beb5262ac67769557e31d7da1bba Mon Sep 17 00:00:00 2001
From: Claude Brisson <claude@renegat.net>
Date: Sun, 29 Oct 2023 13:59:03 +0100
Subject: [PATCH] Reeng properties

---
 api-webapp/pom.xml                            |  5 +-
 client.sh                                     |  2 +-
 pom.xml                                       | 55 +++++++++++++++++++
 server.sh                                     |  2 +-
 standalone.sh                                 |  2 +-
 view-webapp/pom.xml                           |  7 ++-
 .../WEB-INF/pairgoth.default.properties       | 20 +++++--
 7 files changed, 81 insertions(+), 12 deletions(-)

diff --git a/api-webapp/pom.xml b/api-webapp/pom.xml
index 4a2589f..e0bd6cb 100644
--- a/api-webapp/pom.xml
+++ b/api-webapp/pom.xml
@@ -59,10 +59,11 @@
                 <configuration>
                     <scan>0</scan>
                     <httpConnector>
-                        <port>8085</port>
+                        <host>${pairgoth.api.host}</host>
+                        <port>${pairgoth.api.port}</port>
                     </httpConnector>
                     <webApp>
-                        <contextPath>/api/</contextPath>
+                        <contextPath>${pairgoth.api.context}/</contextPath>
                     </webApp>
                 </configuration>
             </plugin>
diff --git a/client.sh b/client.sh
index e88c906..c9801a1 100755
--- a/client.sh
+++ b/client.sh
@@ -6,5 +6,5 @@ CSSWATCH=$!
 
 export MAVEN_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:5006"
 #mvn --projects view-webapp -Dpairgoth.api.url=http://localhost:8085/api/ package jetty:run
-mvn -o --projects view-webapp package jetty:run
+mvn -DskipTests=true --projects view-webapp package jetty:run
 kill $CSSWATCH
diff --git a/pom.xml b/pom.xml
index 30b6a76..7043b8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,6 +78,39 @@
     </repository>
   </repositories>
 
+  <profiles>
+    <profile>
+      <id>manual-properties</id>
+      <activation>
+        <file>
+          <exists>pairgoth.properties</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>properties-maven-plugin</artifactId>
+            <version>1.2.0</version>
+            <executions>
+              <execution>
+                <phase>initialize</phase>
+                <goals>
+                  <goal>read-project-properties</goal>
+                </goals>
+                <configuration>
+                  <files>
+                    <file>pairgoth.properties</file>
+                  </files>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>11</maven.compiler.source>
@@ -109,6 +142,28 @@
     <kotlin.code.style>official</kotlin.code.style>
     <kotlin.compiler.jvmTarget>10</kotlin.compiler.jvmTarget>
     <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
+
+    <!-- pairgoth default properties -->
+    <pairgoth.env>dev</pairgoth.env>
+    <pairgoth.webapp.protocol>http</pairgoth.webapp.protocol>
+    <pairgoth.webapp.host>localhost</pairgoth.webapp.host>
+    <pairgoth.webapp.port>8080</pairgoth.webapp.port>
+    <pairgoth.webapp.context>/</pairgoth.webapp.context>
+    <pairgoth.webapp.external.url>http://localhost:8080</pairgoth.webapp.external.url>
+    <pairgoth.api.protocol>http</pairgoth.api.protocol>
+    <pairgoth.api.host>localhost</pairgoth.api.host>
+    <pairgoth.api.port>8085</pairgoth.api.port>
+    <pairgoth.api.context>/api</pairgoth.api.context>
+    <pairgoth.api.external.url>http://localhost:8085/api</pairgoth.api.external.url>
+    <pairgoth.store>file</pairgoth.store>
+    <pairgoth.store.file.path>tournamentfiles</pairgoth.store.file.path>
+    <pairgoth.smtp.sender></pairgoth.smtp.sender>
+    <pairgoth.smtp.host></pairgoth.smtp.host>
+    <pairgoth.smtp.port>587</pairgoth.smtp.port>
+    <pairgoth.smtp.user></pairgoth.smtp.user>
+    <pairgoth.smtp.password></pairgoth.smtp.password>
+    <pairgoth.logger.level>info</pairgoth.logger.level>
+    <pairgoth.logger.format>[%level] %ip [%logger] %message</pairgoth.logger.format>
   </properties>
 
   <modules>
diff --git a/server.sh b/server.sh
index c80e88b..eeccd40 100755
--- a/server.sh
+++ b/server.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 export MAVEN_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:5005"
-mvn -DskipTests --projects api-webapp package jetty:run
+mvn -DskipTests=true --projects api-webapp package jetty:run
diff --git a/standalone.sh b/standalone.sh
index 0fd09f5..8571b14 100755
--- a/standalone.sh
+++ b/standalone.sh
@@ -3,4 +3,4 @@
 # debug version
 # mvn package && java -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5006 -jar application/target/pairgoth-engine.jar
 
-mvn -DskipTests package && java -jar application/target/pairgoth-engine.jar
+mvn -DskipTests=true package && java -jar application/target/pairgoth-engine.jar
diff --git a/view-webapp/pom.xml b/view-webapp/pom.xml
index b90c8f3..9ca66b0 100644
--- a/view-webapp/pom.xml
+++ b/view-webapp/pom.xml
@@ -99,12 +99,13 @@
                 <configuration>
                     <scan>1</scan>
                     <httpConnector>
-                        <port>8080</port>
+                        <host>${pairgoth.webapp.host}</host>
+                        <port>${pairgoth.webapp.port}</port>
                     </httpConnector>
                     <!--
                     <systemProperties>
-                        <pairgoth.api.url>${webapp.url}</pairgoth.api.url>
-                        <pairgoth.env>${webapp.env}</pairgoth.env>
+                        <pairgoth.api.url>${pairgoth.api.url}</pairgoth.api.url>
+                        <pairgoth.env>${pairgoth.env}</pairgoth.env>
                     </systemProperties>
                     -->
                     <webApp>
diff --git a/view-webapp/src/main/webapp/WEB-INF/pairgoth.default.properties b/view-webapp/src/main/webapp/WEB-INF/pairgoth.default.properties
index 959a8f5..63e2350 100644
--- a/view-webapp/src/main/webapp/WEB-INF/pairgoth.default.properties
+++ b/view-webapp/src/main/webapp/WEB-INF/pairgoth.default.properties
@@ -1,7 +1,19 @@
-# webapp
-webapp.env = dev
-webapp.url = https://localhost:8080
-api.url = https://localhost:8085/api
+# environment
+env = dev
+
+# webapp connector
+webapp.protocol = http
+webapp.interface = localhost
+webapp.port = 8080
+webapp.context = /
+webapp.external.url = http://localhost:8080
+
+# api connector
+api.protocol = http
+api.interface = localhost
+api.port = 8085
+api.context = /api
+api.external.url = http://localhost:8085/api
 
 # store
 store = file