Skip to content

Commit 06d212e

Browse files
rakillenrakillen
authored
Merge pull request #234 from oracle/wdt-33-domaintypechk
Wdt 33 domaintypechk
2 parents 7780543 + 58c4883 commit 06d212e

14 files changed

+104
-22
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,10 @@ IF NOT "%~1" == "" (
151151
GOTO arg_loop
152152
)
153153

154+
@rem Default domain type if not specified
155+
IF "%DOMAIN_TYPE%"=="" SET DOMAIN_TYPE="WLS"
156+
157+
154158
@rem
155159
@rem Validate the JVM version based on whether or not the user asked us to use encryption
156160
@rem
@@ -223,8 +227,9 @@ IF DEFINED DOMAIN_TYPE (
223227
)
224228
)
225229

226-
ECHO Domain type "%DOMAIN_TYPE%" not recognized by shell script... assuming JRF is required
227-
SET USE_JRF_WLST=TRUE
230+
ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
231+
SET RETURN_CODE=98
232+
GOTO exit_script
228233

229234
:domain_type_recognized
230235
IF "%USE_JRF_WLST%" == "TRUE" (

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,13 @@ while [[ $# > 1 ]]; do
198198
shift # past arg or value
199199
done
200200

201+
# default DOMAIN_TYPE
202+
203+
if [ -z "${DOMAIN_TYPE}" ]; then
204+
DOMAIN_TYPE="WLS"
205+
fi
206+
207+
201208
#
202209
# Validate the JVM version based on whether or not the user asked us to use encryption
203210
#
@@ -256,7 +263,8 @@ else
256263
elif [ "${DOMAIN_TYPE}" = "JRF" ]; then
257264
USE_JRF_WLST=TRUE
258265
else
259-
echo "Domain type ${DOMAIN_TYPE} not recognized by shell script...assuming JRF is required"
266+
echo "Wrong domain type specified ${DOMAIN_TYPE}: valid value is WLS|JRF|RestrictedJRF"
267+
exit 98
260268
fi
261269

262270
if [ "${USE_JRF_WLST}" = "TRUE" ]; then

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

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

152+
@rem Default domain type if not specified
153+
IF "%DOMAIN_TYPE%"=="" SET DOMAIN_TYPE="WLS"
154+
152155
@rem
153156
@rem Validate the JVM version based on whether or not the user asked us to use encryption
154157
@rem
@@ -221,8 +224,9 @@ IF DEFINED DOMAIN_TYPE (
221224
)
222225
)
223226

224-
ECHO Domain type "%DOMAIN_TYPE%" not recognized by shell script... assuming JRF is required
225-
SET USE_JRF_WLST=TRUE
227+
ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
228+
SET RETURN_CODE=98
229+
GOTO exit_script
226230

227231
:domain_type_recognized
228232
IF "%USE_JRF_WLST%" == "TRUE" (

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ fi
149149

150150
SCRIPT_ARGS="$*"
151151
MIN_JDK_VERSION=7
152-
153152
#
154153
# Find the args required to determine the WLST script to run
155154
#
@@ -183,6 +182,14 @@ while [[ $# > 1 ]]; do
183182
shift # past arg or value
184183
done
185184

185+
186+
# default DOMAIN_TYPE
187+
188+
if [ -z "${DOMAIN_TYPE}" ]; then
189+
DOMAIN_TYPE="WLS"
190+
fi
191+
192+
186193
#
187194
# Validate the JVM version based on whether or not the user asked us to use encryption
188195
#
@@ -234,14 +241,16 @@ else
234241
#
235242
WLST=""
236243
USE_JRF_WLST=FALSE
244+
237245
if [ "${DOMAIN_TYPE}" = "WLS" ]; then
238246
USE_JRF_WLST=FALSE
239247
elif [ "${DOMAIN_TYPE}" = "RestrictedJRF" ]; then
240248
USE_JRF_WLST=TRUE
241249
elif [ "${DOMAIN_TYPE}" = "JRF" ]; then
242250
USE_JRF_WLST=TRUE
243251
else
244-
echo "Domain type ${DOMAIN_TYPE} not recognized by shell script...assuming JRF is required"
252+
echo "Wrong domain type specified ${DOMAIN_TYPE}: valid value is WLS|JRF|RestrictedJRF"
253+
exit 98
245254
fi
246255

247256
if [ "${USE_JRF_WLST}" = "TRUE" ]; then

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

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

161+
@rem Default domain type if not specified
162+
IF "%DOMAIN_TYPE%"=="" SET DOMAIN_TYPE="WLS"
163+
161164
@rem
162165
@rem Check for values of required arguments for this script to continue.
163166
@rem The underlying WLST script has other required arguments.
@@ -209,8 +212,9 @@ IF DEFINED DOMAIN_TYPE (
209212
)
210213
)
211214

212-
ECHO Domain type "%DOMAIN_TYPE%" not recognized by shell script... assuming JRF is required
213-
SET USE_JRF_WLST=TRUE
215+
ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
216+
SET RETURN_CODE=98
217+
GOTO exit_script
214218

215219
:domain_type_recognized
216220
IF "%USE_JRF_WLST%" == "TRUE" (

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,12 @@ while [[ $# > 1 ]]; do
172172
shift # past arg or value
173173
done
174174

175+
# default DOMAIN_TYPE
176+
177+
if [ -z "${DOMAIN_TYPE}" ]; then
178+
DOMAIN_TYPE="WLS"
179+
fi
180+
175181
#
176182
# Check for values of required arguments for this script to continue.
177183
# The underlying WLST script has other required arguments.
@@ -213,7 +219,8 @@ else
213219
elif [ "${DOMAIN_TYPE}" = "JRF" ]; then
214220
USE_JRF_WLST=TRUE
215221
else
216-
echo "Domain type ${DOMAIN_TYPE} not recognized by shell script...assuming JRF is required"
222+
echo "Wrong domain type specified ${DOMAIN_TYPE}: valid value is WLS|JRF|RestrictedJRF"
223+
exit 98
217224
fi
218225

219226
if [ "${USE_JRF_WLST}" = "TRUE" ]; then

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,10 @@ IF NOT "%~1" == "" (
166166
GOTO arg_loop
167167
)
168168

169+
170+
@rem Default domain type if not specified
171+
IF "%DOMAIN_TYPE%"=="" SET DOMAIN_TYPE="WLS"
172+
169173
@rem
170174
@rem Check for values of required arguments for this script to continue.
171175
@rem The underlying WLST script has other required arguments.
@@ -217,8 +221,9 @@ IF DEFINED DOMAIN_TYPE (
217221
)
218222
)
219223

220-
ECHO Domain type "%DOMAIN_TYPE%" not recognized by shell script... assuming JRF is required
221-
SET USE_JRF_WLST=TRUE
224+
ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
225+
SET RETURN_CODE=98
226+
GOTO exit_script
222227

223228
:domain_type_recognized
224229
IF "%USE_JRF_WLST%" == "TRUE" (

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,12 @@ while [[ $# > 1 ]]; do
176176
shift # past arg or value
177177
done
178178

179+
# default DOMAIN_TYPE
180+
181+
if [ -z "${DOMAIN_TYPE}" ]; then
182+
DOMAIN_TYPE="WLS"
183+
fi
184+
179185
#
180186
# Check for values of required arguments for this script to continue.
181187
# The underlying WLST script has other required arguments.
@@ -217,7 +223,8 @@ else
217223
elif [ "${DOMAIN_TYPE}" = "JRF" ]; then
218224
USE_JRF_WLST=TRUE
219225
else
220-
echo "Domain type ${DOMAIN_TYPE} not recognized by shell script...assuming JRF is required"
226+
echo "Wrong domain type specified ${DOMAIN_TYPE}: valid value is WLS|JRF|RestrictedJRF"
227+
exit 98
221228
fi
222229

223230
if [ "${USE_JRF_WLST}" = "TRUE" ]; then

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,9 @@ IF NOT "%~1" == "" (
161161
GOTO arg_loop
162162
)
163163

164+
@rem Default domain type if not specified
165+
IF "%DOMAIN_TYPE%"=="" SET DOMAIN_TYPE="WLS"
166+
164167
@rem
165168
@rem Check for values of required arguments for this script to continue.
166169
@rem The underlying WLST script has other required arguments.
@@ -212,8 +215,9 @@ IF DEFINED DOMAIN_TYPE (
212215
)
213216
)
214217

215-
ECHO Domain type "%DOMAIN_TYPE%" not recognized by shell script... assuming JRF is required
216-
SET USE_JRF_WLST=TRUE
218+
ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
219+
SET RETURN_CODE=98
220+
GOTO exit_script
217221

218222
:domain_type_recognized
219223
IF "%USE_JRF_WLST%" == "TRUE" (

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,12 @@ while [[ $# > 1 ]]; do
185185
shift # past arg or value
186186
done
187187

188+
# default DOMAIN_TYPE
189+
190+
if [ -z "${DOMAIN_TYPE}" ]; then
191+
DOMAIN_TYPE="WLS"
192+
fi
193+
188194
#
189195
# Check for values of required arguments for this script to continue.
190196
# The underlying WLST script has other required arguments.
@@ -226,7 +232,8 @@ else
226232
elif [ "${DOMAIN_TYPE}" = "JRF" ]; then
227233
USE_JRF_WLST=TRUE
228234
else
229-
echo "Domain type ${DOMAIN_TYPE} not recognized by shell script...assuming JRF is required"
235+
echo "Wrong domain type specified ${DOMAIN_TYPE}: valid value is WLS|JRF|RestrictedJRF"
236+
exit 98
230237
fi
231238

232239
if [ "${USE_JRF_WLST}" = "TRUE" ]; then

0 commit comments

Comments
 (0)