refactor(config): make web.xml variable substitution compatible with …

…Payara 5.2020.6 #6953
IQSS · Mar 25, 2021 · ca35411 · ca35411
1 parent 7d70e1f
commit ca35411
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/main/resources/META-INF/microprofile-config.properties b/src/main/resources/META-INF/microprofile-config.properties
@@ -1,4 +1,13 @@
+# DATABASE
 dataverse.db.host=localhost
 dataverse.db.port=5432
 dataverse.db.user=dataverse
 dataverse.db.name=dataverse
+
+# WEB.XML / JSF
+dataverse.jsf.project-stage=Production
+dataverse.jsf.primefaces.theme=bootstrap
+dataverse.jsf.empty-string-null=true
+dataverse.jsf.skip-comments=true
+dataverse.jsf.buffer-size=102400
+dataverse.jsf.refresh-period=-1
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -27,11 +27,11 @@
     <context-param>
         <param-name>javax.faces.PROJECT_STAGE</param-name>
 <!--        <param-value>Development</param-value>-->
-        <param-value>${MPCONFIG=dataverse.jsf.project-stage:Production}</param-value>
+        <param-value>${MPCONFIG=dataverse.jsf.project-stage}</param-value>
     </context-param>
     <context-param>
         <param-name>primefaces.THEME</param-name>
-        <param-value>${MPCONFIG=dataverse.jsf.primefaces.theme:bootstrap}</param-value>
+        <param-value>${MPCONFIG=dataverse.jsf.primefaces.theme}</param-value>
     </context-param>
     <!-- example of a hard-coded PrimePush configuration: -->
     <!-- context-param -->
@@ -42,19 +42,19 @@
         <param-name>
             javax.faces.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL
         </param-name>
-        <param-value>${MPCONFIG=dataverse.jsf.empty-string-null:true}</param-value>
+        <param-value>${MPCONFIG=dataverse.jsf.empty-string-null}</param-value>
     </context-param>
     <context-param>
         <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
-        <param-value>${MPCONFIG=dataverse.jsf.skip-comments:true}</param-value>
+        <param-value>${MPCONFIG=dataverse.jsf.skip-comments}</param-value>
     </context-param>
     <context-param>
         <param-name>javax.faces.FACELETS_BUFFER_SIZE</param-name>
-        <param-value>${MPCONFIG=dataverse.jsf.buffer-size:102400}</param-value>
+        <param-value>${MPCONFIG=dataverse.jsf.buffer-size}</param-value>
     </context-param>
     <context-param>
         <param-name>javax.faces.FACELETS_REFRESH_PERIOD</param-name>
-        <param-value>${MPCONFIG=dataverse.jsf.refresh-period:-1}</param-value>
+        <param-value>${MPCONFIG=dataverse.jsf.refresh-period}</param-value>
     </context-param>
     <!-- JSF mapping -->
     <filter>