Skip to content

Commit f15b912

Browse files
author
Johnny
committed
refactor scripts, remove domain_type check and fix default domain_type to WLS if not specified.
1 parent 2598d74 commit f15b912

14 files changed

+257
-448
lines changed

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

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,12 @@ IF NOT "%~1" == "" (
151151
GOTO arg_loop
152152
)
153153

154+
SET SCRIPT_ARGS=%*
154155
@rem Default domain type if not specified
155-
IF "%DOMAIN_TYPE%"=="" SET DOMAIN_TYPE=WLS
156+
IF "%DOMAIN_TYPE%"=="" (
157+
SET DOMAIN_TYPE=WLS
158+
SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type %DOMAIN_TYPE%
159+
)
156160

157161

158162
@rem
@@ -232,38 +236,31 @@ SET RETURN_CODE=98
232236
GOTO exit_script
233237

234238
:domain_type_recognized
235-
IF "%USE_JRF_WLST%" == "TRUE" (
236-
IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
237-
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
239+
240+
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
241+
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
242+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
243+
GOTO found_wlst
244+
)
245+
IF EXIST "%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd" (
246+
SET WLST=%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd
247+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
248+
GOTO found_wlst
249+
)
250+
IF EXIST "%ORACLE_HOME%\wlserver\common\bin\wlst.cmd" (
251+
IF EXIST "%ORACLE_HOME%\wlserver\.product.properties" (
252+
@rem WLS 12.1.2 or WLS 12.1.3
253+
SET WLST=%ORACLE_HOME%\wlserver\common\bin\wlst.cmd
238254
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
255+
) ELSE (
256+
@rem WLS 12.2.1+
257+
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
239258
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
240-
GOTO found_wlst
241-
)
242-
) ELSE (
243-
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
244-
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
245-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
246-
GOTO found_wlst
247-
)
248-
IF EXIST "%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd" (
249-
SET WLST=%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd
250-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
251-
GOTO found_wlst
252-
)
253-
IF EXIST "%ORACLE_HOME%\wlserver\common\bin\wlst.cmd" (
254-
IF EXIST "%ORACLE_HOME%\wlserver\.product.properties" (
255-
@rem WLS 12.1.2 or WLS 12.1.3
256-
SET WLST=%ORACLE_HOME%\wlserver\common\bin\wlst.cmd
257-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
258-
) ELSE (
259-
@rem WLS 12.2.1+
260-
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
261-
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
262-
)
263-
GOTO found_wlst
264259
)
260+
GOTO found_wlst
265261
)
266262

263+
267264
IF NOT EXIST "%WLST%" (
268265
ECHO Unable to locate wlst.cmd script in ORACLE_HOME %ORACLE_HOME% >&2
269266
SET RETURN_CODE=98
@@ -293,9 +290,9 @@ ECHO CLASSPATH = %CLASSPATH%
293290
ECHO WLST_PROPERTIES = %WLST_PROPERTIES%
294291

295292
SET PY_SCRIPTS_PATH=%WLSDEPLOY_HOME%\lib\python
296-
ECHO %WLST% %PY_SCRIPTS_PATH%\create.py %*
293+
ECHO %WLST% %PY_SCRIPTS_PATH%\create.py %SCRIPT_ARGS%
297294

298-
"%WLST%" "%PY_SCRIPTS_PATH%\create.py" %*
295+
"%WLST%" "%PY_SCRIPTS_PATH%\create.py" %SCRIPT_ARGS%
299296

300297
SET RETURN_CODE=%ERRORLEVEL%
301298
IF "%RETURN_CODE%" == "100" (

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

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

202202
if [ -z "${DOMAIN_TYPE}" ]; then
203+
echo "WHY IT IS NOT SET"
203204
DOMAIN_TYPE="WLS"
205+
SCRIPT_ARGS="${SCRIPT_ARGS} -domain_type $DOMAIN_TYPE"
204206
fi
205207

206208

@@ -250,43 +252,21 @@ if [ "${WLST_PATH_DIR}" != "" ]; then
250252
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
251253
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
252254
else
253-
#
254-
# Find the location for wlst.sh
255-
#
256255
WLST=""
257-
USE_JRF_WLST=FALSE
258-
if [ "${DOMAIN_TYPE}" = "WLS" ]; then
259-
USE_JRF_WLST=FALSE
260-
elif [ "${DOMAIN_TYPE}" = "RestrictedJRF" ]; then
261-
USE_JRF_WLST=TRUE
262-
elif [ "${DOMAIN_TYPE}" = "JRF" ]; then
263-
USE_JRF_WLST=TRUE
256+
if [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
257+
WLST=${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh
258+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
259+
elif [ -x ${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh ]; then
260+
WLST=${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh
261+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
262+
elif [ -x ${ORACLE_HOME}/wlserver/common/bin/wlst.sh -a -f ${ORACLE_HOME}/wlserver/.product.properties ]; then
263+
WLST=${ORACLE_HOME}/wlserver/common/bin/wlst.sh
264+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
264265
else
265-
echo "Wrong domain type specified ${DOMAIN_TYPE}: valid value is WLS|JRF|RestrictedJRF"
266-
exit 98
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
267268
fi
268269

269-
if [ "${USE_JRF_WLST}" = "TRUE" ]; then
270-
if [ -x ${ORACLE_HOME}/oracle_common/common/bin/wlst.sh ]; then
271-
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
272-
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
273-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
274-
fi
275-
else
276-
if [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
277-
WLST=${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh
278-
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
279-
elif [ -x ${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh ]; then
280-
WLST=${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh
281-
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
282-
elif [ -x ${ORACLE_HOME}/wlserver/common/bin/wlst.sh -a -f ${ORACLE_HOME}/wlserver/.product.properties ]; then
283-
WLST=${ORACLE_HOME}/wlserver/common/bin/wlst.sh
284-
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
285-
else
286-
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
287-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
288-
fi
289-
fi
290270

291271
if [ "${WLST}" = "" ]; then
292272
echo "Unable to determine WLS version in ${ORACLE_HOME} to determine WLST shell script to call" >&2

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

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,12 @@ IF NOT "%~1" == "" (
149149
GOTO arg_loop
150150
)
151151

152+
SET SCRIPT_ARGS=%*
152153
@rem Default domain type if not specified
153-
IF "%DOMAIN_TYPE%"=="" SET DOMAIN_TYPE=WLS
154+
IF "%DOMAIN_TYPE%"=="" (
155+
SET DOMAIN_TYPE=WLS
156+
SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type %DOMAIN_TYPE%
157+
)
154158

155159
@rem
156160
@rem Validate the JVM version based on whether or not the user asked us to use encryption
@@ -229,36 +233,27 @@ SET RETURN_CODE=98
229233
GOTO exit_script
230234

231235
:domain_type_recognized
232-
IF "%USE_JRF_WLST%" == "TRUE" (
233-
IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
234-
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
236+
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
237+
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
238+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
239+
GOTO found_wlst
240+
)
241+
IF EXIST "%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd" (
242+
SET WLST=%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd
243+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
244+
GOTO found_wlst
245+
)
246+
IF EXIST "%ORACLE_HOME%\wlserver\common\bin\wlst.cmd" (
247+
IF EXIST "%ORACLE_HOME%\wlserver\.product.properties" (
248+
@rem WLS 12.1.2 or WLS 12.1.3
249+
SET WLST=%ORACLE_HOME%\wlserver\common\bin\wlst.cmd
235250
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
251+
) ELSE (
252+
@rem WLS 12.2.1+
253+
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
236254
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
237-
GOTO found_wlst
238-
)
239-
) ELSE (
240-
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
241-
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
242-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
243-
GOTO found_wlst
244-
)
245-
IF EXIST "%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd" (
246-
SET WLST=%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd
247-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
248-
GOTO found_wlst
249-
)
250-
IF EXIST "%ORACLE_HOME%\wlserver\common\bin\wlst.cmd" (
251-
IF EXIST "%ORACLE_HOME%\wlserver\.product.properties" (
252-
@rem WLS 12.1.2 or WLS 12.1.3
253-
SET WLST=%ORACLE_HOME%\wlserver\common\bin\wlst.cmd
254-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
255-
) ELSE (
256-
@rem WLS 12.2.1+
257-
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
258-
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
259-
)
260-
GOTO found_wlst
261255
)
256+
GOTO found_wlst
262257
)
263258

264259
IF NOT EXIST "%WLST%" (
@@ -290,9 +285,9 @@ ECHO CLASSPATH = %CLASSPATH%
290285
ECHO WLST_PROPERTIES = %WLST_PROPERTIES%
291286

292287
SET PY_SCRIPTS_PATH=%WLSDEPLOY_HOME%\lib\python
293-
ECHO %WLST% %PY_SCRIPTS_PATH%\deploy.py %*
288+
ECHO %WLST% %PY_SCRIPTS_PATH%\deploy.py %SCRIPT_ARGS%
294289

295-
"%WLST%" "%PY_SCRIPTS_PATH%\deploy.py" %*
290+
"%WLST%" "%PY_SCRIPTS_PATH%\deploy.py" %SCRIPT_ARGS%
296291

297292
SET RETURN_CODE=%ERRORLEVEL%
298293
IF "%RETURN_CODE%" == "103" (

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

Lines changed: 12 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ done
187187

188188
if [ -z "${DOMAIN_TYPE}" ]; then
189189
DOMAIN_TYPE="WLS"
190+
SCRIPT_ARGS="${SCRIPT_ARGS} -domain_type $DOMAIN_TYPE"
190191
fi
191192

192193

@@ -236,43 +237,19 @@ if [ "${WLST_PATH_DIR}" != "" ]; then
236237
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
237238
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
238239
else
239-
#
240-
# Find the location for wlst.sh
241-
#
242240
WLST=""
243-
USE_JRF_WLST=FALSE
244-
245-
if [ "${DOMAIN_TYPE}" = "WLS" ]; then
246-
USE_JRF_WLST=FALSE
247-
elif [ "${DOMAIN_TYPE}" = "RestrictedJRF" ]; then
248-
USE_JRF_WLST=TRUE
249-
elif [ "${DOMAIN_TYPE}" = "JRF" ]; then
250-
USE_JRF_WLST=TRUE
251-
else
252-
echo "Wrong domain type specified ${DOMAIN_TYPE}: valid value is WLS|JRF|RestrictedJRF"
253-
exit 98
254-
fi
255-
256-
if [ "${USE_JRF_WLST}" = "TRUE" ]; then
257-
if [ -x ${ORACLE_HOME}/oracle_common/common/bin/wlst.sh ]; then
258-
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
259-
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
260-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
261-
fi
241+
if [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
242+
WLST=${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh
243+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
244+
elif [ -x ${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh ]; then
245+
WLST=${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh
246+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
247+
elif [ -x ${ORACLE_HOME}/wlserver/common/bin/wlst.sh -a -f ${ORACLE_HOME}/wlserver/.product.properties ]; then
248+
WLST=${ORACLE_HOME}/wlserver/common/bin/wlst.sh
249+
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
262250
else
263-
if [ -x ${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh ]; then
264-
WLST=${ORACLE_HOME}/wlserver_10.3/common/bin/wlst.sh
265-
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
266-
elif [ -x ${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh ]; then
267-
WLST=${ORACLE_HOME}/wlserver_12.1/common/bin/wlst.sh
268-
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
269-
elif [ -x ${ORACLE_HOME}/wlserver/common/bin/wlst.sh -a -f ${ORACLE_HOME}/wlserver/.product.properties ]; then
270-
WLST=${ORACLE_HOME}/wlserver/common/bin/wlst.sh
271-
CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export CLASSPATH
272-
else
273-
WLST=${ORACLE_HOME}/oracle_common/common/bin/wlst.sh
274-
WLST_EXT_CLASSPATH=${WLSDEPLOY_HOME}/lib/weblogic-deploy-core.jar; export WLST_EXT_CLASSPATH
275-
fi
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
276253
fi
277254

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

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

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,12 @@ IF NOT "%~1" == "" (
158158
GOTO arg_loop
159159
)
160160

161+
SET SCRIPT_ARGS=%*
161162
@rem Default domain type if not specified
162-
IF "%DOMAIN_TYPE%"=="" SET DOMAIN_TYPE=WLS
163+
IF "%DOMAIN_TYPE%"=="" (
164+
SET DOMAIN_TYPE=WLS
165+
SET SCRIPT_ARGS=%SCRIPT_ARGS% -domain_type %DOMAIN_TYPE%
166+
)
163167

164168
@rem
165169
@rem Check for values of required arguments for this script to continue.
@@ -217,36 +221,27 @@ SET RETURN_CODE=98
217221
GOTO exit_script
218222

219223
:domain_type_recognized
220-
IF "%USE_JRF_WLST%" == "TRUE" (
221-
IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
222-
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
224+
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
225+
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
226+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
227+
GOTO found_wlst
228+
)
229+
IF EXIST "%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd" (
230+
SET WLST=%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd
231+
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
232+
GOTO found_wlst
233+
)
234+
IF EXIST "%ORACLE_HOME%\wlserver\common\bin\wlst.cmd" (
235+
IF EXIST "%ORACLE_HOME%\wlserver\.product.properties" (
236+
@rem WLS 12.1.2 or WLS 12.1.3
237+
SET WLST=%ORACLE_HOME%\wlserver\common\bin\wlst.cmd
223238
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
239+
) ELSE (
240+
@rem WLS 12.2.1+
241+
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
224242
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
225-
GOTO found_wlst
226-
)
227-
) ELSE (
228-
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
229-
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
230-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
231-
GOTO found_wlst
232-
)
233-
IF EXIST "%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd" (
234-
SET WLST=%ORACLE_HOME%\wlserver_12.1\common\bin\wlst.cmd
235-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
236-
GOTO found_wlst
237-
)
238-
IF EXIST "%ORACLE_HOME%\wlserver\common\bin\wlst.cmd" (
239-
IF EXIST "%ORACLE_HOME%\wlserver\.product.properties" (
240-
@rem WLS 12.1.2 or WLS 12.1.3
241-
SET WLST=%ORACLE_HOME%\wlserver\common\bin\wlst.cmd
242-
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
243-
) ELSE (
244-
@rem WLS 12.2.1+
245-
SET WLST=%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd
246-
SET WLST_EXT_CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar
247-
)
248-
GOTO found_wlst
249243
)
244+
GOTO found_wlst
250245
)
251246

252247
IF NOT EXIST "%WLST%" (
@@ -281,9 +276,9 @@ ECHO WLST_PROPERTIES = %WLST_PROPERTIES%
281276

282277
SET PY_SCRIPTS_PATH=%WLSDEPLOY_HOME%\lib\python
283278

284-
ECHO %WLST% "%PY_SCRIPTS_PATH%\discover.py" %*
279+
ECHO %WLST% "%PY_SCRIPTS_PATH%\discover.py" %SCRIPT_ARGS%
285280

286-
"%WLST%" "%PY_SCRIPTS_PATH%\discover.py" %*
281+
"%WLST%" "%PY_SCRIPTS_PATH%\discover.py" %SCRIPT_ARGS%
287282

288283
SET RETURN_CODE=%ERRORLEVEL%
289284
IF "%RETURN_CODE%" == "100" (

0 commit comments

Comments
 (0)