Merge pull request #207 from oracle/jira-31-domain-type-not-displayed

rakillen · web-flow · commit e6529a5b09ca · 2019-01-07T16:56:50.000-06:00
JIRA WDT-31 Corrected logging when default domain type is used
diff --git a/installer/src/main/bin/createDomain.cmd b/installer/src/main/bin/createDomain.cmd
@@ -221,10 +221,11 @@ IF DEFINED DOMAIN_TYPE (
     SET USE_JRF_WLST=TRUE
     GOTO domain_type_recognized
   )
-  ECHO Domain type %DOMAIN_TYPE% not recognized by shell script...assuming JRF is required
-  SET USE_JRF_WLST=TRUE
 )
 
+ECHO Domain type "%DOMAIN_TYPE%" not recognized by shell script... assuming JRF is required
+SET USE_JRF_WLST=TRUE
+
 :domain_type_recognized
 IF "%USE_JRF_WLST%" == "TRUE" (
     IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
diff --git a/installer/src/main/bin/deployApps.cmd b/installer/src/main/bin/deployApps.cmd
@@ -219,10 +219,11 @@ IF DEFINED DOMAIN_TYPE (
     SET USE_JRF_WLST=TRUE
     GOTO domain_type_recognized
   )
-  ECHO Domain type %DOMAIN_TYPE% not recognized by shell script...assuming JRF is required
-  SET USE_JRF_WLST=TRUE
 )
 
+ECHO Domain type "%DOMAIN_TYPE%" not recognized by shell script... assuming JRF is required
+SET USE_JRF_WLST=TRUE
+
 :domain_type_recognized
 IF "%USE_JRF_WLST%" == "TRUE" (
     IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
diff --git a/installer/src/main/bin/discoverDomain.cmd b/installer/src/main/bin/discoverDomain.cmd
@@ -207,10 +207,11 @@ IF DEFINED DOMAIN_TYPE (
     SET USE_JRF_WLST=TRUE
     GOTO domain_type_recognized
   )
-  ECHO Domain type %DOMAIN_TYPE% not recognized by shell script...assuming JRF is required
-  SET USE_JRF_WLST=TRUE
 )
 
+ECHO Domain type "%DOMAIN_TYPE%" not recognized by shell script... assuming JRF is required
+SET USE_JRF_WLST=TRUE
+
 :domain_type_recognized
 IF "%USE_JRF_WLST%" == "TRUE" (
     IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
diff --git a/installer/src/main/bin/encryptModel.cmd b/installer/src/main/bin/encryptModel.cmd
@@ -215,10 +215,11 @@ IF DEFINED DOMAIN_TYPE (
     SET USE_JRF_WLST=TRUE
     GOTO domain_type_recognized
   )
-  ECHO Domain type %DOMAIN_TYPE% not recognized by shell script...assuming JRF is required
-  SET USE_JRF_WLST=TRUE
 )
 
+ECHO Domain type "%DOMAIN_TYPE%" not recognized by shell script... assuming JRF is required
+SET USE_JRF_WLST=TRUE
+
 :domain_type_recognized
 IF "%USE_JRF_WLST%" == "TRUE" (
     IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
diff --git a/installer/src/main/bin/injectVariables.cmd b/installer/src/main/bin/injectVariables.cmd
@@ -210,10 +210,11 @@ IF DEFINED DOMAIN_TYPE (
     SET USE_JRF_WLST=TRUE
     GOTO domain_type_recognized
   )
-  ECHO Domain type %DOMAIN_TYPE% not recognized by shell script...assuming JRF is required
-  SET USE_JRF_WLST=TRUE
 )
 
+ECHO Domain type "%DOMAIN_TYPE%" not recognized by shell script... assuming JRF is required
+SET USE_JRF_WLST=TRUE
+
 :domain_type_recognized
 IF "%USE_JRF_WLST%" == "TRUE" (
     IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
diff --git a/installer/src/main/bin/updateDomain.cmd b/installer/src/main/bin/updateDomain.cmd
@@ -219,10 +219,11 @@ IF DEFINED DOMAIN_TYPE (
     SET USE_JRF_WLST=TRUE
     GOTO domain_type_recognized
   )
-  ECHO Domain type %DOMAIN_TYPE% not recognized by shell script...assuming JRF is required
-  SET USE_JRF_WLST=TRUE
 )
 
+ECHO Domain type "%DOMAIN_TYPE%" not recognized by shell script... assuming JRF is required
+SET USE_JRF_WLST=TRUE
+
 :domain_type_recognized
 IF "%USE_JRF_WLST%" == "TRUE" (
     IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (
diff --git a/installer/src/main/bin/validateModel.cmd b/installer/src/main/bin/validateModel.cmd
@@ -206,10 +206,11 @@ IF DEFINED DOMAIN_TYPE (
     SET USE_JRF_WLST=TRUE
     GOTO domain_type_recognized
   )
-  ECHO Domain type %DOMAIN_TYPE% not recognized by shell script...assuming JRF is required
-  SET USE_JRF_WLST=TRUE
 )
 
+ECHO Domain type "%DOMAIN_TYPE%" not recognized by shell script... assuming JRF is required
+SET USE_JRF_WLST=TRUE
+
 :domain_type_recognized
 IF "%USE_JRF_WLST%" == "TRUE" (
     IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (

Original file line number	Diff line number	Diff line change
`@@ -221,10 +221,11 @@ IF DEFINED DOMAIN_TYPE (`
`221`	`221`	`SET USE_JRF_WLST=TRUE`
`222`	`222`	`GOTO domain_type_recognized`
`223`	`223`	`)`
`224`		`- ECHO Domain type %DOMAIN_TYPE% not recognized by shell script...assuming JRF is required`
`225`		`- SET USE_JRF_WLST=TRUE`
`226`	`224`	`)`
`227`	`225`
	`226`	`+ECHO Domain type "%DOMAIN_TYPE%" not recognized by shell script... assuming JRF is required`
	`227`	`+SET USE_JRF_WLST=TRUE`
	`228`	`+`
`228`	`229`	`:domain_type_recognized`
`229`	`230`	`IF "%USE_JRF_WLST%" == "TRUE" (`
`230`	`231`	`IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (`
Original file line number	Diff line number	Diff line change
`@@ -219,10 +219,11 @@ IF DEFINED DOMAIN_TYPE (`
`219`	`219`	`SET USE_JRF_WLST=TRUE`
`220`	`220`	`GOTO domain_type_recognized`
`221`	`221`	`)`
`222`		`- ECHO Domain type %DOMAIN_TYPE% not recognized by shell script...assuming JRF is required`
`223`		`- SET USE_JRF_WLST=TRUE`
`224`	`222`	`)`
`225`	`223`
	`224`	`+ECHO Domain type "%DOMAIN_TYPE%" not recognized by shell script... assuming JRF is required`
	`225`	`+SET USE_JRF_WLST=TRUE`
	`226`	`+`
`226`	`227`	`:domain_type_recognized`
`227`	`228`	`IF "%USE_JRF_WLST%" == "TRUE" (`
`228`	`229`	`IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (`
Original file line number	Diff line number	Diff line change
`@@ -207,10 +207,11 @@ IF DEFINED DOMAIN_TYPE (`
`207`	`207`	`SET USE_JRF_WLST=TRUE`
`208`	`208`	`GOTO domain_type_recognized`
`209`	`209`	`)`
`210`		`- ECHO Domain type %DOMAIN_TYPE% not recognized by shell script...assuming JRF is required`
`211`		`- SET USE_JRF_WLST=TRUE`
`212`	`210`	`)`
`213`	`211`
	`212`	`+ECHO Domain type "%DOMAIN_TYPE%" not recognized by shell script... assuming JRF is required`
	`213`	`+SET USE_JRF_WLST=TRUE`
	`214`	`+`
`214`	`215`	`:domain_type_recognized`
`215`	`216`	`IF "%USE_JRF_WLST%" == "TRUE" (`
`216`	`217`	`IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (`
Original file line number	Diff line number	Diff line change
`@@ -215,10 +215,11 @@ IF DEFINED DOMAIN_TYPE (`
`215`	`215`	`SET USE_JRF_WLST=TRUE`
`216`	`216`	`GOTO domain_type_recognized`
`217`	`217`	`)`
`218`		`- ECHO Domain type %DOMAIN_TYPE% not recognized by shell script...assuming JRF is required`
`219`		`- SET USE_JRF_WLST=TRUE`
`220`	`218`	`)`
`221`	`219`
	`220`	`+ECHO Domain type "%DOMAIN_TYPE%" not recognized by shell script... assuming JRF is required`
	`221`	`+SET USE_JRF_WLST=TRUE`
	`222`	`+`
`222`	`223`	`:domain_type_recognized`
`223`	`224`	`IF "%USE_JRF_WLST%" == "TRUE" (`
`224`	`225`	`IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (`
Original file line number	Diff line number	Diff line change
`@@ -210,10 +210,11 @@ IF DEFINED DOMAIN_TYPE (`
`210`	`210`	`SET USE_JRF_WLST=TRUE`
`211`	`211`	`GOTO domain_type_recognized`
`212`	`212`	`)`
`213`		`- ECHO Domain type %DOMAIN_TYPE% not recognized by shell script...assuming JRF is required`
`214`		`- SET USE_JRF_WLST=TRUE`
`215`	`213`	`)`
`216`	`214`
	`215`	`+ECHO Domain type "%DOMAIN_TYPE%" not recognized by shell script... assuming JRF is required`
	`216`	`+SET USE_JRF_WLST=TRUE`
	`217`	`+`
`217`	`218`	`:domain_type_recognized`
`218`	`219`	`IF "%USE_JRF_WLST%" == "TRUE" (`
`219`	`220`	`IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (`
Original file line number	Diff line number	Diff line change
`@@ -206,10 +206,11 @@ IF DEFINED DOMAIN_TYPE (`
`206`	`206`	`SET USE_JRF_WLST=TRUE`
`207`	`207`	`GOTO domain_type_recognized`
`208`	`208`	`)`
`209`		`- ECHO Domain type %DOMAIN_TYPE% not recognized by shell script...assuming JRF is required`
`210`		`- SET USE_JRF_WLST=TRUE`
`211`	`209`	`)`
`212`	`210`
	`211`	`+ECHO Domain type "%DOMAIN_TYPE%" not recognized by shell script... assuming JRF is required`
	`212`	`+SET USE_JRF_WLST=TRUE`
	`213`	`+`
`213`	`214`	`:domain_type_recognized`
`214`	`215`	`IF "%USE_JRF_WLST%" == "TRUE" (`
`215`	`216`	`IF EXIST "%ORACLE_HOME%\oracle_common\common\bin\wlst.cmd" (`