Add domain_type value check and default to WLS if not passed

jshum2479 · jshum2479 · commit 58c488386aa7 · 2019-01-29T15:05:19.000-06:00
diff --git a/installer/src/main/bin/createDomain.cmd b/installer/src/main/bin/createDomain.cmd
@@ -227,7 +227,7 @@ IF DEFINED DOMAIN_TYPE (
   )
 )
 
-ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid values are "WLS|JRF|RestrictedJRF"
+ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
 SET  RETURN_CODE=98
 GOTO exit_script
 
diff --git a/installer/src/main/bin/createDomain.sh b/installer/src/main/bin/createDomain.sh
@@ -263,7 +263,7 @@ else
     elif [ "${DOMAIN_TYPE}" = "JRF" ]; then
         USE_JRF_WLST=TRUE
     else
-        echo "Wrong domain type specified ${DOMAIN_TYPE}: valid values are WLS|JRF|RestrictedJRF"
+        echo "Wrong domain type specified ${DOMAIN_TYPE}: valid value is WLS|JRF|RestrictedJRF"
         exit 98
     fi
 
diff --git a/installer/src/main/bin/deployApps.cmd b/installer/src/main/bin/deployApps.cmd
@@ -224,7 +224,7 @@ IF DEFINED DOMAIN_TYPE (
   )
 )
 
-ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid values are "WLS|JRF|RestrictedJRF"
+ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
 SET  RETURN_CODE=98
 GOTO exit_script
 
diff --git a/installer/src/main/bin/deployApps.sh b/installer/src/main/bin/deployApps.sh
@@ -249,7 +249,7 @@ else
     elif [ "${DOMAIN_TYPE}" = "JRF" ]; then
         USE_JRF_WLST=TRUE
     else
-        echo "Wrong domain type specified ${DOMAIN_TYPE}: valid values are WLS|JRF|RestrictedJRF"
+        echo "Wrong domain type specified ${DOMAIN_TYPE}: valid value is WLS|JRF|RestrictedJRF"
         exit 98
     fi
 
diff --git a/installer/src/main/bin/discoverDomain.cmd b/installer/src/main/bin/discoverDomain.cmd
@@ -212,7 +212,7 @@ IF DEFINED DOMAIN_TYPE (
   )
 )
 
-ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid values are "WLS|JRF|RestrictedJRF"
+ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
 SET  RETURN_CODE=98
 GOTO exit_script
 
diff --git a/installer/src/main/bin/discoverDomain.sh b/installer/src/main/bin/discoverDomain.sh
@@ -219,7 +219,7 @@ else
     elif [ "${DOMAIN_TYPE}" = "JRF" ]; then
         USE_JRF_WLST=TRUE
     else
-        echo "Wrong domain type specified ${DOMAIN_TYPE}: valid values are WLS|JRF|RestrictedJRF"
+        echo "Wrong domain type specified ${DOMAIN_TYPE}: valid value is WLS|JRF|RestrictedJRF"
         exit 98
     fi
 
diff --git a/installer/src/main/bin/encryptModel.cmd b/installer/src/main/bin/encryptModel.cmd
@@ -221,7 +221,7 @@ IF DEFINED DOMAIN_TYPE (
   )
 )
 
-ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid values are "WLS|JRF|RestrictedJRF"
+ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
 SET  RETURN_CODE=98
 GOTO exit_script
 
diff --git a/installer/src/main/bin/encryptModel.sh b/installer/src/main/bin/encryptModel.sh
@@ -223,7 +223,7 @@ else
     elif [ "${DOMAIN_TYPE}" = "JRF" ]; then
         USE_JRF_WLST=TRUE
     else
-        echo "Wrong domain type specified ${DOMAIN_TYPE}: valid values are WLS|JRF|RestrictedJRF"
+        echo "Wrong domain type specified ${DOMAIN_TYPE}: valid value is WLS|JRF|RestrictedJRF"
         exit 98
     fi
 
diff --git a/installer/src/main/bin/injectVariables.cmd b/installer/src/main/bin/injectVariables.cmd
@@ -215,7 +215,7 @@ IF DEFINED DOMAIN_TYPE (
   )
 )
 
-ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid values are "WLS|JRF|RestrictedJRF"
+ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
 SET  RETURN_CODE=98
 GOTO exit_script
 
diff --git a/installer/src/main/bin/injectVariables.sh b/installer/src/main/bin/injectVariables.sh
@@ -232,7 +232,7 @@ else
     elif [ "${DOMAIN_TYPE}" = "JRF" ]; then
         USE_JRF_WLST=TRUE
     else
-        echo "Wrong domain type specified ${DOMAIN_TYPE}: valid values are WLS|JRF|RestrictedJRF"
+        echo "Wrong domain type specified ${DOMAIN_TYPE}: valid value is WLS|JRF|RestrictedJRF"
         exit 98
     fi
 
diff --git a/installer/src/main/bin/updateDomain.cmd b/installer/src/main/bin/updateDomain.cmd
@@ -224,7 +224,7 @@ IF DEFINED DOMAIN_TYPE (
   )
 )
 
-ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid values are "WLS|JRF|RestrictedJRF"
+ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
 SET  RETURN_CODE=98
 GOTO exit_script
 
diff --git a/installer/src/main/bin/updateDomain.sh b/installer/src/main/bin/updateDomain.sh
@@ -247,7 +247,7 @@ else
     elif [ "${DOMAIN_TYPE}" = "JRF" ]; then
         USE_JRF_WLST=TRUE
     else
-        echo "Wrong domain type specified ${DOMAIN_TYPE}: valid values are WLS|JRF|RestrictedJRF"
+        echo "Wrong domain type specified ${DOMAIN_TYPE}: valid value is WLS|JRF|RestrictedJRF"
         exit 98
     fi
 
diff --git a/installer/src/main/bin/validateModel.cmd b/installer/src/main/bin/validateModel.cmd
@@ -211,7 +211,7 @@ IF DEFINED DOMAIN_TYPE (
   )
 )
 
-ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid values are "WLS|JRF|RestrictedJRF"
+ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS|JRF|RestrictedJRF"
 SET  RETURN_CODE=98
 GOTO exit_script
 
diff --git a/installer/src/main/bin/validateModel.sh b/installer/src/main/bin/validateModel.sh
@@ -242,7 +242,7 @@ else
     elif [ "${DOMAIN_TYPE}" = "JRF" ]; then
         USE_JRF_WLST=TRUE
     else
-        echo "Wrong domain type specified ${DOMAIN_TYPE}: valid values are WLS|JRF|RestrictedJRF"
+        echo "Wrong domain type specified ${DOMAIN_TYPE}: valid value is WLS|JRF|RestrictedJRF"
         exit 98
     fi
 

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ IF DEFINED DOMAIN_TYPE (`
`227`	`227`	`)`
`228`	`228`	`)`
`229`	`229`
`230`		`-ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid values are "WLS\|JRF\|RestrictedJRF"`
	`230`	`+ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS\|JRF\|RestrictedJRF"`
`231`	`231`	`SET RETURN_CODE=98`
`232`	`232`	`GOTO exit_script`
`233`	`233`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ IF DEFINED DOMAIN_TYPE (`
`224`	`224`	`)`
`225`	`225`	`)`
`226`	`226`
`227`		`-ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid values are "WLS\|JRF\|RestrictedJRF"`
	`227`	`+ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS\|JRF\|RestrictedJRF"`
`228`	`228`	`SET RETURN_CODE=98`
`229`	`229`	`GOTO exit_script`
`230`	`230`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ IF DEFINED DOMAIN_TYPE (`
`212`	`212`	`)`
`213`	`213`	`)`
`214`	`214`
`215`		`-ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid values are "WLS\|JRF\|RestrictedJRF"`
	`215`	`+ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS\|JRF\|RestrictedJRF"`
`216`	`216`	`SET RETURN_CODE=98`
`217`	`217`	`GOTO exit_script`
`218`	`218`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ IF DEFINED DOMAIN_TYPE (`
`221`	`221`	`)`
`222`	`222`	`)`
`223`	`223`
`224`		`-ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid values are "WLS\|JRF\|RestrictedJRF"`
	`224`	`+ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS\|JRF\|RestrictedJRF"`
`225`	`225`	`SET RETURN_CODE=98`
`226`	`226`	`GOTO exit_script`
`227`	`227`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ IF DEFINED DOMAIN_TYPE (`
`215`	`215`	`)`
`216`	`216`	`)`
`217`	`217`
`218`		`-ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid values are "WLS\|JRF\|RestrictedJRF"`
	`218`	`+ECHO Wrong domain type specified "%DOMAIN_TYPE%": valid value is "WLS\|JRF\|RestrictedJRF"`
`219`	`219`	`SET RETURN_CODE=98`
`220`	`220`	`GOTO exit_script`
`221`	`221`