Runtime properties renginering

api-webapp/pom.xml

@@ -62,6 +62,15 @@
                         <host>${pairgoth.api.host}</host>
                         <port>${pairgoth.api.port}</port>
                     </httpConnector>
+                    <systemProperties>
+                        <pairgoth.env>${pairgoth.env}</pairgoth.env>
+                        <pairgoth.api.external.url>${pairgoth.api.external.url}</pairgoth.api.external.url>
+                        <pairgoth.webapp.external.url>${pairgoth.webapp.external.url}</pairgoth.webapp.external.url>
+                        <pairgoth.store>${pairgoth.store}</pairgoth.store>
+                        <pairgoth.store.file.path>${pairgoth.store}</pairgoth.store.file.path>
+                        <pairgoth.logger.level>${pairgoth.logger.level}</pairgoth.logger.level>
+                        <pairgoth.logger.format>${pairgoth.logger.format}</pairgoth.logger.format>
+                    </systemProperties>
                     <webApp>
                         <contextPath>${pairgoth.api.context}/</contextPath>
                     </webApp>
@@ -87,26 +96,6 @@
                     </sources>
                 </configuration>
             </plugin>
-            <!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>echo-property</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <phase>validate</phase>
-                        <configuration>
-                            <tasks>
-                                <echo>///////////////////////////// webapp.port=${webapp.port}</echo>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-                -->
         </plugins>
     </build>
     <dependencyManagement>

api-webapp/src/main/kotlin/org/jeudego/pairgoth/oauth/OAuthHelper.kt

@@ -21,7 +21,7 @@ abstract class OAuthHelper {
         protected get() = WebappManager.getMandatoryProperty("oauth." + name + ".secret")
     protected val redirectURI: String?
         protected get() = try {
-            val uri: String = WebappManager.Companion.getProperty("webapp.url") + "/oauth.html"
+            val uri: String = WebappManager.getProperty("webapp.external.url") + "/oauth.html"
             URLEncoder.encode(uri, "UTF-8")
         } catch (uee: UnsupportedEncodingException) {
             logger.error("could not encode redirect URI", uee)

api-webapp/src/main/kotlin/org/jeudego/pairgoth/server/ApiServlet.kt

@@ -62,7 +62,7 @@ class ApiServlet : HttpServlet() {
 
             // validate request
 
-            if ("dev" == WebappManager.getProperty("webapp.env")) {
+            if ("dev" == WebappManager.getProperty("env")) {
                 response.addHeader("Access-Control-Allow-Origin", "*")
             }
             validateAccept(request);

api-webapp/src/main/kotlin/org/jeudego/pairgoth/server/WebappManager.kt

@@ -62,7 +62,7 @@ class WebappManager : ServletContextListener, ServletContextAttributeListener, H
                 properties[(key as String).removePrefix(PAIRGOTH_PROPERTIES_PREFIX)] = value
             }
 
-            val env = properties.getProperty("webapp.env")
+            val env = properties.getProperty("env")
             logger.info("Using profile $env", )
 
             // set system user agent string to empty string
@@ -116,10 +116,10 @@ class WebappManager : ServletContextListener, ServletContextAttributeListener, H
             return properties.getProperty(prop)
         }
         fun getMandatoryProperty(prop: String): String {
-            return properties.getProperty(prop) ?: throw Error("missing property: ${prop}")
+            return getProperty(prop) ?: throw Error("missing property: ${prop}")
         }
 
-        val webappURL by lazy { getProperty("webapp.url") }
+        val webappURL by lazy { getProperty("webapp.external.url") }
 
         private val services = mutableMapOf<String, Pair<Runnable, Thread>>()
 

api-webapp/src/main/webapp/WEB-INF/pairgoth.default.properties

@@ -1,6 +1,19 @@
-# webapp
-webapp.env = dev
-webapp.url = https://localhost:8085
+# 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