Skip to content

Commit a4363ad

Browse files
taban03pj892031
taban03
and
pj892031
authored
fix: Fix GW script (#1898)
* Fix script Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Update gateway-package/src/main/resources/bin/start.sh Co-authored-by: Pavel Jareš <58428711+pj892031@users.noreply.github.com> * Change other scripts Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Change zowe-dev script Signed-off-by: at670475 <andrea.tabone@broadcom.com> * Use parameter Signed-off-by: at670475 <andrea.tabone@broadcom.com> Co-authored-by: Pavel Jareš <58428711+pj892031@users.noreply.github.com>
1 parent bd6f8d2 commit a4363ad

File tree

6 files changed

+15
-14
lines changed

6 files changed

+15
-14
lines changed

‎api-catalog-package/src/main/resources/bin/start.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ LIBPATH="$LIBPATH":"${JAVA_HOME}"/bin/j9vm
8282
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/classic
8383
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/default
8484
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/j9vm
85-
export LIBPATH="$LIBPATH":
85+
LIBPATH="$LIBPATH":"${LIBRARY_PATH}"
8686

8787
CATALOG_CODE=AC
8888
_BPX_JOBNAME=${ZOWE_PREFIX}${CATALOG_CODE} java \
@@ -121,7 +121,7 @@ _BPX_JOBNAME=${ZOWE_PREFIX}${CATALOG_CODE} java \
121121
-Dserver.ssl.trustStorePassword="${KEYSTORE_PASSWORD}" \
122122
-Djava.protocol.handler.pkgs=com.ibm.crypto.provider \
123123
-Dloader.path=${COMMON_LIB} \
124-
-Djava.library.path=${LIBRARY_PATH} \
124+
-Djava.library.path=${LIBPATH} \
125125
-jar "${JAR_FILE}" &
126126
pid=$!
127127
echo "pid=${pid}"

‎caching-service-package/src/main/resources/bin/start.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ LIBPATH="$LIBPATH":"${JAVA_HOME}"/bin/j9vm
6565
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/classic
6666
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/default
6767
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/j9vm
68-
export LIBPATH="$LIBPATH":
68+
LIBPATH="$LIBPATH":"${LIBRARY_PATH}"
6969

7070
CACHING_CODE=CS
7171
_BPX_JOBNAME=${ZOWE_PREFIX}${CACHING_CODE} java -Xms16m -Xmx512m \
@@ -98,7 +98,7 @@ _BPX_JOBNAME=${ZOWE_PREFIX}${CACHING_CODE} java -Xms16m -Xmx512m \
9898
-Dserver.ssl.trustStoreType="${KEYSTORE_TYPE:-PKCS12}" \
9999
-Dserver.ssl.trustStorePassword="${KEYSTORE_PASSWORD}" \
100100
-Djava.protocol.handler.pkgs=com.ibm.crypto.provider \
101-
-Djava.library.path=${LIBRARY_PATH} \
101+
-Djava.library.path=${LIBPATH} \
102102
-jar "${JAR_FILE}" &
103103
pid=$!
104104
echo "pid=${pid}"

‎config/zowe-api-dev/alternative_start.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ LIBPATH="$LIBPATH":"${JAVA_HOME}"/bin/j9vm
3434
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/classic
3535
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/default
3636
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/j9vm
37-
export LIBPATH="$LIBPATH":
37+
LIBPATH="$LIBPATH":"${LIBRARY_PATH}"
3838

3939
GATEWAY_CODE=AG
4040
_BPX_JOBNAME=${ZOWE_PREFIX}${GATEWAY_CODE} java \
@@ -91,7 +91,7 @@ _BPX_JOBNAME=${ZOWE_PREFIX}${GATEWAY_CODE} java \
9191
-Dapiml.security.zosmf.applid=${APIML_SECURITY_ZOSMF_APPLID} \
9292
-Djava.protocol.handler.pkgs=com.ibm.crypto.provider \
9393
-Dloader.path=${GATEWAY_LOADER_PATH} \
94-
-Djava.library.path=${LIBRARY_PATH} \
94+
-Djava.library.path=${LIBPATH} \
9595
-jar ${ROOT_DIR}"/components/api-mediation/gateway-service-lite.jar" &
9696

9797
_BPX_JOBNAME=${ZOWE_PREFIX}${DISCOVERABLECLIENT_CODE} java -Xms32m -Xmx256m -Xquickstart \
@@ -142,7 +142,7 @@ _BPX_JOBNAME=${ZOWE_PREFIX}${DISCOVERY_CODE} java -Xms32m -Xmx256m ${QUICK_START
142142
-Dserver.ssl.trustStorePassword="${KEYSTORE_PASSWORD}" \
143143
-Djava.protocol.handler.pkgs=com.ibm.crypto.provider \
144144
-Dloader.path=${COMMON_LIB} \
145-
-Djava.library.path=${LIBRARY_PATH} \
145+
-Djava.library.path=${LIBPATH} \
146146
-jar ${ROOT_DIR}"/components/api-mediation/discovery-service-lite.jar" &
147147

148148
_BPX_JOBNAME=${ZOWE_PREFIX}${CATALOG_CODE} java \
@@ -176,7 +176,7 @@ _BPX_JOBNAME=${ZOWE_PREFIX}${CATALOG_CODE} java \
176176
-Dserver.ssl.trustStorePassword="${KEYSTORE_PASSWORD}" \
177177
-Djava.protocol.handler.pkgs=com.ibm.crypto.provider \
178178
-Dloader.path=${COMMON_LIB} \
179-
-Djava.library.path=${LIBRARY_PATH} \
179+
-Djava.library.path=${LIBPATH} \
180180
-jar ${ROOT_DIR}"/components/api-mediation/api-catalog-services-lite.jar" &
181181

182182
_BPX_JOBNAME=${ZOWE_PREFIX}${CACHING_CODE} java -Xms16m -Xmx512m \
@@ -209,7 +209,7 @@ _BPX_JOBNAME=${ZOWE_PREFIX}${CACHING_CODE} java -Xms16m -Xmx512m \
209209
-Dserver.ssl.trustStoreType="${KEYSTORE_TYPE}" \
210210
-Dserver.ssl.trustStorePassword="${KEYSTORE_PASSWORD}" \
211211
-Djava.protocol.handler.pkgs=com.ibm.crypto.provider \
212-
-Djava.library.path=${LIBRARY_PATH} \
212+
-Djava.library.path=${LIBPATH} \
213213
-jar ${ROOT_DIR}"/components/api-mediation/caching-service.jar"
214214

215215
echo "Done"

‎discovery-package/src/main/resources/bin/start.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ LIBPATH="$LIBPATH":"${JAVA_HOME}"/bin/j9vm
7878
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/classic
7979
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/default
8080
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/j9vm
81-
export LIBPATH="$LIBPATH":
81+
LIBPATH="$LIBPATH":"${LIBRARY_PATH}"
8282

8383
DISCOVERY_CODE=AD
8484
_BPX_JOBNAME=${ZOWE_PREFIX}${DISCOVERY_CODE} java -Xms32m -Xmx256m ${QUICK_START} \
@@ -110,7 +110,7 @@ _BPX_JOBNAME=${ZOWE_PREFIX}${DISCOVERY_CODE} java -Xms32m -Xmx256m ${QUICK_START
110110
-Dserver.ssl.trustStorePassword="${KEYSTORE_PASSWORD}" \
111111
-Djava.protocol.handler.pkgs=com.ibm.crypto.provider \
112112
-Dloader.path=${COMMON_LIB} \
113-
-Djava.library.path=${LIBRARY_PATH} \
113+
-Djava.library.path=${LIBPATH} \
114114
-jar "${JAR_FILE}" &
115115
pid=$!
116116
echo "pid=${pid}"

‎gateway-package/src/main/resources/bin/start.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ LIBPATH="$LIBPATH":"${JAVA_HOME}"/bin/j9vm
100100
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/classic
101101
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/default
102102
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/j9vm
103-
export LIBPATH="$LIBPATH":
103+
LIBPATH="$LIBPATH":"${LIBRARY_PATH}"
104104

105105
GATEWAY_CODE=AG
106106
_BPX_JOBNAME=${ZOWE_PREFIX}${GATEWAY_CODE} java \
@@ -157,7 +157,7 @@ _BPX_JOBNAME=${ZOWE_PREFIX}${GATEWAY_CODE} java \
157157
-Dapiml.security.zosmf.applid=${APIML_SECURITY_ZOSMF_APPLID:-IZUDFLT} \
158158
-Djava.protocol.handler.pkgs=com.ibm.crypto.provider \
159159
-Dloader.path=${GATEWAY_LOADER_PATH} \
160-
-Djava.library.path=${LIBRARY_PATH} \
160+
-Djava.library.path=${LIBPATH} \
161161
-jar ${JAR_FILE} &
162162

163163
pid=$!

‎metrics-service-package/src/main/resources/bin/start.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ LIBPATH="$LIBPATH":"${JAVA_HOME}"/bin/j9vm
4747
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/classic
4848
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/default
4949
LIBPATH="$LIBPATH":"${JAVA_HOME}"/lib/s390/j9vm
50-
export LIBPATH="$LIBPATH":
50+
LIBPATH="$LIBPATH":"${LIBRARY_PATH}"
5151

5252
METRICS_CODE=MS
5353
_BPX_JOBNAME=${ZOWE_PREFIX}${METRICS_CODE} java -Xms16m -Xmx512m \
@@ -75,6 +75,7 @@ _BPX_JOBNAME=${ZOWE_PREFIX}${METRICS_CODE} java -Xms16m -Xmx512m \
7575
-Dserver.ssl.trustStoreType="${KEYSTORE_TYPE}" \
7676
-Dserver.ssl.trustStorePassword="${KEYSTORE_PASSWORD}" \
7777
-Djava.protocol.handler.pkgs=com.ibm.crypto.provider \
78+
-Djava.library.path=${LIBPATH} \
7879
-jar ${JAR_FILE} &
7980
pid=$!
8081
echo "pid=${pid}"

0 commit comments

Comments
 (0)