Redploy automatically if war at same physical location as domain loca… (#937)

Author: CarolynRountree

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

@@ -667,28 +667,35 @@ def __build_app_deploy_strategy(self, location, model_apps, existing_app_refs, s
                     existing_plan_hash = self.__get_file_hash(plan_path)
                     if model_src_hash == existing_src_hash:
                         if model_plan_hash == existing_plan_hash:
-                            # If model hashes match existing hashes, the application did not change.
-                            # Unless targets were added, there's no need to redeploy.
-                            model_targets = dictionary_utils.get_element(app_dict, TARGET)
-                            model_targets_list = alias_utils.create_list(model_targets, 'WLSDPLY-08000')
-                            model_targets_set = Set(model_targets_list)
-
-                            existing_app_targets = dictionary_utils.get_element(existing_app_ref, 'target')
-                            existing_app_targets_set = Set(existing_app_targets)
-
-                            if existing_app_targets_set.issuperset(model_targets_set):
-                                self.__remove_app_from_deployment(model_apps, app)
+                            if not (os.path.isabs(src_path) and os.path.isabs(model_src_path) and
+                                    FileUtils.getCanonicalPath(src_path) == FileUtils.getCanonicalPath(model_src_path)):
+                                # If model hashes match existing hashes, the application did not change.
+                                # Unless targets were added, there's no need to redeploy.
+                                # If it is an absolute path, there is nothing to compare so assume redeploy
+                                model_targets = dictionary_utils.get_element(app_dict, TARGET)
+                                model_targets_list = alias_utils.create_list(model_targets, 'WLSDPLY-08000')
+                                model_targets_set = Set(model_targets_list)
+
+                                existing_app_targets = dictionary_utils.get_element(existing_app_ref, 'target')
+                                existing_app_targets_set = Set(existing_app_targets)
+
+                                if existing_app_targets_set.issuperset(model_targets_set):
+                                    self.__remove_app_from_deployment(model_apps, app)
+                                else:
+                                    # Adjust the targets to only the new targets so that existing apps on
+                                    # already targeted servers are not impacted.
+                                    adjusted_set = model_targets_set.difference(existing_app_targets_set)
+                                    adjusted_targets = ','.join(adjusted_set)
+                                    app_dict['Target'] = adjusted_targets
+
+                                    # For update case, the sparse model may be just changing targets, therefore without sourcepath
+
+                                    if app_dict['SourcePath'] is None and src_path is not None:
+                                        app_dict['SourcePath'] = src_path
                             else:
-                                # Adjust the targets to only the new targets so that existing apps on
-                                # already targeted servers are not impacted.
-                                adjusted_set = model_targets_set.difference(existing_app_targets_set)
-                                adjusted_targets = ','.join(adjusted_set)
-                                app_dict['Target'] = adjusted_targets
-
-                                # For update case, the sparse model may be just changing targets, therefore without sourcepath
-
-                                if app_dict['SourcePath'] is None and src_path is not None:
-                                    app_dict['SourcePath'] = src_path
+                                self.logger.info('WLSDPLY-09336', src_path,
+                                                 class_name=self._class_name, method_name=_method_name)
+                                stop_and_undeploy_app_list.append(versioned_name)
                         else:
                             # updated deployment plan
                             stop_and_undeploy_app_list.append(versioned_name)

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

@@ -1115,6 +1115,7 @@ WLSDPLY-09332=Application {0} not found, found similar names {1}.  For deleting
 WLSDPLY-09333=Library {0} not found. Please specify a valid library for deletion
 WLSDPLY-09334=Application {0} not found. Please specify a valid application for deletion
 WLSDPLY-09335=Undeploying {0} {1} from targets: {2}
+WLSDPLY-09336=Redeployed application {0} because the old and the new binary have the same path.
 
 # wlsdeploy/tool/deploy/common_resources_deployer.py
 WLSDPLY-09400=ResourceGroup was specified in the test file but are not supported in WebLogic Server version {0}