Patches that were not executed (but considered) are not output on startup

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2198 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

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" +

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();

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

source/java/org/alfresco/repo/admin/patch/impl/SavedSearchFolderPatch.java

@@ -42,6 +42,8 @@ import org.alfresco.service.namespace.QName;
  * <p>
  * This class should be replaced with a more generic <code>ImporterPatch</code>
  * that can do conditional importing into given locations.
+ * <p>
+ * JIRA: {@link http://www.alfresco.org/jira/browse/AR-342 AR-342}
  * 
  * @author Derek Hulley
  */