Wdt add ohs to resource group template (#632)

* Fix java.lang.Boolean issues for ActiveDirectoryAuthenticator

* Add system component and OHS to resource group template

Author: CarolynRountree

core/src/main/python/wlsdeploy/tool/discover/discoverer.py

@@ -528,7 +528,12 @@ def _get_model_name(self, location, wlst_name):
         # The below call will throw an exception if the folder does not exist; need to have that
         # exception thrown. The get_model_subfolder_name does not throw an exception if the alias
         # does not exist. We do not want an exception if the folder is just not available for the version
-        mbean_type = self._alias_helper.get_wlst_mbean_type(location)
+        # Update 05/21/20 - does not make sense to stop discover because of missing alias definition.
+        try:
+            mbean_type = self._alias_helper.get_wlst_mbean_type(location)
+        except DiscoverException, ae:
+            _logger.warning('WLSDPLY-06156', str(location), class_name=_class_name, method_name=_method_name)
+            mbean_type = None
         if mbean_type:
             model_name = self._alias_helper.get_model_subfolder_name(location, wlst_name)
             _logger.finest('WLSDPLY-06118', model_name, wlst_name, class_name=_class_name, method_name=_method_name)

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

@@ -29,8 +29,10 @@
         "Library",
         "MailSession",
         "MessagingBridge",
+        "OHS",
         "PathService",
         "SAFAgent",
+        "SystemComponent",
         "WLDFSystemResource"
     ]
 }

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

@@ -533,6 +533,7 @@ WLSDPLY-06153=Attribute {0} for model folder at location {1} is not in the lsa m
 WLSDPLY-06154=Attribute {0} for model folder at location {1} is not in the lsa map and is not defined with get \
    to retrieve the attribute value
 WLSDPLY-06155=Attribute {0} value at location {1} replaced by token {2}
+WLSDPLY-06156=MBean not defined in alias definitions at location {0}. Will skip discovery of MBean folder.
 
 # mbean_getter.py, attribute_getter.py specific to discover
 WLSDPLY-06200=Unable to get the Security Realm Provider name in version {0} with offline WLST. \