Debug standalone mode, plus various bugfixes

api-webapp/src/main/kotlin/org/jeudego/pairgoth/model/Pairing.kt

@@ -190,7 +190,7 @@ class MacMahon(
         )
     ),
     placementParams: PlacementParams = PlacementParams(
-        Criterion.NBW, Criterion.SOSW, Criterion.SOSOSW
+        Criterion.MMS, Criterion.SOSM, Criterion.SOSOSM
     ),
     var mmFloor: Int = -20, // 20k
     var mmBar: Int = 0 // 1D

view-webapp/pom.xml

@@ -108,7 +108,9 @@
                             <directory>${project.build.directory}/generated-resources/css</directory>
                             <targetPath>css</targetPath>
                             <includes>
+                                <include>index.css</include>
                                 <include>main.css</include>
+                                <include>tour.css</include>
                             </includes>
                         </resource>
                     </webResources>

view-webapp/src/main/kotlin/org/jeudego/pairgoth/view/ApiTool.kt

@@ -6,14 +6,17 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.internal.EMPTY_REQUEST
+import org.jeudego.pairgoth.web.WebappManager
 import org.slf4j.LoggerFactory
 
 class ApiTool {
     companion object {
         const val JSON = "application/json"
         const val XML = "application/xml"
-        val apiRoot = System.getProperty("pairgoth.api.external.url")?.let { "${it.removeSuffix("/")}/" }
+        val apiRoot by lazy {
+            WebappManager.getProperty("api.external.url")?.let { "${it.removeSuffix("/")}/" }
                 ?: throw Error("no configured API url")
+        }
         val logger = LoggerFactory.getLogger("api")
     }
     private val client = OkHttpClient()

view-webapp/src/main/kotlin/org/jeudego/pairgoth/web/ApiServlet.kt

@@ -19,7 +19,9 @@ class ApiServlet : AsyncProxyServlet() {
     }
 
     companion object {
-        private val apiRoot = System.getProperty("pairgoth.api.external.url")?.let { "${it.removeSuffix("/")}" }
+        private val apiRoot by lazy {
+            WebappManager.getProperty("api.external.url")?.let { "${it.removeSuffix("/")}" }
                 ?: throw Error("no configured API url")
         }
+    }
 }

view-webapp/src/main/kotlin/org/jeudego/pairgoth/web/ImportServlet.kt

@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletResponse
 
 class ImportServlet: HttpServlet() {
 
-    private val api = ApiTool()
+    private val api by lazy { ApiTool() }
 
     override fun doPost(req: HttpServletRequest, resp: HttpServletResponse) {
         val uploads = Upload.handleFileUpload(req)

webserver/src/main/kotlin/org/jeudego/pairgoth/application/Pairgoth.kt

@@ -32,7 +32,6 @@ import java.util.*
 import java.util.jar.JarFile
 import java.util.regex.Pattern
 
-
 fun main(vararg args: String) {
     try {
         // register a shutdown hook for any global necessary cleanup
@@ -67,6 +66,7 @@ private fun readProperties() {
     val properties = File("./pairgoth.properties")
     if (properties.exists()) {
         serverProps.load(FileReader(properties))
+    }
     serverProps.entries.forEach { entry ->
         val property = entry.key as String
         val value = entry.value as String
@@ -75,7 +75,6 @@ private fun readProperties() {
             System.setProperty("pairgoth.$property", value)
         }
     }
-    }
     // we want colorized output on linux
     if (System.getProperty("os.name") == "Linux")
     {
@@ -118,7 +117,7 @@ private fun launchServer() {
     // create webapps contexts
     val webAppContexts = mutableListOf<WebAppContext>()
     val mode = serverProps["mode"] ?: "standalone"
-    if (mode == "server" || mode == "standalone") webAppContexts.add(createContext("api", "/api"))
+    if (mode == "server" || mode == "standalone") webAppContexts.add(createContext("api", "/api/tour"))
     if (mode == "client" || mode == "standalone") webAppContexts.add(createContext("view", "/"))
 
     // special handling for logger properties
@@ -132,7 +131,12 @@ private fun launchServer() {
         }
     }
 
-    val webappUrl = serverProps.getProperty("webapp.url")?.let { URL(it) } ?: throw Error("missing property webapp.url")
+    val webappUrl = URL(
+        serverProps.getProperty("webapp.protocol") ?: throw Error("missing property webapp.protocol"),
+        serverProps.getProperty("webapp.protocol") ?: throw Error("missing property webapp.protocol"),
+        serverProps.getProperty("webapp.port")?.toInt() ?: 80,
+        "/"
+    )
     val secure = webappUrl.protocol == "https"
 
     // create server
@@ -156,6 +160,9 @@ private fun launchServer() {
 private fun createContext(webapp: String, contextPath: String) = WebAppContext().also { context ->
     context.war = "$tmp/pairgoth/webapps/$webapp-webapp-$version.war"
     context.contextPath = contextPath
+    if (webapp == "api") {
+        context.allowNullPathInfo = true
+    }
 }
 
 private fun buildSecureConnector(server: Server, port: Int): ServerConnector {

webserver/src/main/resources/server.default.properties

@@ -1,5 +1,19 @@
-webapp.url = https://localhost:8443
+mode = standalone
+env = prod
+# 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 = 8080
+api.context = /api/tour
+api.external.url = http://localhost:8080/api/
+
 webapp.ssl.key = jar:file:$jar!/ssl/localhost.key
 webapp.ssl.pass =
 webapp.ssl.cert = jar:file:$jar!/ssl/localhost.crt
-mode = standalone