Added checks for JMS and file stores; updated, sorted blacklists; added doc

Author: rakillen

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

@@ -120,27 +120,92 @@ def get_rcu_schemas(self):
         return list(self._domain_typedef['rcuSchemas'])
 
     def is_system_app(self, name):
+        """
+        Determine if the specified name matches a WLS system application.
+        :param name: the name to be checked
+        :return: True if the name matches a system application, False otherwise
+        """
         return self._is_system_name(name, 'apps')
 
-    def is_system_shared_library(self, name):
-        return self._is_system_name(name, 'shared-libraries')
+    def is_system_coherence_cluster(self, name):
+        """
+        Determine if the specified name matches a WLS system Coherence cluster.
+        :param name: the name to be checked
+        :return: True if the name matches a system Coherence cluster, False otherwise
+        """
+        return self._is_system_name(name, 'coherence-clusters')
 
     def is_system_datasource(self, name):
+        """
+        Determine if the specified name matches a WLS system datasource.
+        :param name: the name to be checked
+        :return: True if the name matches a system datasource, False otherwise
+        """
         return self._is_system_name(name, 'datasources')
 
-    def is_system_coherence_cluster(self, name):
-        return self._is_system_name(name, 'coherence-clusters')
+    def is_system_file_store(self, name):
+        """
+        Determine if the specified name matches a WLS system file store.
+        :param name: the name to be checked
+        :return: True if the name matches a system file store, False otherwise
+        """
+        return self._is_system_name(name, 'file-stores')
 
-    def is_system_wldf(self, name):
-        return self._is_system_name(name, 'wldf')
+    def is_system_jms(self, name):
+        """
+        Determine if the specified name matches a WLS system JMS resource.
+        :param name: the name to be checked
+        :return: True if the name matches a system JMS resource, False otherwise
+        """
+        return self._is_system_name(name, 'jms')
 
-    def is_system_startup_class(self, name):
-        return self._is_system_name(name, 'startup-classes')
+    def is_system_jms_server(self, name):
+        """
+        Determine if the specified name matches a WLS system JMS server.
+        :param name: the name to be checked
+        :return: True if the name matches a system JMS server, False otherwise
+        """
+        return self._is_system_name(name, 'jms-servers')
+
+    def is_system_shared_library(self, name):
+        """
+        Determine if the specified name matches a WLS system shared library.
+        :param name: the name to be checked
+        :return: True if the name matches a system shared library, False otherwise
+        """
+        return self._is_system_name(name, 'shared-libraries')
 
     def is_system_shutdown_class(self, name):
+        """
+        Determine if the specified name matches a WLS system shutdown class.
+        :param name: the name to be checked
+        :return: True if the name matches a system shutdown class, False otherwise
+        """
         return self._is_system_name(name, 'shutdown-classes')
 
+    def is_system_startup_class(self, name):
+        """
+        Determine if the specified name matches a WLS system startup class.
+        :param name: the name to be checked
+        :return: True if the name matches a system startup class, False otherwise
+        """
+        return self._is_system_name(name, 'startup-classes')
+
+    def is_system_wldf(self, name):
+        """
+        Determine if the specified name matches a WLS system WLDF resource.
+        :param name: the name to be checked
+        :return: True if the name matches a system WLDF resource, False otherwise
+        """
+        return self._is_system_name(name, 'wldf')
+
     def _is_system_name(self, name, key):
+        """
+        Determine if the specified name matches a WLS name of the specified type key.
+        :param name: the name to be checked
+        :param key: the key of the type to be checked against
+        :return: True if the name matches a system name, False otherwise
+        """
         if key in self._system_elements:
             system_names = self._system_elements[key]
             for system_name in system_names:

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

@@ -171,14 +171,18 @@ def get_file_stores(self):
         file_stores = self._find_names_in_folder(location)
         if file_stores is not None:
             _logger.info('WLSDPLY-06346', len(file_stores), class_name=_class_name, method_name=_method_name)
+            typedef = self._model_context.get_domain_typedef()
             name_token = self._alias_helper.get_name_token(location)
             for file_store in file_stores:
-                _logger.info('WLSDPLY-06347', file_store, class_name=_class_name, method_name=_method_name)
-                result[file_store] = OrderedDict()
-                location.add_name_token(name_token, file_store)
-                self._populate_model_parameters(result[file_store], location)
-                self.archive_file_store_directory(file_store, result[file_store])
-                location.remove_name_token(name_token)
+                if typedef.is_system_file_store(file_store):
+                    _logger.info('WLSDPLY-06363', file_store, class_name=_class_name, method_name=_method_name)
+                else:
+                    _logger.info('WLSDPLY-06347', file_store, class_name=_class_name, method_name=_method_name)
+                    result[file_store] = OrderedDict()
+                    location.add_name_token(name_token, file_store)
+                    self._populate_model_parameters(result[file_store], location)
+                    self.archive_file_store_directory(file_store, result[file_store])
+                    location.remove_name_token(name_token)
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=result)
         return model_top_folder_name, result
 

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

@@ -61,14 +61,18 @@ def get_jms_servers(self):
         jms_servers = self._find_names_in_folder(location)
         if jms_servers is not None:
             _logger.info('WLSDPLY-06470', len(jms_servers), class_name=_class_name, method_name=_method_name)
+            typedef = self._model_context.get_domain_typedef()
             name_token = self._alias_helper.get_name_token(location)
             for jms_server in jms_servers:
-                _logger.info('WLSDPLY-06471', jms_server, class_name=_class_name, method_name=_method_name)
-                location.add_name_token(name_token, jms_server)
-                result[jms_server] = OrderedDict()
-                self._populate_model_parameters(result[jms_server], location)
-                self._discover_subfolders(result[jms_server], location)
-                location.remove_name_token(name_token)
+                if typedef.is_system_jms_server(jms_server):
+                    _logger.info('WLSDPLY-06490', jms_server, class_name=_class_name, method_name=_method_name)
+                else:
+                    _logger.info('WLSDPLY-06471', jms_server, class_name=_class_name, method_name=_method_name)
+                    location.add_name_token(name_token, jms_server)
+                    result[jms_server] = OrderedDict()
+                    self._populate_model_parameters(result[jms_server], location)
+                    self._discover_subfolders(result[jms_server], location)
+                    location.remove_name_token(name_token)
 
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=result)
         return model_top_folder_name, result
@@ -161,17 +165,21 @@ def get_jms_system_resources(self):
         jms_resources = self._find_names_in_folder(location)
         if jms_resources is not None:
             _logger.info('WLSDPLY-06478', len(jms_resources), class_name=_class_name, method_name=_method_name)
+            typedef = self._model_context.get_domain_typedef()
             name_token = self._alias_helper.get_name_token(location)
             for jms_resource in jms_resources:
-                _logger.info('WLSDPLY-06479', jms_resource, class_name=_class_name, method_name=_method_name)
-                result[jms_resource] = OrderedDict()
-                location.add_name_token(name_token, jms_resource)
-                self._populate_model_parameters(result[jms_resource], location)
-                model_subfolder_name, subfolder_result = self._get_subdeployments(location)
-                discoverer.add_to_model_if_not_empty(result[jms_resource], model_subfolder_name, subfolder_result)
-                model_subfolder_name, subfolder_result = self._get_jms_resources(location)
-                discoverer.add_to_model_if_not_empty(result[jms_resource], model_subfolder_name, subfolder_result)
-                location.remove_name_token(name_token)
+                if typedef.is_system_jms(jms_resource):
+                    _logger.info('WLSDPLY-06491', jms_resource, class_name=_class_name, method_name=_method_name)
+                else:
+                    _logger.info('WLSDPLY-06479', jms_resource, class_name=_class_name, method_name=_method_name)
+                    result[jms_resource] = OrderedDict()
+                    location.add_name_token(name_token, jms_resource)
+                    self._populate_model_parameters(result[jms_resource], location)
+                    model_subfolder_name, subfolder_result = self._get_subdeployments(location)
+                    discoverer.add_to_model_if_not_empty(result[jms_resource], model_subfolder_name, subfolder_result)
+                    model_subfolder_name, subfolder_result = self._get_jms_resources(location)
+                    discoverer.add_to_model_if_not_empty(result[jms_resource], model_subfolder_name, subfolder_result)
+                    location.remove_name_token(name_token)
 
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=result)
         return model_top_folder_name, result

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

@@ -509,6 +509,7 @@ WLSDPLY-06359=Collect script from location {0} for WLDF script action {1}
 WLSDPLY-06360=Unable to locate and add {0} Script file {1} to archive file : {2}
 WLSDPLY-06361=Skipping system JDBC System Resource {0}
 WLSDPLY-06362=Skipping system WLDF System Resource {0}
+WLSDPLY-06363=Skipping system File Store {0}
 
 # deployments_discoverer.py
 WLSDPLY-06380=Discovering domain model deployments
@@ -575,6 +576,8 @@ WLSDPLY-06487=Adding Group Param with Sub-Deployment name {0} to {1}
 WLSDPLY-06488=Key missing for Foreign JNDI Property Foreign Server {0} to {1}. The JNDI Property \
   will not be added to the discovered model.
 WLSDPLY-06489=Adding JNDI Property with name {0} to {1}
+WLSDPLY-06490=Skipping system JMS Server {0}
+WLSDPLY-06491=Skipping system JMS System Resource {0}
 
 # topology_discoverer.py
 WLSDPLY-06600=Discovering domain model topology

core/src/main/typedefs/JRF.json

@@ -66,44 +66,55 @@
     },
     "system-elements": {
         "apps": [
+            "coherence-transaction-rar",
+            "DMS Application%%",
+            "em",
             "opss-rest",
             "state-management-provider-memory-rar",
-            "DMS Application%%",
-            "coherence-transaction-rar",
-            "em"
+            "wsm-pm"
         ],
         "coherence-clusters": [
             "defaultCoherenceCluster"
         ],
         "datasources": [
-            "WLSSchemaDataSource",
             "LocalSvcTblDataSource",
-            "opss-data-source",
-            "opss-audit-viewDS",
+            "mds-owsm",
             "opss-audit-DBDS",
+            "opss-audit-viewDS",
+            "opss-data-source",
+            "WLSSchemaDataSource"
+        ],
+        "file-stores": [
+            "JRFWSAsyncFileStore",
             "mds-owsm"
         ],
+        "jms": [
+            "JRFWSAsyncJmsModule"
+        ],
+        "jms-servers": [
+            "JRFWSAsyncJmsServer"
+        ],
         "shared-libraries": [
+            "adf.oracle.businesseditor%%",
             "adf.oracle.domain%%",
             "adf.oracle.domain.webapp%%",
-            "adf.oracle.businesseditor%%",
             "em_common%%",
             "em_core_ppc_pojo_jar",
             "em_error%%",
             "em_sdkcore_ppc_public_pojo_jar",
-            "emas",
             "emagentsdk_jar%%",
             "emagentsdkimpl_jar%%",
             "emagentsdkimplpriv_jar%%",
+            "emas",
             "emcore",
             "emcore_jar",
-            "emcoresdk_jar%%",
-            "emcoreintsdk_jar%%",
-            "emcoresdkimpl_jar%%",
+            "emcoreclient_jar",
             "emcorecommon_jar",
             "emcoreconsole_jar",
+            "emcoreintsdk_jar%%",
             "emcorepbs_jar",
-            "emcoreclient_jar",
+            "emcoresdk_jar%%",
+            "emcoresdkimpl_jar%%",
             "jsf%%",
             "jstl%%",
             "log4j_jar%%",
@@ -112,21 +123,24 @@
             "ohw-rcf%%",
             "ohw-uix%%",
             "oracle.adf.dconfigbeans%%",
-            "oracle.adf.management%%",
-            "oracle.adf.desktopintegration.model%%",
             "oracle.adf.desktopintegration%%",
-            "oracle.bi.jbips%%",
-            "oracle.bi.composer%%",
+            "oracle.adf.desktopintegration.model%%",
+            "oracle.adf.management%%",
             "oracle.bi.adf.model.slib%%",
             "oracle.bi.adf.view.slib%%",
             "oracle.bi.adf.webcenter.slib%%",
+            "oracle.bi.composer%%",
+            "oracle.bi.jbips%%",
             "oracle.dconfig-infra%%",
             "oracle.jrf.system.filter",
             "oracle.jsp.next%%",
             "oracle.pwdgen%%",
             "oracle.sdp.client%%",
+            "oracle.sdp.messaging%%",
             "oracle.webcenter.composer%%",
             "oracle.webcenter.skin%%",
+            "oracle.wsm.console%%",
+            "oracle.wsm.idmrest%%",
             "oracle.wsm.seedpolicies%%",
             "orai18n-adf%%",
             "owasp.esapi%%",