Merge "Remove hardcoded keystore password"

diff --git a/bundleconfig-local/etc/sysprops/sys-props.properties b/bundleconfig-local/etc/sysprops/sys-props.properties
index b816a44..a55e6ea 100644 (file)
--- a/bundleconfig-local/etc/sysprops/sys-props.properties
+++ b/bundleconfig-local/etc/sysprops/sys-props.properties
@@ -113,6 +113,4 @@ RESTLET_COMPONENT_REUSE_ADDRESS=true
 #End of AJSC System Properties
 
 #Service System Properties. Please, place any Service related System Properties below.
-KEY_STORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
-KEY_MANAGER_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
 

diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh
index 003852f..aa1f6b3 100644 (file)
--- a/src/main/bin/start.sh
+++ b/src/main/bin/start.sh
@@ -13,14 +13,14 @@ if [ -z "$KEY_STORE_PASSWORD" ]; then
        echo "KEY_STORE_PASSWORD must be set in order to start up process"
        exit 1
 else
-       echo -e "KEY_STORE_PASSWORD=$KEY_STORE_PASSWORD\n" >> $AJSC_CONF_HOME/etc/sysprops/sys-props.properties
+       echo "KEY_STORE_PASSWORD=$KEY_STORE_PASSWORD\n" >> $AJSC_CONF_HOME/etc/sysprops/sys-props.properties
 fi
 
 if [ -z "$KEY_MANAGER_PASSWORD" ]; then
        echo "KEY_MANAGER_PASSWORD must be set in order to start up process"
        exit 1
 else
-       echo -e "KEY_MANAGER_PASSWORD=$KEY_MANAGER_PASSWORD\n" >> $AJSC_CONF_HOME/etc/sysprops/sys-props.properties
+       echo "KEY_MANAGER_PASSWORD=$KEY_MANAGER_PASSWORD\n" >> $AJSC_CONF_HOME/etc/sysprops/sys-props.properties
 fi
 
 # Add any spring bean configuration files to the Gizmo deployment