Issue#599 add cdi container mbean (#600)

* Fix java.lang.Boolean issues for ActiveDirectoryAuthenticator

* Add CdiContainer mbean

* Put CDIContainer in topology deployer

* Update CdiContainer.json

Author: CarolynRountree

core/src/main/python/wlsdeploy/aliases/alias_entries.py

@@ -87,6 +87,7 @@ class AliasEntries(object):
 
     __topology_top_level_folders = [
         'AdminConsole',
+        'CdiContainer',
         'Cluster',
         'EmbeddedLDAP',
         'JMX',

core/src/main/python/wlsdeploy/aliases/model_constants.py

@@ -37,6 +37,7 @@
 AUTHENTICATION_PROVIDER = 'AuthenticationProvider'
 AUTHORIZER = 'Authorizer'
 CAPACITY = 'Capacity'
+CDI_CONTAINER = 'CdiContainer'
 CERT_PATH_PROVIDER = 'CertPathProvider'
 CERTIFICATE_REGISTRY = 'CertificateRegistry'
 CLASSPATH = 'ClassPath'

core/src/main/python/wlsdeploy/tool/deploy/topology_updater.py

@@ -4,6 +4,7 @@
 """
 from wlsdeploy.aliases.location_context import LocationContext
 from wlsdeploy.aliases.model_constants import ADMIN_CONSOLE
+from wlsdeploy.aliases.model_constants import CDI_CONTAINER
 from wlsdeploy.aliases.model_constants import CLUSTER
 from wlsdeploy.aliases.model_constants import CREATE_ONLY_DOMAIN_ATTRIBUTES
 from wlsdeploy.aliases.model_constants import MACHINE
@@ -95,6 +96,7 @@ def update(self):
         self._set_domain_attributes()
 
         self._process_section(self._topology, folder_list, ADMIN_CONSOLE, location)
+        self._process_section(self._topology, folder_list, CDI_CONTAINER, location)
         self._process_section(self._topology, folder_list, MACHINE, location)
         self._process_section(self._topology, folder_list, UNIX_MACHINE, location)
 

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

@@ -271,6 +271,8 @@ def discover_domain_parameters(self):
 
         model_folder_name, folder_result = self._get_admin_console()
         discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
+        model_folder_name, folder_result = self._get_cdi_container()
+        discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
         model_folder_name, folder_result = self._get_jta()
         discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
         model_folder_name, folder_result = self._get_jmx()
@@ -366,6 +368,25 @@ def _get_admin_console(self):
         _logger.exiting(class_name=_class_name, method_name=_method_name)
         return model_top_folder_name, result
 
+    def _get_cdi_container(self):
+        """
+        Discover the domain level CdiContainer configuration attributes.
+        :return: model name for CdiContainer: dictionary containing the discovered CdiContainer attributes
+        """
+        _method_name = '_get_cdi_container'
+        _logger.entering(class_name=_class_name, method_name=_method_name)
+        model_top_folder_name = model_constants.CDI_CONTAINER
+        result = OrderedDict()
+        location = LocationContext(self._base_location)
+        location.append_location(model_top_folder_name)
+        name = self._find_singleton_name_in_folder(location)
+        if name is not None:
+            _logger.info('WLSDPLY-06643', class_name=_class_name, method_name=_method_name)
+            location.add_name_token(self._alias_helper.get_name_token(location), name)
+            self._populate_model_parameters(result, location)
+        _logger.exiting(class_name=_class_name, method_name=_method_name)
+        return model_top_folder_name, result
+
     def _get_jta(self):
         """
         Discover the domain level JTA configuration attributes.

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

@@ -0,0 +1,18 @@
+{
+  "copyright": "Copyright (c) 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": "CdiContainer",
+  "version": "[12.2.1,)",
+  "child_folders_type": "single_unpredictable",
+  "default_name_value": "${NO_NAME_0:%DOMAIN%}",
+  "folders": {},
+  "attributes": {
+    "ImplicitBeanDiscoveryEnabled":   [ {"version": "[12.2.1,)",   "wlst_mode": "both", "wlst_name": "ImplicitBeanDiscoveryEnabled",      "wlst_path": "WP001", "value": {"default": "true"                }, "wlst_type": "boolean" } ],
+    "Notes":                          [ {"version": "[12.2.1,)",   "wlst_mode": "both", "wlst_name": "Notes",                             "wlst_path": "WP001", "value": {"default": "None"                }, "wlst_type": "string"  } ],
+    "Policy":                         [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "Policy",                            "wlst_path": "WP001", "value": {"default": "None"                }, "wlst_type": "string"  } ]
+  },
+  "wlst_attributes_path": "WP001",
+  "wlst_paths": {
+    "WP001": "/CdiContainer/%CdiContainer%"
+  }
+}

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

@@ -698,6 +698,7 @@ WLSDPLY-06641=Custom Keystore file name at location {0} is {1}
 WLSDPLY-06642=Custom Keystore file {0} at location {1} is a kss type which is not currently supported. \
   The Custom Keystore file will not be added to the archive file. Use export / import to \
   add the file to the target domain
+WLSDPLY-06643=Adding Domain CdiContainer
 
 
 # multi_tenant_discoverer.py, multi_tenant_resources_dsi