Merge pull request #223 from zowe/v2.x/staging

rc2

bin/app-server.sh

@@ -92,9 +92,9 @@ else
 fi
 
 if [ -z "$ZLUX_NO_LOGFILE" ]; then
-    __UNTAGGED_READ_MODE=V6 _BPX_JOBNAME=${ZOWE_PREFIX}DS1 ${NODE_BIN} --harmony ${ZOWE_LIB_DIR}/${ZLUX_SERVER_FILE} --config="${CONFIG_FILE}" "$@" 2>&1 | tee $ZWED_NODE_LOG_FILE
+    __UNTAGGED_READ_MODE=V6 _BPX_JOBNAME=${ZOWE_PREFIX}DS ${NODE_BIN} --harmony ${ZOWE_LIB_DIR}/${ZLUX_SERVER_FILE} --config="${CONFIG_FILE}" "$@" 2>&1 | tee $ZWED_NODE_LOG_FILE
 else
-    __UNTAGGED_READ_MODE=V6 _BPX_JOBNAME=${ZOWE_PREFIX}DS1 ${NODE_BIN} --harmony ${ZOWE_LIB_DIR}/${ZLUX_SERVER_FILE} --config="${CONFIG_FILE}" "$@"
+    __UNTAGGED_READ_MODE=V6 _BPX_JOBNAME=${ZOWE_PREFIX}DS ${NODE_BIN} --harmony ${ZOWE_LIB_DIR}/${ZLUX_SERVER_FILE} --config="${CONFIG_FILE}" "$@"
     echo "Ended with rc=$?"
 fi
 

bin/utils/convert-env.sh

@@ -56,13 +56,15 @@ export ZWES_ZIS_PARMLIB_MEMBER="ZWESIP00"
 
 
 
-# For backwards compatible behavior, only set the instance ID if it is non-default
-if [ -n "$ZOWE_INSTANCE" ]
+# For backwards compatible behavior
+if [ -n "$ZWE_zowe_rbacProfileIdentifier" ]
 then
-    if [ "$ZOWE_INSTANCE" != "1" ]
-    then
-        export ZWED_instanceID=$ZOWE_INSTANCE
-    fi
+  export ZWED_instanceID=$ZWE_zowe_rbacProfileIdentifier
+fi
+
+if [ -n "$ZWE_zowe_cookieIdentifier" ]
+then
+  export ZWED_cookieIdentifier=$ZWE_zowe_cookieIdentifier
 fi
 
 # shape old env vars into app-server compatible ones

bin/zssServer.sh

@@ -164,7 +164,7 @@ fi
 #Determined log file.  Run zssServer.
 export dir=`dirname "$0"`
 cd $ZSS_SCRIPT_DIR
-_BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ1 ./zssServer "${CONFIG_FILE}" 2>&1 | tee $ZWES_LOG_FILE
+_BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ ./zssServer "${CONFIG_FILE}" 2>&1 | tee $ZWES_LOG_FILE
 # This program and the accompanying materials are
 # made available under the terms of the Eclipse Public License v2.0 which accompanies
 # this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html