diff --git a/source/java/org/alfresco/repo/admin/patch/PatchExecuter.java b/source/java/org/alfresco/repo/admin/patch/PatchExecuter.java index 86500ad570..6bfb3897fd 100644 --- a/source/java/org/alfresco/repo/admin/patch/PatchExecuter.java +++ b/source/java/org/alfresco/repo/admin/patch/PatchExecuter.java @@ -69,7 +69,14 @@ public class PatchExecuter // list all patches applied, including failures for (PatchInfo patchInfo : appliedPatches) { - if (patchInfo.getSucceeded()) + if (!patchInfo.getWasExecuted()) + { + // the patch was not executed + logger.debug("Applied patch (not executed): \n" + + " ID: " + patchInfo.getId() + "\n" + + " RESULT: " + patchInfo.getReport()); + } + else if (patchInfo.getSucceeded()) { logger.info("Applied patch: \n" + " ID: " + patchInfo.getId() + "\n" + diff --git a/source/java/org/alfresco/repo/admin/patch/PatchInfo.java b/source/java/org/alfresco/repo/admin/patch/PatchInfo.java index b05072bae4..296ba5d0dc 100644 --- a/source/java/org/alfresco/repo/admin/patch/PatchInfo.java +++ b/source/java/org/alfresco/repo/admin/patch/PatchInfo.java @@ -41,6 +41,8 @@ public interface PatchInfo public Date getAppliedOnDate(); + public boolean getWasExecuted(); + public boolean getSucceeded(); public String getReport(); diff --git a/source/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java b/source/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java index 309a0c052c..ea7b5da3bd 100644 --- a/source/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java +++ b/source/java/org/alfresco/repo/admin/patch/PatchServiceImpl.java @@ -209,6 +209,7 @@ public class PatchServiceImpl implements PatchService appliedPatch.setAppliedToServer(server); // the current version and label of the server appliedPatch.setAppliedOnDate(new Date()); // the date applied appliedPatch.setSucceeded(success); // whether or not the patch succeeded + appliedPatch.setWasExecuted(applies); // whether or not the patch was executed appliedPatch.setReport(report); // additional, human-readable, status // done diff --git a/source/java/org/alfresco/repo/admin/patch/impl/SavedSearchFolderPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/SavedSearchFolderPatch.java index 978a8507bb..c71390851b 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/SavedSearchFolderPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/SavedSearchFolderPatch.java @@ -42,6 +42,8 @@ import org.alfresco.service.namespace.QName; *
* This class should be replaced with a more generic ImporterPatch
* that can do conditional importing into given locations.
+ *
+ * JIRA: {@link http://www.alfresco.org/jira/browse/AR-342 AR-342}
*
* @author Derek Hulley
*/
diff --git a/source/java/org/alfresco/repo/domain/AppliedPatch.java b/source/java/org/alfresco/repo/domain/AppliedPatch.java
index f114a9b762..9865e9d87f 100644
--- a/source/java/org/alfresco/repo/domain/AppliedPatch.java
+++ b/source/java/org/alfresco/repo/domain/AppliedPatch.java
@@ -43,6 +43,8 @@ public interface AppliedPatch extends PatchInfo
public void setAppliedOnDate(Date date);
+ public void setWasExecuted(boolean executed);
+
public void setSucceeded(boolean succeeded);
public void setReport(String report);
diff --git a/source/java/org/alfresco/repo/domain/hibernate/AppliedPatch.hbm.xml b/source/java/org/alfresco/repo/domain/hibernate/AppliedPatch.hbm.xml
index b3f4836508..f0a6bd7974 100644
--- a/source/java/org/alfresco/repo/domain/hibernate/AppliedPatch.hbm.xml
+++ b/source/java/org/alfresco/repo/domain/hibernate/AppliedPatch.hbm.xml
@@ -22,6 +22,7 @@