Skip to content

Commit

Permalink
Zowe Suite v3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
zowe-robot authored Sep 12, 2024
2 parents c85e374 + 144625d commit 0d7c5cf
Show file tree
Hide file tree
Showing 31 changed files with 269 additions and 297 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ name: Build and Test Workflow
on:
push:
branches:
- v2.x/staging
- v3.x/staging
- v3.x/rc
pull_request:
types: [opened, reopened, synchronize]
workflow_dispatch:
Expand Down
21 changes: 20 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,26 @@

All notable changes to the ZSS package will be documented in this file.

## Recent Changes
## `3.0.0`
- Enhancement: if no `zowe.logDirectory` is defined in config, logging is disabled. (#726)

## `2.18.0`
- Change log level for setting default value of 'httpRequestHeapMaxBlocks' to DEBUG instead of INFO.(#719)

## `2.17.0`
- Code to configure the SLH block size of the http server through 'httpRequestHeapMaxBlocks' in the yaml.(#701)

## `2.16.0`
- Bugfix: AUX should take leap seconds into account in their log messages' timestamp (#690, #691)

## `2.14.0`
- Bugfix: ZSS would not use zowe.cookieIdentifier when an HA config was used.

## `2.13.0`
- Enhancement: Added support for using "zowe.network" and "components.zss.zowe.network" to set listener IP and TLS version properties. (#659)
- Enhancement: Added support for using "zowe.network" and "components.zss.zowe.network" to set cipher suites.
- Enhancement: Change pattern matching for keyrings to allow more types of keyrings in the future (#581)
- Enhancement: Consolidate JWK warnings into improved ZWES1606W message (#663)
- Bugfix: Corrected build environment file's use of IP address to github.com (#660)

## `2.10.0`
Expand Down
46 changes: 0 additions & 46 deletions Jenkinsfile

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export ZWE_zowe_runtimeDirectory=/path/to/zowe-install-packaging
ZWE_CLI_PARAMETER_CONFIG="FILE(/my/zowe.yaml)" ./zssServer.sh
```

Note: ZSS defaults are in [defaults.yaml](https://github.com/zowe/zss/blob/v2.x/staging/defaults.yaml) so you only need to provide customizations in your own zowe.yaml.
Note: ZSS defaults are in [defaults.yaml](https://github.com/zowe/zss/blob/v3.x/staging/defaults.yaml) so you only need to provide customizations in your own zowe.yaml.

## How to submit a pull request

Expand All @@ -57,15 +57,15 @@ git add deps/zowe-common-c/
When using ZSS as the agent to host files and folders, for example: for the Zowe Editor Desktop app by the App server, may lead to '401 Impersonator Error'
Fix: Make sure the program-controlled bit is set for your ZSS binary `extattr +p zssServer`

ZSS in V2 takes advantage of V2 by using schemas and the Zowe configuration YAML. If you're running `zssServer` accidentally, instead of `zssServer.sh` or your `zssServer.sh` is out of date, you may see an error on start like `ZSS 2.x requires schemas and config`
ZSS in V3 takes advantage of V3 by using schemas and the Zowe configuration YAML. If you're running `zssServer` accidentally, instead of `zssServer.sh` or your `zssServer.sh` is out of date, you may see an error on start like `ZSS 2.x requires schemas and config`

When starting ZSS, you may encounter a schema validation issue i.e. `Configuration has validity exceptions: Schema at '' invalid [...]`.
Fix: To read these errors, consult: https://docs.zowe.org/stable/user-guide/configmgr-using/#validation-error-reporting
Note: ZSS has a default schema in `$ZWES_COMPONENT_HOME/schemas` and default configuration YAML in `$ZWES_COMPONENT_HOME/defaults.yaml`

## Mock server

If you don't have access to z/OS, or want to help expand the Mock server, find it at: https://github.com/zowe/zss/tree/v2.x/staging/mock
If you don't have access to z/OS, or want to help expand the Mock server, find it at: https://github.com/zowe/zss/tree/v3.x/staging/mock

This program and the accompanying materials are
made available under the terms of the Eclipse Public License v2.0 which accompanies
Expand Down
2 changes: 1 addition & 1 deletion bin/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ if [ -n "${ZWE_components_zss_pluginsDir}" ]; then
fi

if [ "${ZWE_components_app_server_enabled}" != "true" ]; then
_CEE_RUNOPTS="XPLINK(ON),HEAPPOOLS(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/components/zss/bin/plugins-init.js"
_CEE_RUNOPTS="XPLINK(ON),HEAPPOOLS(OFF),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/components/zss/bin/plugins-init.js"
fi

23 changes: 15 additions & 8 deletions bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,20 +74,27 @@ if [[ "${OSNAME}" == "OS/390" ]]; then
then
ZWES_LOG_DIR=${ZWE_zowe_logDirectory}
else
ZWES_LOG_DIR="../log"
if [ -z "${ZWE_zowe_runtimeDirectory}" ]; then
ZWES_LOG_DIR="../log"
else
echo "No log directory. Logging disabled."
ZWES_LOG_DIR=
ZWES_LOG_FILE=/dev/null
fi
fi
fi
if [ -f "$ZWES_LOG_DIR" ]
then
ZWES_LOG_FILE=$ZWES_LOG_DIR
elif [ ! -d "$ZWES_LOG_DIR" ]
then
echo "Will make log directory $ZWES_LOG_DIR"
mkdir -p $ZWES_LOG_DIR
if [ $? -ne 0 ]
then
echo "Cannot make log directory. Logging disabled."
ZWES_LOG_FILE=/dev/null
if [ -n "${ZWES_LOG_DIR}" ]; then
echo "Will make log directory $ZWES_LOG_DIR"
mkdir -p $ZWES_LOG_DIR
if [ $? -ne 0 ]; then
echo "Cannot make log directory. Logging disabled."
ZWES_LOG_FILE=/dev/null
fi
fi
fi
ZWES_ROTATE_LOGS=0
Expand Down Expand Up @@ -168,7 +175,7 @@ if [[ "${OSNAME}" == "OS/390" ]]; then
ZSS_SERVER_31="./zssServer"
ZSS_SERVER_64="./zssServer64"

if [ "$ZWE_components_zss_agent_64bit" = "true" ] && [ -x "${ZSS_SERVER_64}" ]; then
if [ "$ZWE_components_zss_agent_64bit" != "false" ] && [ -x "${ZSS_SERVER_64}" ]; then
ZSS_SERVER="${ZSS_SERVER_64}"
else
ZSS_SERVER="${ZSS_SERVER_31}"
Expand Down
2 changes: 1 addition & 1 deletion build/build_dynamic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ do
done


ld -V -b ac=1 -b rent -b case=mixed -b map -b xref -b reus -e getPluginDescriptor \
ld -V -b rent -b case=mixed -b map -b xref -b reus -e getPluginDescriptor \
-o "//'${USER}.DEV.LOADLIB(ZWESISDL)'" \
zisdynamic.o \
server-api.o \
Expand Down
1 change: 0 additions & 1 deletion build/build_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ c89 \
-DHTTPSERVER_BPX_IMPERSONATION=1 \
-DAPF_AUTHORIZED=0 \
-Wc,dll,expo,langlvl\(extc99\),gonum,goff,hgpr,roconst,ASM,asmlib\('CEE.SCEEMAC','SYS1.MACLIB','SYS1.MODGEN'\) \
-Wl,ac=1 \
-I ${COMMON}/h \
-I ${ZSS}/h \
-o ${ZSS}/bin/envService \
Expand Down
1 change: 0 additions & 1 deletion build/build_zss.sh
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ xlc \
-DNEW_CAA_LOCATIONS=1 \
-Wc,dll,expo,langlvl\(extc99\),gonum,goff,hgpr,roconst,ASM,asmlib\('CEE.SCEEMAC','SYS1.MACLIB','SYS1.MODGEN'\) \
-Wc,xplink,agg,exp,list,so\(\),off,xref \
-Wl,ac=1 \
-I ${COMMON}/h \
-I ${COMMON}/platform/posix \
-I ${COMMON}/jwt/jwt \
Expand Down
2 changes: 1 addition & 1 deletion build/build_zss64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ if ! c89 \
-DNEW_CAA_LOCATIONS=1 \
-Wc,lp64,dll,expo,langlvl\(extc99\),gonum,goff,hgpr,roconst,ASM,asmlib\('CEE.SCEEMAC','SYS1.MACLIB','SYS1.MODGEN'\) \
-Wc,agg,exp,list,so\(\),off,xref \
-Wl,lp64,ac=1 \
-Wl,lp64 \
-I ${COMMON}/h \
-I ${COMMON}/platform/posix \
-I ${COMMON}/jwt/jwt \
Expand Down
4 changes: 2 additions & 2 deletions build/zis.proj.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PROJECT="zis"
VERSION=2.12.0
DYNLINK_PLUGIN_VERSION=5
VERSION=3.0.0
DYNLINK_PLUGIN_VERSION=11
DEPS=""
2 changes: 1 addition & 1 deletion build/zss.proj.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PROJECT="zss"
VERSION=2.12.0
VERSION=3.0.0
DEPS="QUICKJS LIBYAML"

QUICKJS="quickjs"
Expand Down
2 changes: 1 addition & 1 deletion c/datasetjson.c
Original file line number Diff line number Diff line change
Expand Up @@ -1575,7 +1575,7 @@ void updateDataset(HttpResponse* response, char* absolutePath, int jsonMode) {

if(returnCode == 0) {
int blockSize = 0x10000;
int maxBlockCount = (translationLength*2)/blockSize;
int maxBlockCount = (translationLength*4)/blockSize;
if (!maxBlockCount){
maxBlockCount = 0x10;
}
Expand Down
Loading

0 comments on commit 0d7c5cf

Please sign in to comment.