Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Enable Discovery Service class path extensions and Gateway native library extensions #1987

Merged
merged 6 commits into from
Jan 14, 2022
Merged

feat: Enable Discovery Service class path extensions and Gateway native library extensions #1987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed08a07
Add ZWE_DISCOVERY_SHARED_LIBS
CarsonCook Jan 10, 2022
70d5120
Add ZWE_GATEWAY_LIBRARY_PATH
CarsonCook Jan 10, 2022
e9316f5
Update version
zowe-robot Jan 10, 2022
f89c5fe
Fix typo in discovery shared lib
CarsonCook Jan 11, 2022
4621ed5
Merge branch 'apiml/GH1968/discovery_path_extensions' of github.com:z…
CarsonCook Jan 11, 2022
600f889
Merge branch 'master' of github.com:zowe/api-layer into apiml/GH1968/…
CarsonCook Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion discovery-package/src/main/resources/bin/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@ if [ `uname` = "OS/390" ]; then
QUICK_START=-Xquickstart
fi

DISCOVERY_LOADER_PATH=${COMMON_LIB}

if [[ ! -z ${ZWE_DISCOVERY_SHARED_LIBS} ]]
then
DISCOVERY_LOADER_PATH=${ZWE_DISCOVERY_SHARED_LIBS},${DISCOVERY_LOADER_PATH}
fi

EXPLORER_HOST=${ZOWE_EXPLORER_HOST:-localhost}
DISCOVERY_SERVICE_PORT=${DISCOVERY_PORT:-7553}

Expand Down Expand Up @@ -109,7 +116,7 @@ _BPX_JOBNAME=${ZOWE_PREFIX}${DISCOVERY_CODE} java -Xms32m -Xmx256m ${QUICK_START
-Dserver.ssl.trustStoreType="${KEYSTORE_TYPE:-PKCS12}" \
-Dserver.ssl.trustStorePassword="${KEYSTORE_PASSWORD}" \
-Djava.protocol.handler.pkgs=com.ibm.crypto.provider \
-Dloader.path=${COMMON_LIB} \
-Dloader.path=${DISCOVERY_LOADER_PATH} \
-Djava.library.path=${LIBPATH} \
-jar "${JAR_FILE}" &
pid=$!
Expand Down
5 changes: 5 additions & 0 deletions gateway-package/src/main/resources/bin/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/default
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/j9vm
LIBPATH="$LIBPATH":"${LIBRARY_PATH}"

if [[ ! -z ${ZWE_GATEWAY_LIBRARY_PATH} ]]
then
LIBPATH="$LIBPATH":"${ZWE_GATEWAY_LIBRARY_PATH}"
CarsonCook marked this conversation as resolved.
Show resolved Hide resolved
fi

GATEWAY_CODE=AG
_BPX_JOBNAME=${ZOWE_PREFIX}${GATEWAY_CODE} java \
-Xms32m -Xmx256m \
Expand Down