Skip to content

Commit 31bc8dc

Browse files
author
Johnny
committed
fix script to use oracle_common wlst first if found
1 parent 346b582 commit 31bc8dc

14 files changed

+77
-59
lines changed

‎installer/src/main/bin/createDomain.cmd

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,12 @@ IF DEFINED WLST_PATH_DIR (
214214
@rem Find the location for wlst.cmd
215215
@rem
216216
SET WLST=
217-
217+
IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
218+
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
219+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
220+
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
221+
GOTO found_wlst
222+
)
218223
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
219224
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
220225
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
@@ -230,10 +235,6 @@ IF EXIST "%ORACLE_HOME%\wlserver\common\bin\wlst.cmd" (
230235
@rem WLS 12.1.2 or WLS 12.1.3
231236
SET WLST=%ORACLE_HOME%\wlserver\common\bin\wlst.cmd
232237
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
233-
) ELSE (
234-
@rem WLS 12.2.1+
235-
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
236-
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
237238
)
238239
GOTO found_wlst
239240
)

‎installer/src/main/bin/createDomain.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ done
200200
# default DOMAIN_TYPE
201201

202202
if [ -z "${DOMAIN_TYPE}" ]; then
203-
echo "WHY IT IS NOT SET"
204203
DOMAIN_TYPE="WLS"
205204
SCRIPT_ARGS="${SCRIPT_ARGS} -domain_type $DOMAIN_TYPE"
206205
fi
@@ -253,7 +252,11 @@ if [ "${WLST_PATH_DIR}" != "" ]; then
253252
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
254253
else
255254
WLST=""
256-
if [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
255+
if [ -x ${ORACLE_HOME}/oracle_common/common/bin/wlst.sh ]; then
256+
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
257+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
258+
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
259+
elif [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
257260
WLST=${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh
258261
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
259262
elif [ -x ${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh ]; then
@@ -262,9 +265,6 @@ else
262265
elif [ -x ${ORACLE_HOME}/wlserver/common/bin/wlst.sh -a -f ${ORACLE_HOME}/wlserver/.product.properties ]; then
263266
WLST=${ORACLE_HOME}/wlserver/common/bin/wlst.sh
264267
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
265-
else
266-
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
267-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
268268
fi
269269

270270

‎installer/src/main/bin/deployApps.cmd

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,12 @@ IF DEFINED WLST_PATH_DIR (
211211
@rem Find the location for wlst.cmd
212212
@rem
213213
SET WLST=
214-
214+
IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
215+
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
216+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
217+
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
218+
GOTO found_wlst
219+
)
215220
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
216221
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
217222
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
@@ -227,10 +232,6 @@ IF EXIST "%ORACLE_HOME%\wlserver\common\bin\wlst.cmd" (
227232
@rem WLS 12.1.2 or WLS 12.1.3
228233
SET WLST=%ORACLE_HOME%\wlserver\common\bin\wlst.cmd
229234
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
230-
) ELSE (
231-
@rem WLS 12.2.1+
232-
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
233-
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
234235
)
235236
GOTO found_wlst
236237
)

‎installer/src/main/bin/deployApps.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,11 @@ if [ "${WLST_PATH_DIR}" != "" ]; then
238238
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
239239
else
240240
WLST=""
241-
if [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
241+
if [ -x ${ORACLE_HOME}/oracle_common/common/bin/wlst.sh ]; then
242+
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
243+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
244+
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
245+
elif [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
242246
WLST=${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh
243247
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
244248
elif [ -x ${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh ]; then
@@ -247,9 +251,6 @@ else
247251
elif [ -x ${ORACLE_HOME}/wlserver/common/bin/wlst.sh -a -f ${ORACLE_HOME}/wlserver/.product.properties ]; then
248252
WLST=${ORACLE_HOME}/wlserver/common/bin/wlst.sh
249253
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
250-
else
251-
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
252-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
253254
fi
254255

255256
if [ "${WLST}" = "" ]; then

‎installer/src/main/bin/discoverDomain.cmd

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,12 @@ IF DEFINED WLST_PATH_DIR (
200200
@rem
201201
SET WLST=
202202

203+
IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
204+
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
205+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
206+
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
207+
GOTO found_wlst
208+
)
203209
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
204210
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
205211
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
@@ -215,10 +221,6 @@ IF EXIST "%ORACLE_HOME%\wlserver\common\bin\wlst.cmd" (
215221
@rem WLS 12.1.2 or WLS 12.1.3
216222
SET WLST=%ORACLE_HOME%\wlserver\common\bin\wlst.cmd
217223
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
218-
) ELSE (
219-
@rem WLS 12.2.1+
220-
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
221-
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
222224
)
223225
GOTO found_wlst
224226
)

‎installer/src/main/bin/discoverDomain.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,11 @@ if [ "${WLST_PATH_DIR}" != "" ]; then
209209
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
210210
else
211211
WLST=""
212-
if [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
212+
if [ -x ${ORACLE_HOME}/oracle_common/common/bin/wlst.sh ]; then
213+
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
214+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
215+
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
216+
elif [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
213217
WLST=${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh
214218
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
215219
elif [ -x ${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh ]; then
@@ -218,9 +222,6 @@ else
218222
elif [ -x ${ORACLE_HOME}/wlserver/common/bin/wlst.sh -a -f ${ORACLE_HOME}/wlserver/.product.properties ]; then
219223
WLST=${ORACLE_HOME}/wlserver/common/bin/wlst.sh
220224
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
221-
else
222-
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
223-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
224225
fi
225226

226227
if [ "${WLST}" = "" ]; then

‎installer/src/main/bin/encryptModel.cmd

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,12 @@ IF DEFINED WLST_PATH_DIR (
209209
@rem
210210
SET WLST=
211211

212+
IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
213+
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
214+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
215+
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
216+
GOTO found_wlst
217+
)
212218
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
213219
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
214220
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
@@ -224,10 +230,6 @@ IF EXIST "%ORACLE_HOME%\wlserver\common\bin\wlst.cmd" (
224230
@rem WLS 12.1.2 or WLS 12.1.3
225231
SET WLST=%ORACLE_HOME%\wlserver\common\bin\wlst.cmd
226232
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
227-
) ELSE (
228-
@rem WLS 12.2.1+
229-
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
230-
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
231233
)
232234
GOTO found_wlst
233235
)

‎installer/src/main/bin/encryptModel.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,11 @@ if [ "${WLST_PATH_DIR}" != "" ]; then
213213
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
214214
else
215215
WLST=""
216-
if [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
216+
if [ -x ${ORACLE_HOME}/oracle_common/common/bin/wlst.sh ]; then
217+
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
218+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
219+
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
220+
elif [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
217221
WLST=${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh
218222
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
219223
elif [ -x ${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh ]; then
@@ -222,9 +226,6 @@ else
222226
elif [ -x ${ORACLE_HOME}/wlserver/common/bin/wlst.sh -a -f ${ORACLE_HOME}/wlserver/.product.properties ]; then
223227
WLST=${ORACLE_HOME}/wlserver/common/bin/wlst.sh
224228
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
225-
else
226-
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
227-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
228229
fi
229230

230231
if [ "${WLST}" = "" ]; then

‎installer/src/main/bin/injectVariables.cmd

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,12 @@ IF DEFINED WLST_PATH_DIR (
203203
@rem
204204
SET WLST=
205205

206+
IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
207+
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
208+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
209+
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
210+
GOTO found_wlst
211+
)
206212
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
207213
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
208214
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
@@ -218,10 +224,6 @@ IF EXIST "%ORACLE_HOME%\wlserver\common\bin\wlst.cmd" (
218224
@rem WLS 12.1.2 or WLS 12.1.3
219225
SET WLST=%ORACLE_HOME%\wlserver\common\bin\wlst.cmd
220226
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
221-
) ELSE (
222-
@rem WLS 12.2.1+
223-
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
224-
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
225227
)
226228
GOTO found_wlst
227229
)

‎installer/src/main/bin/injectVariables.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,11 @@ if [ "${WLST_PATH_DIR}" != "" ]; then
222222
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
223223
else
224224
WLST=""
225-
if [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
225+
if [ -x ${ORACLE_HOME}/oracle_common/common/bin/wlst.sh ]; then
226+
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
227+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
228+
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
229+
elif [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
226230
WLST=${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh
227231
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
228232
elif [ -x ${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh ]; then
@@ -231,9 +235,6 @@ else
231235
elif [ -x ${ORACLE_HOME}/wlserver/common/bin/wlst.sh -a -f ${ORACLE_HOME}/wlserver/.product.properties ]; then
232236
WLST=${ORACLE_HOME}/wlserver/common/bin/wlst.sh
233237
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
234-
else
235-
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
236-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
237238
fi
238239

239240
if [ "${WLST}" = "" ]; then

0 commit comments

Comments
 (0)