Skip to content

Commit bbca7eb

Browse files
author
Johnny
committed
remove domain type check for windows cmd
1 parent f15b912 commit bbca7eb

File tree

7 files changed

+0
-141
lines changed

7 files changed

+0
-141
lines changed

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -215,27 +215,6 @@ IF DEFINED WLST_PATH_DIR (
215215
@rem Find the location for wlst.cmd
216216
@rem
217217
SET WLST=
218-
SET USE_JRF_WLST=FALSE
219-
IF DEFINED DOMAIN_TYPE (
220-
IF "%DOMAIN_TYPE%" == "WLS" (
221-
SET USE_JRF_WLST=FALSE
222-
GOTO domain_type_recognized
223-
)
224-
IF "%DOMAIN_TYPE%" == "RestrictedJRF" (
225-
SET USE_JRF_WLST=TRUE
226-
GOTO domain_type_recognized
227-
)
228-
IF "%DOMAIN_TYPE%" == "JRF" (
229-
SET USE_JRF_WLST=TRUE
230-
GOTO domain_type_recognized
231-
)
232-
)
233-
234-
ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
235-
SET RETURN_CODE=98
236-
GOTO exit_script
237-
238-
:domain_type_recognized
239218

240219
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
241220
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -212,27 +212,7 @@ IF DEFINED WLST_PATH_DIR (
212212
@rem Find the location for wlst.cmd
213213
@rem
214214
SET WLST=
215-
SET USE_JRF_WLST=FALSE
216-
IF DEFINED DOMAIN_TYPE (
217-
IF "%DOMAIN_TYPE%" == "WLS" (
218-
SET USE_JRF_WLST=FALSE
219-
GOTO domain_type_recognized
220-
)
221-
IF "%DOMAIN_TYPE%" == "RestrictedJRF" (
222-
SET USE_JRF_WLST=TRUE
223-
GOTO domain_type_recognized
224-
)
225-
IF "%DOMAIN_TYPE%" == "JRF" (
226-
SET USE_JRF_WLST=TRUE
227-
GOTO domain_type_recognized
228-
)
229-
)
230-
231-
ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
232-
SET RETURN_CODE=98
233-
GOTO exit_script
234215

235-
:domain_type_recognized
236216
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
237217
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
238218
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -200,27 +200,7 @@ IF DEFINED WLST_PATH_DIR (
200200
@rem Find the location for wlst.cmd
201201
@rem
202202
SET WLST=
203-
SET USE_JRF_WLST=FALSE
204-
IF DEFINED DOMAIN_TYPE (
205-
IF "%DOMAIN_TYPE%" == "WLS" (
206-
SET USE_JRF_WLST=FALSE
207-
GOTO domain_type_recognized
208-
)
209-
IF "%DOMAIN_TYPE%" == "RestrictedJRF" (
210-
SET USE_JRF_WLST=TRUE
211-
GOTO domain_type_recognized
212-
)
213-
IF "%DOMAIN_TYPE%" == "JRF" (
214-
SET USE_JRF_WLST=TRUE
215-
GOTO domain_type_recognized
216-
)
217-
)
218-
219-
ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
220-
SET RETURN_CODE=98
221-
GOTO exit_script
222203

223-
:domain_type_recognized
224204
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
225205
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
226206
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -209,27 +209,7 @@ IF DEFINED WLST_PATH_DIR (
209209
@rem Find the location for wlst.cmd
210210
@rem
211211
SET WLST=
212-
SET USE_JRF_WLST=FALSE
213-
IF DEFINED DOMAIN_TYPE (
214-
IF "%DOMAIN_TYPE%" == "WLS" (
215-
SET USE_JRF_WLST=FALSE
216-
GOTO domain_type_recognized
217-
)
218-
IF "%DOMAIN_TYPE%" == "RestrictedJRF" (
219-
SET USE_JRF_WLST=TRUE
220-
GOTO domain_type_recognized
221-
)
222-
IF "%DOMAIN_TYPE%" == "JRF" (
223-
SET USE_JRF_WLST=TRUE
224-
GOTO domain_type_recognized
225-
)
226-
)
227-
228-
ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
229-
SET RETURN_CODE=98
230-
GOTO exit_script
231212

232-
:domain_type_recognized
233213
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
234214
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
235215
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -203,27 +203,7 @@ IF DEFINED WLST_PATH_DIR (
203203
@rem Find the location for wlst.cmd
204204
@rem
205205
SET WLST=
206-
SET USE_JRF_WLST=FALSE
207-
IF DEFINED DOMAIN_TYPE (
208-
IF "%DOMAIN_TYPE%" == "WLS" (
209-
SET USE_JRF_WLST=FALSE
210-
GOTO domain_type_recognized
211-
)
212-
IF "%DOMAIN_TYPE%" == "RestrictedJRF" (
213-
SET USE_JRF_WLST=TRUE
214-
GOTO domain_type_recognized
215-
)
216-
IF "%DOMAIN_TYPE%" == "JRF" (
217-
SET USE_JRF_WLST=TRUE
218-
GOTO domain_type_recognized
219-
)
220-
)
221-
222-
ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
223-
SET RETURN_CODE=98
224-
GOTO exit_script
225206

226-
:domain_type_recognized
227207
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
228208
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
229209
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -208,27 +208,7 @@ IF DEFINED WLST_PATH_DIR (
208208
@rem Find the location for wlst.cmd
209209
@rem
210210
SET WLST=
211-
SET USE_JRF_WLST=FALSE
212-
IF DEFINED DOMAIN_TYPE (
213-
IF "%DOMAIN_TYPE%" == "WLS" (
214-
SET USE_JRF_WLST=FALSE
215-
GOTO domain_type_recognized
216-
)
217-
IF "%DOMAIN_TYPE%" == "RestrictedJRF" (
218-
SET USE_JRF_WLST=TRUE
219-
GOTO domain_type_recognized
220-
)
221-
IF "%DOMAIN_TYPE%" == "JRF" (
222-
SET USE_JRF_WLST=TRUE
223-
GOTO domain_type_recognized
224-
)
225-
)
226-
227-
ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
228-
SET RETURN_CODE=98
229-
GOTO exit_script
230211

231-
:domain_type_recognized
232212
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
233213
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
234214
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -198,27 +198,7 @@ IF DEFINED WLST_PATH_DIR (
198198
@rem Find the location for wlst.cmd
199199
@rem
200200
SET WLST=
201-
SET USE_JRF_WLST=FALSE
202-
IF DEFINED DOMAIN_TYPE (
203-
IF "%DOMAIN_TYPE%" == "WLS" (
204-
SET USE_JRF_WLST=FALSE
205-
GOTO domain_type_recognized
206-
)
207-
IF "%DOMAIN_TYPE%" == "RestrictedJRF" (
208-
SET USE_JRF_WLST=TRUE
209-
GOTO domain_type_recognized
210-
)
211-
IF "%DOMAIN_TYPE%" == "JRF" (
212-
SET USE_JRF_WLST=TRUE
213-
GOTO domain_type_recognized
214-
)
215-
)
216-
217-
ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
218-
SET RETURN_CODE=98
219-
GOTO exit_script
220201

221-
:domain_type_recognized
222202
IF EXIST "%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd" (
223203
SET WLST=%ORACLE_HOME%\wlserver_10.3\common\bin\wlst.cmd
224204
SET CLASSPATH=%WLSDEPLOY_HOME%\lib\weblogic-deploy-core.jar

0 commit comments

Comments
 (0)