JIRA WDT-638 - handle sys.exit(). Ensure exception type is always pri…

…nted/logged.

core/src/main/python/compare_model.py

@@ -351,5 +351,7 @@ def format_message(key, *args):
 if __name__ == "__main__":
  try:
  main()
+ except exceptions.SystemExit, ex:
+ raise ex
  except (exceptions.Exception, java.lang.Exception), ex:
  exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, _logger)

core/src/main/python/create.py

@@ -380,6 +380,7 @@ def main(args):
  WebLogicDeployToolingVersion.logVersionInfo(_program_name)
  try:
  main(sys.argv)
+ except exceptions.SystemExit, ex:
+ raise ex
  except (exceptions.Exception, java.lang.Exception), ex:
  exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)
-

core/src/main/python/deploy.py

@@ -262,5 +262,7 @@ def main(args):
  WebLogicDeployToolingVersion.logVersionInfo(_program_name)
  try:
  main(sys.argv)
+ except exceptions.SystemExit, ex:
+ raise ex
  except (exceptions.Exception, java.lang.Exception), ex:
  exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)

core/src/main/python/discover.py

@@ -642,6 +642,7 @@ def main(args):
  WebLogicDeployToolingVersion.logVersionInfo(_program_name)
  try:
  main(sys.argv)
+ except exceptions.SystemExit, ex:
+ raise ex
  except (exceptions.Exception, java.lang.Exception), ex:
  exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)
-

core/src/main/python/encrypt.py

@@ -256,5 +256,7 @@ def main(args):
  WebLogicDeployToolingVersion.logVersionInfo(_program_name)
  try:
  main(sys.argv)
+ except exceptions.SystemExit, ex:
+ raise ex
  except (exceptions.Exception, java.lang.Exception), ex:
  exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)

core/src/main/python/extract_resource.py

@@ -161,5 +161,7 @@ def main(args):
  WebLogicDeployToolingVersion.logVersionInfo(_program_name)
  try:
  main(sys.argv)
+ except exceptions.SystemExit, ex:
+ raise ex
  except (exceptions.Exception, java.lang.Exception), ex:
  exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)

core/src/main/python/model_help.py

@@ -137,5 +137,7 @@ def main(args):
  WebLogicDeployToolingVersion.logVersionInfo(_program_name)
  try:
  main(sys.argv)
+ except exceptions.SystemExit, ex:
+ raise ex
  except (exceptions.Exception, java.lang.Exception), ex:
  exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)

core/src/main/python/prepare_model.py

@@ -113,5 +113,7 @@ def main():
  WebLogicDeployToolingVersion.logVersionInfo(_program_name)
  try:
  main()
+ except exceptions.SystemExit, ex:
+ raise ex
  except (exceptions.Exception, java.lang.Exception), ex:
  exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)

core/src/main/python/update.py

@@ -312,5 +312,7 @@ def main(args):
  WebLogicDeployToolingVersion.logVersionInfo(_program_name)
  try:
  main(sys.argv)
+ except exceptions.SystemExit, ex:
+ raise ex
  except (exceptions.Exception, java.lang.Exception), ex:
  exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)

core/src/main/python/validate.py

@@ -201,5 +201,7 @@ def main(args):
  WebLogicDeployToolingVersion.logVersionInfo(_program_name)
  try:
  main(sys.argv)
+ except exceptions.SystemExit, ex:
+ raise ex
  except (exceptions.Exception, java.lang.Exception), ex:
  exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)

core/src/main/python/variable_inject.py

@@ -207,5 +207,7 @@ def main(args):
  WebLogicDeployToolingVersion.logVersionInfo(_program_name)
  try:
  main(sys.argv)
+ except exceptions.SystemExit, ex:
+ raise ex
  except (exceptions.Exception, java.lang.Exception), ex:
  exception_helper.__handleUnexpectedException(ex, _program_name, _class_name, __logger)

core/src/main/python/wlsdeploy/exception/exception_helper.py

@@ -485,7 +485,7 @@ def __handleUnexpectedException(ex, program_name, class_name, logger):
  :param class_name: the class where it occurred
  :param logger: the logger to use
  """
- logger.severe('WLSDPLY-20035', program_name, ex)
+ logger.severe('WLSDPLY-20035', program_name, sys.exc_info()[0])
 
  if hasattr(ex, 'stackTrace'):
  # this works best for java exceptions, and gets the full stacktrace all the way back to weblogic.WLST

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -1671,7 +1671,7 @@ WLSDPLY-20031={0} specified Variable File {1} is not a valid file: {2}
 WLSDPLY-20032=No model specified and no model in archive, no validation performed
 WLSDPLY-20033=Applying filter with name "{0}"
 WLSDPLY-20034=Applying filter with ID "{0}"
-WLSDPLY-20035={0} encountered an unexpected runtime exception. Please file an issue on GitHub and attach the log file and stdout. Error: {1}
+WLSDPLY-20035={0} encountered an unexpected runtime exception. Please file an issue on GitHub and attach the log file and stdout. Exception: {1}
 WLSDPLY-20036={0} encountered an unexpected runtime exception. Stacktrace: {1}
 
 # Messages for internal filters