Merge "Allowing configuration of truststore password"

2 files changed, 9 insertions, 6 deletions

diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat
index 6610c109e..b5a92fd5a 100644..100755
--- a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat
+++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.bat
@@ -32,6 +32,13 @@
 @echo off
 setlocal enableDelayedExpansion
 
+if not defined KEYSTORE_PASSWD (
+  set KEYSTORE_PASSWD=Pol1cy_0nap
+)
+
+if not defined TRUSTSTORE_PASSWD (
+  set TRUSTSTORE_PASSWD=Pol1cy_0nap
+)
 
 if defined APEX_HOME (
     if exist "%APEX_HOME%\" (
@@ -53,9 +60,7 @@ if defined APEX_HOME (
 
 :: Environment variables for HTTPS
 set KEYSTORE=%APEX_HOME%/etc/ssl/policy-keystore"
-set KEYSTORE_PASSWD="Pol1cy_0nap"
 set TRUSTSTORE=%APEX_HOME%/etc/ssl/policy-truststore"
-set TRUSTSTORE_PASSWD="Pol1cy_0nap"
 
 :: HTTPS parameters
 set HTTPS_PARAMETERS=-Djavax.net.ssl.keyStore=%KEYSTORE% -Djavax.net.ssl.keyStorePassword=%KEYSTORE_PASSWD% -Djavax.net.ssl.trustStore=%TRUSTSTORE% -Djavax.net.ssl.trustStorePassword=%TRUSTSTORE_PASSWD%
diff --git a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
index 5b6350a81..8f966369d 100755
--- a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
+++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
@@ -49,12 +49,10 @@ fi
 
 ## Environment variables for HTTPS
 KEYSTORE="${APEX_HOME}/etc/ssl/policy-keystore"
-KEYSTORE_PASSWD="Pol1cy_0nap"
 TRUSTSTORE="${APEX_HOME}/etc/ssl/policy-truststore"
-TRUSTSTORE_PASSWD="Pol1cy_0nap"
 
 ## HTTPS parameters
-HTTPS_PARAMETERS="-Djavax.net.ssl.keyStore=${KEYSTORE} -Djavax.net.ssl.keyStorePassword=${KEYSTORE_PASSWD} -Djavax.net.ssl.trustStore=${TRUSTSTORE} -Djavax.net.ssl.trustStorePassword=${TRUSTSTORE_PASSWD}"
+HTTPS_PARAMETERS="-Djavax.net.ssl.keyStore=${KEYSTORE} -Djavax.net.ssl.keyStorePassword=${KEYSTORE_PASSWD:-Pol1cy_0nap} -Djavax.net.ssl.trustStore=$TRUSTSTORE -Djavax.net.ssl.trustStorePassword=${TRUSTSTORE_PASSWD:-Pol1cy_0nap}"
 
 ## script name for output
 MOD_SCRIPT_NAME=`basename $0`
@@ -71,7 +69,7 @@ fi
 _config="${HTTPS_PARAMETERS} -Dlogback.configurationFile=$APEX_HOME/etc/logback.xml -Dhazelcast.config=$APEX_HOME/etc/hazelcast.xml -Dhazelcast.mancenter.enabled=false"
 
 ## jmx test config
-_jmxconfig="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9911 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
+_jmxconfig="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9911 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false "
 
 ## Maven/APEX version
 _version=`cat $APEX_HOME/etc/app-version.txt`