diff --git a/core/src/main/python/wlsdeploy/tool/create/domain_typedef.py b/core/src/main/python/wlsdeploy/tool/create/domain_typedef.py index ab0aa2df0..042931669 100644 --- a/core/src/main/python/wlsdeploy/tool/create/domain_typedef.py +++ b/core/src/main/python/wlsdeploy/tool/create/domain_typedef.py @@ -83,6 +83,13 @@ def set_model_context(self, model_context): self.__resolve_paths() return + def get_domain_type(self): + """ + Get the name of the domain type, such as "WLS". + :return: the name of the domain type + """ + return self._domain_type + def get_base_template(self): """ Get the base template to use when create the domain. diff --git a/core/src/main/python/wlsdeploy/tool/discover/coherence_resources_discoverer.py b/core/src/main/python/wlsdeploy/tool/discover/coherence_resources_discoverer.py index 47b743555..fe8e6ff30 100644 --- a/core/src/main/python/wlsdeploy/tool/discover/coherence_resources_discoverer.py +++ b/core/src/main/python/wlsdeploy/tool/discover/coherence_resources_discoverer.py @@ -78,7 +78,8 @@ def get_coherence_clusters(self): name_token = self._alias_helper.get_name_token(location) for coherence_cluster in coherence_clusters: if typedef.is_system_coherence_cluster(coherence_cluster): - _logger.info('WLSDPLY-06322', coherence_cluster, class_name=_class_name, method_name=_method_name) + _logger.info('WLSDPLY-06322', typedef.get_domain_type(), coherence_cluster, class_name=_class_name, + method_name=_method_name) else: _logger.info('WLSDPLY-06312', coherence_cluster, class_name=_class_name, method_name=_method_name) location.add_name_token(name_token, coherence_cluster) diff --git a/core/src/main/python/wlsdeploy/tool/discover/common_resources_discoverer.py b/core/src/main/python/wlsdeploy/tool/discover/common_resources_discoverer.py index 53e88032c..7dcc519ee 100644 --- a/core/src/main/python/wlsdeploy/tool/discover/common_resources_discoverer.py +++ b/core/src/main/python/wlsdeploy/tool/discover/common_resources_discoverer.py @@ -87,7 +87,8 @@ def get_datasources(self): name_token = self._alias_helper.get_name_token(location) for datasource in datasources: if typedef.is_system_datasource(datasource): - _logger.info('WLSDPLY-06361', datasource, class_name=_class_name, method_name=_method_name) + _logger.info('WLSDPLY-06361', typedef.get_domain_type(), datasource, class_name=_class_name, + method_name=_method_name) else: _logger.info('WLSDPLY-06341', datasource, class_name=_class_name, method_name=_method_name) result[datasource] = OrderedDict() @@ -175,7 +176,8 @@ def get_file_stores(self): name_token = self._alias_helper.get_name_token(location) for file_store in file_stores: if typedef.is_system_file_store(file_store): - _logger.info('WLSDPLY-06363', file_store, class_name=_class_name, method_name=_method_name) + _logger.info('WLSDPLY-06363', typedef.get_domain_type(), 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() @@ -309,7 +311,8 @@ def get_wldf_system_resources(self): name_token = self._alias_helper.get_name_token(location) for wldf_resource in wldf_resources: if typedef.is_system_wldf(wldf_resource): - _logger.info('WLSDPLY-06362', wldf_resource, class_name=_class_name, method_name=_method_name) + _logger.info('WLSDPLY-06362', typedef.get_domain_type(), wldf_resource, class_name=_class_name, + method_name=_method_name) else: _logger.info('WLSDPLY-06358', wldf_resource, class_name=_class_name, method_name=_method_name) location.add_name_token(name_token, wldf_resource) diff --git a/core/src/main/python/wlsdeploy/tool/discover/deployments_discoverer.py b/core/src/main/python/wlsdeploy/tool/discover/deployments_discoverer.py index c5ce2151f..75f0a9c2e 100644 --- a/core/src/main/python/wlsdeploy/tool/discover/deployments_discoverer.py +++ b/core/src/main/python/wlsdeploy/tool/discover/deployments_discoverer.py @@ -68,7 +68,8 @@ def get_shared_libraries(self): name_token = self._alias_helper.get_name_token(location) for library in libraries: if typedef.is_system_shared_library(library): - _logger.info('WLSDPLY-06401', library, class_name=_class_name, method_name=_method_name) + _logger.info('WLSDPLY-06401', typedef.get_domain_type(), library, class_name=_class_name, + method_name=_method_name) else: _logger.info('WLSDPLY-06382', library, class_name=_class_name, method_name=_method_name) location.add_name_token(name_token, library) @@ -193,10 +194,10 @@ def get_applications(self): name_token = self._alias_helper.get_name_token(location) for application in applications: if typedef.is_system_app(application): - _logger.info('WLSDPLY-06400', application, class_name=_class_name, method_name=_method_name) + _logger.info('WLSDPLY-06400', typedef.get_domain_type(), application, class_name=_class_name, + method_name=_method_name) else: _logger.info('WLSDPLY-06392', application, class_name=_class_name, method_name=_method_name) - print(" application: " + str(application) + ": " + str(typedef.is_system_app(application))) location.add_name_token(name_token, application) result[application] = OrderedDict() self._populate_model_parameters(result[application], location) diff --git a/core/src/main/python/wlsdeploy/tool/discover/global_resources_discoverer.py b/core/src/main/python/wlsdeploy/tool/discover/global_resources_discoverer.py index 01655249f..cc2cea001 100644 --- a/core/src/main/python/wlsdeploy/tool/discover/global_resources_discoverer.py +++ b/core/src/main/python/wlsdeploy/tool/discover/global_resources_discoverer.py @@ -86,7 +86,8 @@ def get_startup_classes(self): name_token = self._alias_helper.get_name_token(location) for startup_class in startup_classes: if typedef.is_system_startup_class(startup_class): - _logger.info('WLSDPLY-06447', startup_class, class_name=_class_name, method_name=_method_name) + _logger.info('WLSDPLY-06447', typedef.get_domain_type(), startup_class, class_name=_class_name, + method_name=_method_name) else: _logger.info('WLSDPLY-06443', startup_class, class_name=_class_name, method_name=_method_name) result[startup_class] = OrderedDict() @@ -115,7 +116,8 @@ def get_shutdown_classes(self): name_token = self._alias_helper.get_name_token(location) for shutdown_class in shutdown_classes: if typedef.is_system_shutdown_class(shutdown_class): - _logger.info('WLSDPLY-06448', shutdown_class, class_name=_class_name, method_name=_method_name) + _logger.info('WLSDPLY-06448', typedef.get_domain_type(), shutdown_class, class_name=_class_name, + method_name=_method_name) else: _logger.info('WLSDPLY-06446', shutdown_class, class_name=_class_name, method_name=_method_name) result[shutdown_class] = OrderedDict() diff --git a/core/src/main/python/wlsdeploy/tool/discover/jms_resources_discoverer.py b/core/src/main/python/wlsdeploy/tool/discover/jms_resources_discoverer.py index e142b773a..05aaeb17e 100644 --- a/core/src/main/python/wlsdeploy/tool/discover/jms_resources_discoverer.py +++ b/core/src/main/python/wlsdeploy/tool/discover/jms_resources_discoverer.py @@ -65,7 +65,8 @@ def get_jms_servers(self): name_token = self._alias_helper.get_name_token(location) for jms_server in jms_servers: if typedef.is_system_jms_server(jms_server): - _logger.info('WLSDPLY-06490', jms_server, class_name=_class_name, method_name=_method_name) + _logger.info('WLSDPLY-06490', typedef.get_domain_type(), 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) @@ -169,7 +170,8 @@ def get_jms_system_resources(self): name_token = self._alias_helper.get_name_token(location) for jms_resource in jms_resources: if typedef.is_system_jms(jms_resource): - _logger.info('WLSDPLY-06491', jms_resource, class_name=_class_name, method_name=_method_name) + _logger.info('WLSDPLY-06491', typedef.get_domain_type(), 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() diff --git a/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties b/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties index 815fc78a8..ca667ae74 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties +++ b/core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties @@ -483,7 +483,7 @@ WLSDPLY-06319=Added Coherence Cluster {0} cache configuration file from location WLSDPLY-06320=Added Coherence Cluster {0} persistence directory {1} type {2} to archive file WLSDPLY-06321=Unable to access Coherence Cluster {0} cache configuration file {1} and will not add the file to \ the archive : {2} -WLSDPLY-06322=Skipping system Coherence Cluster System Resource {0} +WLSDPLY-06322=Skipping {0} Coherence Cluster System Resource {1} # common_resources_discoverer.py WLSDPLY-06340=Discovering {0} JDBC System Resources @@ -507,9 +507,9 @@ WLSDPLY-06357=Discovering {0} WLDF System Resources WLSDPLY-06358=Adding WLDF System Resource {0} 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} +WLSDPLY-06361=Skipping {0} JDBC System Resource {1} +WLSDPLY-06362=Skipping {0} WLDF System Resource {1} +WLSDPLY-06363=Skipping {0} File Store {1} # deployments_discoverer.py WLSDPLY-06380=Discovering domain model deployments @@ -537,8 +537,8 @@ WLSDPLY-06397=Unable to add application {0} binary {1} to archive : {2} WLSDPLY-06398=Application {0} has new source path location {1} which will match the archive file deployment location WLSDPLY-06399=Application {0} plan deployment has new source path location {1} which will match the \ archive file deployment location -WLSDPLY-06400=Skipping system application {0} -WLSDPLY-06401=Skipping system shared library {0} +WLSDPLY-06400=Skipping {0} application {1} +WLSDPLY-06401=Skipping {0} shared library {1} # domain_info_discoverer.py WLSDPLY-06420=Add the java archive files from the domain library {0} to the archive file @@ -552,8 +552,8 @@ WLSDPLY-06442=Discovering {0} Startup Classes WLSDPLY-06443=Adding StartupClass {0} WLSDPLY-06445=Discovering {0} Shutdown Classes WLSDPLY-06446=Adding ShutdownClass {0} -WLSDPLY-06447=Skipping system Startup Class {0} -WLSDPLY-06448=Skipping system Shutdown Class {0} +WLSDPLY-06447=Skipping {0} Startup Class {1} +WLSDPLY-06448=Skipping {0} Shutdown Class {1} # jms_resources_discoverer.py WLSDPLY-06460=Discovering JMS Resources @@ -576,8 +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} +WLSDPLY-06490=Skipping {0} JMS Server {1} +WLSDPLY-06491=Skipping {0} JMS System Resource {1} # topology_discoverer.py WLSDPLY-06600=Discovering domain model topology