Merge pull request #320 from oracle/jira-wdt-269-console-summary

Jira wdt 269 console summary

Author: CarolynRountree

core/src/main/python/deploy.py

@@ -232,6 +232,7 @@ def __process_online_args(optional_arg_map):
             optional_arg_map[CommandLineArgUtil.ADMIN_PASS_SWITCH] = String(password)
 
         mode = WlstModes.ONLINE
+        optional_arg_map[CommandLineArgUtil.TARGET_MODE_SWITCH] = 'online'
     return mode
 
 
@@ -435,6 +436,8 @@ def main(args):
 
     __wlst_helper.silence()
 
+    exit_code = CommandLineArgUtil.PROG_OK_EXIT_CODE
+
     try:
         model_context = __process_args(args)
     except CLAException, ex:
@@ -482,6 +485,8 @@ def main(args):
         tool_exit.end(model_context, CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
 
     __clean_up_temp_files()
+
+    tool_exit.end(model_context, exit_code)
     return
 
 

core/src/main/python/update.py

@@ -245,6 +245,7 @@ def __process_online_args(optional_arg_map):
             optional_arg_map[CommandLineArgUtil.ADMIN_PASS_SWITCH] = String(password)
 
         mode = WlstModes.ONLINE
+        optional_arg_map[CommandLineArgUtil.TARGET_MODE_SWITCH] = 'online'
     return mode
 
 
@@ -454,6 +455,8 @@ def main(args):
 
     __wlst_helper.silence()
 
+    exit_code = CommandLineArgUtil.PROG_OK_EXIT_CODE
+
     try:
         model_context = __process_args(args)
     except CLAException, ex:
@@ -501,6 +504,8 @@ def main(args):
         tool_exit.end(model_context, CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
 
     __clean_up_temp_files()
+
+    tool_exit.end(model_context, exit_code)
     return
 
 

installer/src/main/bin/deployApps.cmd

@@ -2,7 +2,7 @@
 @rem **************************************************************************
 @rem deployApps.cmd
 @rem
-@rem Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+@rem Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 @rem The Universal Permissive License (UPL), Version 1.0
 @rem
 @rem     NAME
@@ -268,7 +268,8 @@ IF NOT EXIST "%WLST%" (
 )
 :found_wlst
 
-SET LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployLoggingConfig
+SET LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployCustomizeLoggingConfig
+SET WLSDEPLOY_LOG_HANDLER=oracle.weblogic.deploy.logging.SummaryHandler
 SET WLST_PROPERTIES=-Dcom.oracle.cie.script.throwException=true
 SET "WLST_PROPERTIES=-Djava.util.logging.config.class=%LOG_CONFIG_CLASS% %WLST_PROPERTIES%"
 SET "WLST_PROPERTIES=%WLST_PROPERTIES% %WLSDEPLOY_PROPERTIES%"
@@ -279,6 +280,9 @@ IF NOT DEFINED WLSDEPLOY_LOG_PROPERTIES (
 IF NOT DEFINED WLSDEPLOY_LOG_DIRECTORY (
   SET WLSDEPLOY_LOG_DIRECTORY=%WLSDEPLOY_HOME%\logs
 )
+IF NOT DEFINED WLSDEPLOY_LOG_HANDLERS (
+  SET WLSDEPLOY_LOG_HANDLERS=%WLSDEPLOY_LOG_HANDLER%
+)
 
 ECHO JAVA_HOME = %JAVA_HOME%
 ECHO WLST_EXT_CLASSPATH = %WLST_EXT_CLASSPATH%

installer/src/main/bin/deployApps.sh

@@ -2,7 +2,7 @@
 # *****************************************************************************
 # deployApps.sh
 #
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 # The Universal Permissive License (UPL), Version 1.0
 #
 #     NAME
@@ -281,7 +281,8 @@ else
     fi
 fi
 
-LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployLoggingConfig
+LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployCustomizeLoggingConfig
+WLSDEPLOY_LOG_HANDLER=oracle.weblogic.deploy.logging.SummaryHandler
 WLST_PROPERTIES=-Dcom.oracle.cie.script.throwException=true
 WLST_PROPERTIES="-Djava.util.logging.config.class=${LOG_CONFIG_CLASS} ${WLST_PROPERTIES} ${WLSDEPLOY_PROPERTIES}"
 export WLST_PROPERTIES
@@ -294,6 +295,10 @@ if [ "${WLSDEPLOY_LOG_DIRECTORY}" = "" ]; then
     WLSDEPLOY_LOG_DIRECTORY=${WLSDEPLOY_HOME}/logs; export WLSDEPLOY_LOG_DIRECTORY
 fi
 
+if [ "${WLSDEPLOY_LOG_HANDLERS}" == "" ]; then
+    WLSDEPLOY_LOG_HANDLERS=${WLSDEPLOY_LOG_HANDLER}; export WLSDEPLOY_LOG_HANDLERS
+fi
+
 echo "JAVA_HOME = ${JAVA_HOME}"
 echo "WLST_EXT_CLASSPATH = ${WLST_EXT_CLASSPATH}"
 echo "CLASSPATH = ${CLASSPATH}"

installer/src/main/bin/updateDomain.cmd

@@ -2,7 +2,7 @@
 @rem **************************************************************************
 @rem updateDomain.cmd
 @rem
-@rem Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+@rem Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 @rem The Universal Permissive License (UPL), Version 1.0
 @rem
 @rem     NAME
@@ -268,7 +268,8 @@ IF NOT EXIST "%WLST%" (
 )
 :found_wlst
 
-SET LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployLoggingConfig
+SET LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployCustomizeLoggingConfig
+SET WLSDEPLOY_LOG_HANDLER=oracle.weblogic.deploy.logging.SummaryHandler
 SET WLST_PROPERTIES=-Dcom.oracle.cie.script.throwException=true
 SET "WLST_PROPERTIES=-Djava.util.logging.config.class=%LOG_CONFIG_CLASS% %WLST_PROPERTIES%"
 SET "WLST_PROPERTIES=%WLST_PROPERTIES% %WLSDEPLOY_PROPERTIES%"
@@ -279,6 +280,9 @@ IF NOT DEFINED WLSDEPLOY_LOG_PROPERTIES (
 IF NOT DEFINED WLSDEPLOY_LOG_DIRECTORY (
   SET WLSDEPLOY_LOG_DIRECTORY=%WLSDEPLOY_HOME%\logs
 )
+IF NOT DEFINED WLSDEPLOY_LOG_HANDLERS (
+  SET WLSDEPLOY_LOG_HANDLERS=%WLSDEPLOY_LOG_HANDLER%
+)
 
 ECHO JAVA_HOME = %JAVA_HOME%
 ECHO WLST_EXT_CLASSPATH = %WLST_EXT_CLASSPATH%

installer/src/main/bin/updateDomain.sh

@@ -2,7 +2,7 @@
 # *****************************************************************************
 # updateDomain.sh
 #
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 # The Universal Permissive License (UPL), Version 1.0
 #
 #     NAME
@@ -279,7 +279,8 @@ else
     fi
 fi
 
-LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployLoggingConfig
+LOG_CONFIG_CLASS=oracle.weblogic.deploy.logging.WLSDeployCustomizeLoggingConfig
+WLSDEPLOY_LOG_HANDLER=oracle.weblogic.deploy.logging.SummaryHandler
 WLST_PROPERTIES=-Dcom.oracle.cie.script.throwException=true
 WLST_PROPERTIES="-Djava.util.logging.config.class=${LOG_CONFIG_CLASS} ${WLST_PROPERTIES} ${WLSDEPLOY_PROPERTIES}"
 export WLST_PROPERTIES
@@ -292,6 +293,10 @@ if [ "${WLSDEPLOY_LOG_DIRECTORY}" = "" ]; then
     WLSDEPLOY_LOG_DIRECTORY=${WLSDEPLOY_HOME}/logs; export WLSDEPLOY_LOG_DIRECTORY
 fi
 
+if [ "${WLSDEPLOY_LOG_HANDLERS}" == "" ]; then
+    WLSDEPLOY_LOG_HANDLERS=${WLSDEPLOY_LOG_HANDLER}; export WLSDEPLOY_LOG_HANDLERS
+fi
+
 echo "JAVA_HOME = ${JAVA_HOME}"
 echo "WLST_EXT_CLASSPATH = ${WLST_EXT_CLASSPATH}"
 echo "CLASSPATH = ${CLASSPATH}"