Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

were both beyond me, and are just the raw conflict merge data.  If Kev can't figure out how they should
go together by tomorrow AM (for me) I'll dig back in.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/admin/patch/AbstractPatch.java

@@ -22,6 +22,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.node.integrity.IntegrityChecker;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
 import org.alfresco.repo.transaction.TransactionUtil;
 import org.alfresco.repo.transaction.TransactionUtil.TransactionWork;
@@ -329,6 +330,9 @@ public abstract class AbstractPatch implements Patch
             {
                 public String doWork() throws Exception
                 {
+                    // downgrade integrity checking
+                    IntegrityChecker.setWarnInTransaction();
+
                     String report = applyInternal();
                     // done
                     return report;
@@ -389,7 +393,8 @@ public abstract class AbstractPatch implements Patch
 
     /**
      * This method does the work.  All transactions and thread-safety will be taken care of by this class.
-     * Any exception will result in the transaction being rolled back.
+     * Any exception will result in the transaction being rolled back.  Integrity checks are downgraded
+     * for the duration of the transaction.
      * 
      * @return Returns the report (only success messages).
      * @see #apply()