Issue #354 - Improve check for JRF domain type

Author: rakillen

core/src/main/python/wlsdeploy/tool/create/domain_typedef.py

@@ -28,8 +28,7 @@ class DomainTypedef(object):
     __domain_typedefs_location = os.path.join(os.environ.get('WLSDEPLOY_HOME'), 'lib', 'typedefs')
     __domain_typedef_extension = '.json'
 
-    __wild_card_suffix = '%%'
-    __wild_card_suffix_len = len(__wild_card_suffix)
+    JRF_TEMPLATE_REGEX = "^(.*jrf_template[0-9._]*\\.jar)|(Oracle JRF WebServices Asynchronous services)$"
 
     def __init__(self, program_name, domain_type):
         """
@@ -95,12 +94,16 @@ def get_domain_type(self):
         """
         return self._domain_type
 
-    def domain_type_is_jrf(self):
+    def is_jrf_domain_type(self):
         """
-        Determine if the tool is running with domain type JRF or RestrictedJRF.
-        :return : True if running with domain type JRF or RestrictedJRF.
+        Determine if this is a JRF domain type by checking for the JRF extension template.
+        This returns False for the Restricted JRF domain type.
+        :return: True if the JRF template is present
         """
-        return self.get_domain_type() == 'JRF' or self.get_domain_type() == 'RestrictedJRF'
+        for template in self.get_extension_templates():
+            if re.match(self.JRF_TEMPLATE_REGEX, template):
+                return True
+        return False
 
     def domain_type_has_jrf_resources(self):
         """