Create server template JTA migratable target with ${serverName} macro (#536)

* Use revised WLST helper for extract resource tool

* JIRA-OWLS-79762 Create server template JTA migratable target with ${serverName} macro

Author: rakillen

core/src/main/python/extract_resource.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2020, Oracle Corporation and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 The entry point for the extractDomainResource tool.
@@ -20,22 +20,22 @@
 from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.tool.extract.domain_resource_extractor import DomainResourceExtractor
 from wlsdeploy.tool.util import model_context_helper
+from wlsdeploy.tool.util import wlst_helper
 from wlsdeploy.tool.util.wlst_helper import WlstHelper
 from wlsdeploy.util import cla_helper
 from wlsdeploy.util import tool_exit
-from wlsdeploy.util import wlst_extended
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util.cla_utils import TOOL_TYPE_EXTRACT
 from wlsdeploy.util.model import Model
 from wlsdeploy.util.weblogic_helper import WebLogicHelper
 
-wlst_extended.wlst_functions = globals()
+wlst_helper.wlst_functions = globals()
 
 _program_name = 'extractDomainResource'
 _class_name = 'extract_resource'
 __logger = PlatformLogger('wlsdeploy.extract')
 __wls_helper = WebLogicHelper(__logger)
-__wlst_helper = WlstHelper(__logger, ExceptionType.DEPLOY)
+__wlst_helper = WlstHelper(ExceptionType.DEPLOY)
 __wlst_mode = WlstModes.OFFLINE
 
 __required_arguments = [

core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json

@@ -1,5 +1,5 @@
 {
-    "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "ServerTemplate${:s}",
     "version": "[12.1.2,)",
@@ -202,7 +202,7 @@
             "wlst_type": "JTAMigratableTarget",
             "version": "[12.1.2,)",
             "child_folders_type": "single_unpredictable",
-            "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
+            "default_name_value": "${serverName}",
             "folders": {},
             "attributes": {
                 "AdditionalMigrationAttempts":  [ {"version": "[12.1.2,)", "wlst_mode": "both",     "wlst_name": "AdditionalMigrationAttempts",  "wlst_path": "WP001", "value": {"default": 2       }, "wlst_type": "integer"  } ],