Merge branch 'main' into topology-profile

Author: robertpatrick

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

@@ -84,11 +84,9 @@ def __add_shared_libraries(self):
         root_path = self.aliases.get_wlst_subfolders_path(self._base_location)
         shared_library_location = LocationContext(self._base_location).append_location(LIBRARY)
         shared_library_token = self.aliases.get_name_token(shared_library_location)
-        existing_shared_libraries = deployer_utils.get_existing_object_list(shared_library_location, self.aliases)
 
         for shared_library_name in shared_libraries:
-            self.logger.info('WLSDPLY-09608', LIBRARY, shared_library_name, self._parent_type, self._parent_name,
-                             class_name=self._class_name, method_name=_method_name)
+            existing_shared_libraries = deployer_utils.get_existing_object_list(shared_library_location, self.aliases)
 
             if model_helper.is_delete_name(shared_library_name):
                 if self.__verify_delete_versioned_app(shared_library_name, existing_shared_libraries, type='lib'):
@@ -97,6 +95,9 @@ def __add_shared_libraries(self):
                     existing_names = deployer_utils.get_existing_object_list(location, self.aliases)
                     deployer_utils.delete_named_element(location, shared_library_name, existing_names, self.aliases)
                 continue
+            else:
+                self.logger.info('WLSDPLY-09608', LIBRARY, shared_library_name, self._parent_type, self._parent_name,
+                                 class_name=self._class_name, method_name=_method_name)
 
             #
             # In WLST offline mode, the shared library name must match the fully qualified name, including
@@ -152,11 +153,9 @@ def __add_applications(self):
         root_path = self.aliases.get_wlst_subfolders_path(self._base_location)
         application_location = LocationContext(self._base_location).append_location(APPLICATION)
         application_token = self.aliases.get_name_token(application_location)
-        existing_applications = deployer_utils.get_existing_object_list(application_location, self.aliases)
 
         for application_name in applications:
-            self.logger.info('WLSDPLY-09301', APPLICATION, application_name, self._parent_type, self._parent_name,
-                             class_name=self._class_name, method_name=_method_name)
+            existing_applications = deployer_utils.get_existing_object_list(application_location, self.aliases)
 
             if model_helper.is_delete_name(application_name):
                 if self.__verify_delete_versioned_app(application_name, existing_applications, type='app'):
@@ -165,6 +164,9 @@ def __add_applications(self):
                     existing_names = deployer_utils.get_existing_object_list(location, self.aliases)
                     deployer_utils.delete_named_element(location, application_name, existing_names, self.aliases)
                 continue
+            else:
+                self.logger.info('WLSDPLY-09301', APPLICATION, application_name, self._parent_type, self._parent_name,
+                                 class_name=self._class_name, method_name=_method_name)
 
             application = \
                 copy.deepcopy(dictionary_utils.get_dictionary_element(applications, application_name))

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

@@ -590,7 +590,7 @@ def online_check_save_activate(model_context):
         _wlst_helper.silence()
         if model_context.is_cancel_changes_if_restart_required() and restart_required:
             _wlst_helper.cancel_edit()
-            _logger.warning('WLSDPLY_09015', is_restartreq_output)
+            _logger.warning('WLSDPLY-09018', is_restartreq_output)
             exit_code = CommandLineArgUtil.PROG_CANCEL_CHANGES_IF_RESTART_EXIT_CODE
             list_non_dynamic_changes(model_context, is_restartreq_output)
         else:

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

@@ -1038,11 +1038,10 @@ WLSDPLY-09012=While handling an error, failed to stop the current edit session a
 WLSDPLY-09013=While handling an error, failed to close the domain: {0}
 WLSDPLY-09014={0} was unable to load the model from {1} due to a translation error: {2}
 WLSDPLY-09015={0} deployment failed: {1}
-WLSDPLY_09015=Online update has been canceled because the flag cancel_changes_if_restart_required is set and the update requires \
-  restart: {0}
 WLSDPLY-09016=There are outstanding changes but -discard_current_edit has been specified, all changes have been \
   discarded before processing update.
 WLSDPLY-09017=Server {0} in 
+WLSDPLY-09018=Online update has been canceled because the flag cancel_changes_if_restart_required is set and the update requires restart: {0}
 
 # wlsdeploy/tool/deploy/deployer_utils.py
 WLSDPLY-09100=Existing object names are {0}