Merge pull request #56 from oracle/Issue#55-Change-method-signature-of-main()-to-main(args)

Changed main() method to main(args) in all the tool entry-point pytho…

Author: ddsharpe

core/src/main/python/create.py

@@ -295,20 +295,23 @@ def validate_model(model_dictionary, model_context, aliases):
         sys.exit(CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
 
 
-def main():
+def main(args):
     """
     The entry point for the create domain tool.
+
+    :param args:
+    :return:
     """
     _method_name = 'main'
 
-    __logger.entering(sys.argv[0], class_name=_class_name, method_name=_method_name)
-    for index, arg in enumerate(sys.argv):
+    __logger.entering(args[0], class_name=_class_name, method_name=_method_name)
+    for index, arg in enumerate(args):
         __logger.finer('sys.argv[{0}] = {1}', str(index), str(arg), class_name=_class_name, method_name=_method_name)
 
     wlst_helper.silence()
 
     try:
-        model_context = __process_args(sys.argv)
+        model_context = __process_args(args)
     except CLAException, ex:
         exit_code = ex.getExitCode()
         if exit_code != CommandLineArgUtil.HELP_EXIT_CODE:
@@ -362,4 +365,4 @@ def main():
 
 if __name__ == "main":
     WebLogicDeployToolingVersion.logVersionInfo(_program_name)
-    main()
+    main(sys.argv)

core/src/main/python/deploy.py

@@ -414,20 +414,23 @@ def validate_model(model_dictionary, model_context, aliases):
         sys.exit(CommandLineArgUtil.PROG_ERROR_EXIT_CODE)
 
 
-def main():
+def main(args):
     """
     The python entry point for deployApps.
+
+    :param args:
+    :return:
     """
     _method_name = 'main'
 
-    __logger.entering(sys.argv[0], class_name=_class_name, method_name=_method_name)
-    for index, arg in enumerate(sys.argv):
+    __logger.entering(args[0], class_name=_class_name, method_name=_method_name)
+    for index, arg in enumerate(args):
         __logger.finer('sys.argv[{0}] = {1}', str(index), str(arg), class_name=_class_name, method_name=_method_name)
 
     __wlst_helper.silence()
 
     try:
-        model_context = __process_args(sys.argv)
+        model_context = __process_args(args)
     except CLAException, ex:
         exit_code = ex.getExitCode()
         if exit_code != CommandLineArgUtil.HELP_EXIT_CODE:
@@ -476,4 +479,4 @@ def main():
 
 if __name__ == "main":
     WebLogicDeployToolingVersion.logVersionInfo(_program_name)
-    main()
+    main(sys.argv)

core/src/main/python/discover.py

@@ -390,14 +390,17 @@ def __log_and_exit(exit_code, _class_name, _method_name):
     sys.exit(exit_code)
 
 
-def main():
+def main(args):
     """
     The main entry point for the discoverDomain tool.
+
+    :param args:
+    :return:
     """
     _method_name = 'main'
 
     __logger.entering(class_name=_class_name, method_name=_method_name)
-    for index, arg in enumerate(sys.argv):
+    for index, arg in enumerate(args):
         __logger.finer('sys.argv[{0}] = {1}', str(index), str(arg), class_name=_class_name, method_name=_method_name)
 
     wlst_helper.silence()
@@ -406,7 +409,7 @@ def main():
 
     model_context = None
     try:
-        model_context = __process_args(sys.argv)
+        model_context = __process_args(args)
     except CLAException, ex:
         exit_code = ex.getExitCode()
         if exit_code != CommandLineArgUtil.HELP_EXIT_CODE:
@@ -446,4 +449,4 @@ def main():
 
 if __name__ == 'main':
     WebLogicDeployToolingVersion.logVersionInfo(_program_name)
-    main()
+    main(sys.argv)

core/src/main/python/encrypt.py

@@ -222,7 +222,7 @@ def _process_request(args):
     """
     _method_name = '_process_request'
 
-    __logger.entering(sys.argv[0], class_name=_class_name, method_name=_method_name)
+    __logger.entering(args[0], class_name=_class_name, method_name=_method_name)
     try:
         model_context = __process_args(args)
     except CLAException, ex:
@@ -250,21 +250,24 @@ def _process_request(args):
     return exit_code
 
 
-def main():
+def main(args):
     """
     The main entry point for the encryptModel tool.
+
+    :param args:
+    :return:
     """
     _method_name = 'main'
 
-    __logger.entering(sys.argv[0], class_name=_class_name, method_name=_method_name)
-    for index, arg in enumerate(sys.argv):
+    __logger.entering(args[0], class_name=_class_name, method_name=_method_name)
+    for index, arg in enumerate(args):
         __logger.finer('sys.argv[{0}] = {1}', str(index), str(arg), class_name=_class_name, method_name=_method_name)
 
     wlst_helper.silence()
-    exit_code = _process_request(sys.argv)
+    exit_code = _process_request(args)
     __logger.exiting(class_name=_class_name, method_name=_method_name, result=exit_code)
     sys.exit(exit_code)
 
 if __name__ == "main":
     WebLogicDeployToolingVersion.logVersionInfo(_program_name)
-    main()
+    main(sys.argv)

core/src/main/python/validate.py

@@ -256,20 +256,23 @@ def __perform_model_file_validation(model_file_name, model_context):
     __logger.exiting(class_name=_class_name, method_name=_method_name)
 
 
-def main():
+def main(args):
     """
     The main entry point for the validateModel tool.
+
+    :param args:
+    :return:
     """
     _method_name = 'main'
 
-    __logger.entering(sys.argv[0], class_name=_class_name, method_name=_method_name)
-    for index, arg in enumerate(sys.argv):
+    __logger.entering(args[0], class_name=_class_name, method_name=_method_name)
+    for index, arg in enumerate(args):
         __logger.finer('sys.argv[{0}] = {1}', str(index), arg, class_name=_class_name, method_name=_method_name)
 
     wlst_helper.silence()
 
     try:
-        model_context = __process_args(sys.argv)
+        model_context = __process_args(args)
     except CLAException, ex:
         exit_code = ex.getExitCode()
         if exit_code != CommandLineArgUtil.HELP_EXIT_CODE:
@@ -308,4 +311,4 @@ def main():
 
 if __name__ == "main":
     WebLogicDeployToolingVersion.logVersionInfo(_program_name)
-    main()
+    main(sys.argv)