Issue#639 add jpa m bean (#644)

* Fix java.lang.Boolean issues for ActiveDirectoryAuthenticator

* Add support for JPA MBean

* remove unused import statement

* fix version range

* Make generic method for domain mbean

Author: CarolynRountree

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

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 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.
 """
 import copy
@@ -51,6 +51,7 @@
 from wlsdeploy.aliases.model_constants import DOMAIN_INFO_ALIAS
 from wlsdeploy.aliases.model_constants import KUBERNETES_ALIAS
 from wlsdeploy.aliases.model_constants import JOLT_CONNECTION_POOL
+from wlsdeploy.aliases.model_constants import JPA
 from wlsdeploy.aliases.model_constants import KUBERNETES
 from wlsdeploy.aliases.model_constants import ODL_CONFIGURATION
 from wlsdeploy.aliases.model_constants import OHS
@@ -93,6 +94,7 @@ class AliasEntries(object):
         'Cluster',
         'EmbeddedLDAP',
         'JMX',
+        JPA,
         'JTA',
         'Log',
         'LogFilter',

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

@@ -150,6 +150,7 @@
 JMX_NOTIFICATION = 'JMXNotification'
 JNDI_NAME = 'JNDIName'
 JNDI_PROPERTY = 'JNDIProperty'
+JPA = 'JPA'
 JTA = 'JTA'
 JTA_PARTITION = 'JtaPartition'
 JTA_MIGRATABLE_TARGET = 'JTAMigratableTarget'

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

@@ -64,6 +64,24 @@ def __init__(self, model_context, base_location, wlst_mode, aliases=None, variab
         self._mbean_utils = MBeanUtils(self._model_context, self._alias_helper, ExceptionType.DISCOVER)
         self._wls_version = self._weblogic_helper.get_actual_weblogic_version()
 
+    def discover_domain_mbean(self, model_top_folder_name):
+        """
+        Discover the domain specific MBean and its configuration attributes.
+        :return: model name for domain MBean:dictionary containing the discovered Domain MBean attributes
+        """
+        _method_name = 'discover_domain_mbean'
+        _logger.entering(model_top_folder_name, class_name=_class_name, method_name=_method_name)
+        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-06644', model_top_folder_name, 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
+
     # methods for use only by the subclasses
     def _populate_model_parameters(self, dictionary, location):
         """

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

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.  All rights reserved.
+Copyright (c) 2017, 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.
 """
 from java.io import File
@@ -291,6 +291,8 @@ def discover_domain_parameters(self):
         discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
         model_folder_name, folder_result = self._get_nm_properties()
         discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
+        model_folder_name, folder_result = self.discover_domain_mbean(model_constants.JPA)
+        discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
 
         _logger.exiting(class_name=_class_name, method_name=_method_name)
 

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

@@ -0,0 +1,23 @@
+{
+  "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": "JPA",
+  "child_folders_type": "single_unpredictable",
+  "default_name_value": "${NO_NAME_0:%DOMAIN%}",
+  "folder_params": [{
+    "version": "[10,12.1.3)",
+    "wlst_mode": "online"
+  }, {
+    "version": "[12.1.3,)"
+  }],
+  "folders": {},
+  "attributes": {
+    "DefaultJpaProvider":    [ {"version": "[10,12.1.3)",  "wlst_mode": "online", "wlst_name": "DefaultJPAProvider",          "wlst_path": "WP001", "value": {"default": "org.eclipse.persistence.jpa.PersistenceProvider"  }, "wlst_type": "string"         } ,
+                               {"version": "[12.1.3,)",    "wlst_mode": "both",   "wlst_name": "Default${Jpa:JPA}Provider",   "wlst_path": "WP001", "value": {"default": "org.eclipse.persistence.jpa.PersistenceProvider"  }, "wlst_type": "string"         } ],
+    "Notes":                 [ {"version": "[10,)",        "wlst_mode": "both",   "wlst_name": "Notes",                       "wlst_path": "WP001", "value": {"default": "None"                                             }, "wlst_type": "string"         } ]
+  },
+  "wlst_attributes_path": "WP001",
+  "wlst_paths": {
+    "WP001": "/JPA/%JPA%"
+  }
+}

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

@@ -728,6 +728,7 @@ WLSDPLY-06642=Custom Keystore file {0} at location {1} is a kss type which is no
   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
+WLSDPLY-06644=Adding Domain {0}
 
 
 # multi_tenant_discoverer.py, multi_tenant_resources_dsi