Skip to content

Commit

Permalink
Zowe Suite v2.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
zowe-robot authored Oct 4, 2022
2 parents 869005d + 9bd6641 commit f936563
Show file tree
Hide file tree
Showing 35 changed files with 3,349 additions and 291 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
# git's files (which MUST be ASCII)
.gitattributes git-encoding=iso8859-1 zos-working-tree-encoding=iso8859-1
.gitignore git-encoding=iso8859-1 zos-working-tree-encoding=iso8859-1
# Java needs to be iso8859-1
*.java git-encoding=iso8859-1 zos-working-tree-encoding=iso8859-1
# Binary files, selected by file extension.
#
# Note that "Binary" really just means "Not touched when moved
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ build/tmp*/
build/build.log
bin/zssServer
bin/zssServer64
build/*.u
build/*.o
build/*.s
*.asm
*.lst
*.class

# workspace content should be updated by program
.pax/*
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to the ZSS package will be documented in this file.

## Recent Changes

## `2.4.0`

- Enhancement: ZSS /datasetContents now has a PUT API for creating datasets.
- Enhancement: ZIS dynamic linkage support

## `2.3.0`

- Enhancment: ZSS now utilizes the configuration parameters present in the zowe configuration file via the configmgr, simplifying the startup of ZSS and increasing the validation of its parameters. The file zss/defaults.yaml shows the default configuration parameters of zss, in combination with the schema of the parameters within zss/schemas, though some parameters are derived from zowe-wide parameters or from other components when they involve those other components.
Expand Down
4 changes: 2 additions & 2 deletions bin/zssServer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,9 @@ else
fi

if [ "$ZWES_LOG_FILE" = "/dev/null" ]; then
_BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ ${ZSS_SERVER} --schemas "${ZWES_SCHEMA_PATHS}" --configs "${ZWES_CONFIG}" 2>&1
_BPX_SHAREAS=NO _BPX_JOBNAME=${ZWE_zowe_job_prefix}SZ ${ZSS_SERVER} --schemas "${ZWES_SCHEMA_PATHS}" --configs "${ZWES_CONFIG}" 2>&1
else
_BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ ${ZSS_SERVER} --schemas "${ZWES_SCHEMA_PATHS}" --configs "${ZWES_CONFIG}" 2>&1 | tee $ZWES_LOG_FILE
_BPX_SHAREAS=NO _BPX_JOBNAME=${ZWE_zowe_job_prefix}SZ ${ZSS_SERVER} --schemas "${ZWES_SCHEMA_PATHS}" --configs "${ZWES_CONFIG}" 2>&1 | tee $ZWES_LOG_FILE
fi
# This program and the accompanying materials are
# made available under the terms of the Eclipse Public License v2.0 which accompanies
Expand Down
177 changes: 177 additions & 0 deletions build/build_dynamic.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
#!/bin/sh
set -e

################################################################################
# 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
#
# SPDX-License-Identifier: EPL-2.0
#
# Copyright Contributors to the Zowe Project.
################################################################################

export _LD_SYSLIB="//'SYS1.CSSLIB'://'CEE.SCEELKEX'://'CEE.SCEELKED'://'CEE.SCEERUN'://'CEE.SCEERUN2'://'CSF.SCSFMOD0'"

WORKING_DIR=$(dirname "$0")
ZSS="../.."
COMMON="../../deps/zowe-common-c"


echo "********************************************************************************"
echo "Building ZIS Dynamic Linkage Base plugin..."

mkdir -p "${WORKING_DIR}/tmp-zisdyn" && cd "$_"

IFS='.' read -r major minor micro < "${ZSS}/version.txt"
date_stamp=$(date +%Y%m%d)
echo "Version: $major.$minor.$micro"
echo "Date stamp: $date_stamp"

xlc -S -M -qmetal -q64 -DSUBPOOL=132 -DMETTLE=1 -DMSGPREFIX=\"ZWE\" \
-DZISDYN_MAJOR_VERSION="$major" \
-DZISDYN_MINOR_VERSION="$minor" \
-DZISDYN_REVISION="$micro" \
-DZISDYN_VERSION_DATE_STAMP="$date_stamp" \
-qreserved_reg=r12 \
-DRCVR_CPOOL_STATES \
-DHAVE_METALIO=1 \
-Wc,langlvl\(extc99\),arch\(8\),agg,exp,list\(\),so\(\),off,xref,roconst,longname,lp64 \
-I ${COMMON}/h -I ${ZSS}/h \
-I ${ZSS}/zis-aux/include -I ${ZSS}/zis-aux/src \
${ZSS}/c/zis/zisdynamic.c \
${ZSS}/c/zis/server-api.c \
${ZSS}/c/zis/client.c \
${ZSS}/c/zis/parm.c \
${ZSS}/c/zis/plugin.c \
${ZSS}/c/zis/service.c \
${ZSS}/c/zis/service.c \
${ZSS}/zis-aux/src/aux-guest.c \
${ZSS}/zis-aux/src/aux-manager.c \
${ZSS}/zis-aux/src/aux-utils.c \
${COMMON}/c/alloc.c \
${COMMON}/c/as.c \
${COMMON}/c/mtlskt.c \
${COMMON}/c/cellpool.c \
${COMMON}/c/cmutils.c \
${COMMON}/c/collections.c \
${COMMON}/c/cpool64.c \
${COMMON}/c/crossmemory.c \
${COMMON}/c/dynalloc.c \
${COMMON}/c/idcams.c \
${COMMON}/c/isgenq.c \
${COMMON}/c/le.c \
${COMMON}/c/logging.c \
${COMMON}/c/lpa.c \
${COMMON}/c/metalio.c \
${COMMON}/c/nametoken.c \
${COMMON}/c/pause-element.c \
${COMMON}/c/pc.c \
${COMMON}/c/qsam.c \
${COMMON}/c/radmin.c \
${COMMON}/c/recovery.c \
${COMMON}/c/resmgr.c \
${COMMON}/c/scheduling.c \
${COMMON}/c/shrmem64.c \
${COMMON}/c/stcbase.c \
${COMMON}/c/timeutls.c \
${COMMON}/c/utils.c \
${COMMON}/c/vsam.c \
${COMMON}/c/xlate.c \
${COMMON}/c/zos.c \
${COMMON}/c/zvt.c \


for file in \
zisdynamic \
server-api \
client \
parm \
plugin \
service \
service \
aux-guest \
aux-manager \
aux-utils \
alloc \
as \
mtlskt \
cellpool \
cmutils \
collections \
cpool64 \
crossmemory \
dynalloc \
idcams \
isgenq \
le \
logging \
lpa \
metalio \
nametoken \
pause-element \
pc \
qsam \
radmin \
recovery \
resmgr \
scheduling \
shrmem64 \
stcbase \
timeutls \
utils \
vsam \
xlate \
zos \
zvt
do
as -mgoff -mobject -mflag=nocont --TERM --RENT -aegimrsx=${file}.asm ${file}.s
done


ld -V -b ac=1 -b rent -b case=mixed -b map -b xref -b reus -e getPluginDescriptor \
-o "//'${USER}.DEV.LOADLIB(ZWESISDL)'" \
zisdynamic.o \
server-api.o \
client.o \
parm.o \
plugin.o \
service.o \
service.o \
aux-guest.o \
aux-manager.o \
aux-utils.o \
alloc.o \
as.o \
mtlskt.o \
cellpool.o \
cmutils.o \
collections.o \
cpool64.o \
crossmemory.o \
dynalloc.o \
idcams.o \
isgenq.o \
le.o \
logging.o \
lpa.o \
metalio.o \
nametoken.o \
pause-element.o \
pc.o \
qsam.o \
radmin.o \
recovery.o \
resmgr.o \
scheduling.o \
shrmem64.o \
stcbase.o \
timeutls.o \
utils.o \
vsam.o \
xlate.o \
zos.o \
zvt.o \
> ZWESISDL.link

echo "Build successful"
4 changes: 3 additions & 1 deletion build/build_zis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ xlc -S -M -qmetal -q64 -DSUBPOOL=132 -DMETTLE=1 -DMSGPREFIX=\"ZWE\" \
${ZSS}/c/zis/parm.c \
${ZSS}/c/zis/plugin.c \
${ZSS}/c/zis/server.c \
${ZSS}/c/zis/server-api.c \
${ZSS}/c/zis/service.c \
${ZSS}/c/zis/services/auth.c \
${ZSS}/c/zis/services/nwm.c \
Expand All @@ -84,7 +85,7 @@ for file in \
alloc as cellpool cmutils collections crossmemory isgenq le logging lpa metalio mtlskt nametoken \
pause-element pc qsam radmin recovery resmgr scheduling shrmem64 stcbase timeutls utils xlate \
zos zvt \
parm plugin server service \
parm plugin server server-api service \
auth nwm snarfer secmgmt tssparsing secmgmttss secmgmtUtils \
aux-utils aux-host
do
Expand Down Expand Up @@ -120,6 +121,7 @@ ld -V -b ac=1 -b rent -b case=mixed -b map -b xref -b reus \
parm.o \
plugin.o \
server.o \
server-api.o \
service.o \
auth.o \
nwm.o \
Expand Down
22 changes: 22 additions & 0 deletions build/update_stubs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/sh
set -e

################################################################################
# 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
#
# SPDX-License-Identifier: EPL-2.0
#
# Copyright Contributors to the Zowe Project.
################################################################################

ZSS=".."

echo "********************************************************************************"
echo "Updating ZIS Dynamic Linkage Base plugin stubs..."

javac -encoding iso8859-1 ${ZSS}/tools/dynzis/org/zowe/zis/ZISStubGenerator.java
java -cp ${ZSS}/tools/dynzis org.zowe.zis.ZISStubGenerator init ${ZSS}/h/zis/zisstubs.h > ${ZSS}/c/zis/stubinit.c

echo "Update successful"
9 changes: 9 additions & 0 deletions c/datasetService.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,15 @@ static int serveDatasetContents(HttpService *service, HttpResponse *response){
fflush(stdout);
deleteDatasetOrMember(response, filename);
}
else if (!strcmp(request->method, methodPUT)) {
char *l1 = stringListPrint(request->parsedFile, 1, 1, "/", 0);
char *percentDecoded = cleanURLParamValue(response->slh, l1);
char *filenamep1 = stringConcatenate(response->slh, "//'", percentDecoded);
char *filename = stringConcatenate(response->slh, filenamep1, "'");
zowelog(NULL, LOG_COMP_ID_MVD_SERVER, ZOWE_LOG_DEBUG, "Allocating dataset: %s\n", filename);
fflush(stdout);
newDataset(response, filename, TRUE);
}
else {
jsonPrinter *out = respondWithJsonPrinter(response);

Expand Down
Loading

0 comments on commit f936563

Please sign in to comment.