Skip to content

Commit 6379cbc

Browse files
committed
JIRA WDT-269 - Add summary report for updateDomain and deployApps CMD scripts
1 parent ea6bc0d commit 6379cbc

File tree

4 files changed

+20
-2
lines changed

4 files changed

+20
-2
lines changed

core/src/main/python/deploy.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ def __process_online_args(optional_arg_map):
232232
optional_arg_map[CommandLineArgUtil.ADMIN_PASS_SWITCH] = String(password)
233233

234234
mode = WlstModes.ONLINE
235+
optional_arg_map[CommandLineArgUtil.TARGET_MODE_SWITCH] = 'online'
235236
return mode
236237

237238

@@ -435,6 +436,8 @@ def main(args):
435436

436437
__wlst_helper.silence()
437438

439+
exit_code = CommandLineArgUtil.PROG_OK_EXIT_CODE
440+
438441
try:
439442
model_context = __process_args(args)
440443
except CLAException, ex:
@@ -482,6 +485,8 @@ def main(args):
482485
tool_exit.end(model_context, CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
483486

484487
__clean_up_temp_files()
488+
489+
tool_exit.end(model_context, exit_code)
485490
return
486491

487492

core/src/main/python/update.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ def __process_online_args(optional_arg_map):
245245
optional_arg_map[CommandLineArgUtil.ADMIN_PASS_SWITCH] = String(password)
246246

247247
mode = WlstModes.ONLINE
248+
optional_arg_map[CommandLineArgUtil.TARGET_MODE_SWITCH] = 'online'
248249
return mode
249250

250251

@@ -454,6 +455,8 @@ def main(args):
454455

455456
__wlst_helper.silence()
456457

458+
exit_code = CommandLineArgUtil.PROG_OK_EXIT_CODE
459+
457460
try:
458461
model_context = __process_args(args)
459462
except CLAException, ex:
@@ -501,6 +504,8 @@ def main(args):
501504
tool_exit.end(model_context, CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
502505

503506
__clean_up_temp_files()
507+
508+
tool_exit.end(model_context, exit_code)
504509
return
505510

506511

installer/src/main/bin/deployApps.cmd

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,8 @@ IF NOT EXIST "%WLST%" (
268268
)
269269
:found_wlst
270270

271-
SET LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployLoggingConfig
271+
SET LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployCustomizeLoggingConfig
272+
SET WLSDEPLOY_LOG_HANDLER=oracle.weblogic.deploy.logging.SummaryHandler
272273
SET WLST_PROPERTIES=-Dcom.oracle.cie.script.throwException=true
273274
SET "WLST_PROPERTIES=-Djava.util.logging.config.class=%LOG_CONFIG_CLASS% %WLST_PROPERTIES%"
274275
SET "WLST_PROPERTIES=%WLST_PROPERTIES% %WLSDEPLOY_PROPERTIES%"
@@ -279,6 +280,9 @@ IF NOT DEFINED WLSDEPLOY_LOG_PROPERTIES (
279280
IF NOT DEFINED WLSDEPLOY_LOG_DIRECTORY (
280281
SET WLSDEPLOY_LOG_DIRECTORY=%WLSDEPLOY_HOME%\logs
281282
)
283+
IF NOT DEFINED WLSDEPLOY_LOG_HANDLERS (
284+
SET WLSDEPLOY_LOG_HANDLERS=%WLSDEPLOY_LOG_HANDLER%
285+
)
282286

283287
ECHO JAVA_HOME = %JAVA_HOME%
284288
ECHO WLST_EXT_CLASSPATH = %WLST_EXT_CLASSPATH%

installer/src/main/bin/updateDomain.cmd

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,8 @@ IF NOT EXIST "%WLST%" (
268268
)
269269
:found_wlst
270270

271-
SET LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployLoggingConfig
271+
SET LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployCustomizeLoggingConfig
272+
SET WLSDEPLOY_LOG_HANDLER=oracle.weblogic.deploy.logging.SummaryHandler
272273
SET WLST_PROPERTIES=-Dcom.oracle.cie.script.throwException=true
273274
SET "WLST_PROPERTIES=-Djava.util.logging.config.class=%LOG_CONFIG_CLASS% %WLST_PROPERTIES%"
274275
SET "WLST_PROPERTIES=%WLST_PROPERTIES% %WLSDEPLOY_PROPERTIES%"
@@ -279,6 +280,9 @@ IF NOT DEFINED WLSDEPLOY_LOG_PROPERTIES (
279280
IF NOT DEFINED WLSDEPLOY_LOG_DIRECTORY (
280281
SET WLSDEPLOY_LOG_DIRECTORY=%WLSDEPLOY_HOME%\logs
281282
)
283+
IF NOT DEFINED WLSDEPLOY_LOG_HANDLERS (
284+
SET WLSDEPLOY_LOG_HANDLERS=%WLSDEPLOY_LOG_HANDLER%
285+
)
282286

283287
ECHO JAVA_HOME = %JAVA_HOME%
284288
ECHO WLST_EXT_CLASSPATH = %WLST_EXT_CLASSPATH%

0 commit comments

Comments
 (0)