Renaming password variables to match with oom

Issue-ID: POLICY-2633
Change-Id: If5df0e82ab4154f5e32cdc3a5080cb13264830aa
Signed-off-by: RossC <ross.carter@est.tech>

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 b5a92fd..00cec4a 100755 (executable)
--- 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,12 +32,12 @@
 @echo off
 setlocal enableDelayedExpansion
 
-if not defined KEYSTORE_PASSWD (
-  set KEYSTORE_PASSWD=Pol1cy_0nap
+if not defined KEYSTORE_PASSWORD (
+  set KEYSTORE_PASSWORD=Pol1cy_0nap
 )
 
-if not defined TRUSTSTORE_PASSWD (
-  set TRUSTSTORE_PASSWD=Pol1cy_0nap
+if not defined TRUSTSTORE_PASSWORD (
+  set TRUSTSTORE_PASSWORD=Pol1cy_0nap
 )
 
 if defined APEX_HOME (
@@ -63,7 +63,7 @@ set KEYSTORE=%APEX_HOME%/etc/ssl/policy-keystore"
 set TRUSTSTORE=%APEX_HOME%/etc/ssl/policy-truststore"
 
 :: 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%
+set HTTPS_PARAMETERS=-Djavax.net.ssl.keyStore=%KEYSTORE% -Djavax.net.ssl.keyStorePassword=%KEYSTORE_PASSWORD% -Djavax.net.ssl.trustStore=%TRUSTSTORE% -Djavax.net.ssl.trustStorePassword=%TRUSTSTORE_PASSWORD%
 
 :: script name for output
 set MOD_SCRIPT_NAME=apexApps

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 8f96636..de8f2b5 100755 (executable)
--- a/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
+++ b/packages/apex-pdp-package-full/src/main/package/scripts/apexApps.sh
@@ -52,7 +52,7 @@ KEYSTORE="${APEX_HOME}/etc/ssl/policy-keystore"
 TRUSTSTORE="${APEX_HOME}/etc/ssl/policy-truststore"
 
 ## HTTPS parameters
-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}"
+HTTPS_PARAMETERS="-Djavax.net.ssl.keyStore=${KEYSTORE} -Djavax.net.ssl.keyStorePassword=${KEYSTORE_PASSWORD:-Pol1cy_0nap} -Djavax.net.ssl.trustStore=$TRUSTSTORE -Djavax.net.ssl.trustStorePassword=${TRUSTSTORE_PASSWORD:-Pol1cy_0nap}"
 
 ## script name for output
 MOD_SCRIPT_NAME=`basename $0`