Merged V2.2 to HEAD

8630: Merged V2.1 to V2.2
     8513: Fixed AR-2157: Integrity checking fails when target roles are present on child associations
     8517: Fixed AR-2171: NPE restoring large hierarchy
     8519: New workflow description field limited to 100 characters (AWC-1938)
     8520: Removed copy of mysql connector to tomcat distribution
     8529: Fix for pop-up task panel, when task has due date
     8537: Fix for AWC-1951
     8538: AR-2141: Problem copying large hierarchical folder structures
     8594: Closing of servlet output stream in TemplateContentServlet
     8616: Fix for WCM-1134 (editing rich text area, causes relative links to become absolute in IE)

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

source/java/org/alfresco/repo/node/archive/NodeArchiveServiceImpl.java

@@ -187,6 +187,7 @@ public class NodeArchiveServiceImpl implements NodeArchiveService
         {
             report.setCause(e);
             report.setStatus(RestoreStatus.FAILURE_OTHER);
+            logger.error("An unhandled exception stopped the restore", e);
         }
         // done
         if (logger.isDebugEnabled())

source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java

@@ -1837,6 +1837,11 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
             }
             
             Node nodeToMove = oldNodeStatus.getNode();
+            if (nodeToMove == null)
+            {
+                // Ignore it.  It was moved already.
+                continue;
+            }
             NodeRef oldNodeRef = nodeToMove.getNodeRef();
             nodeToMove.setStore(store);
             NodeRef newNodeRef = nodeToMove.getNodeRef();

source/java/org/alfresco/repo/node/integrity/AssocTargetRoleIntegrityEvent.java

@@ -98,7 +98,7 @@ public class AssocTargetRoleIntegrityEvent extends AbstractIntegrityEvent
         if (assocRoleQName != null)
         {
             // the assoc defines a role name - check it
-            RegexQNamePattern rolePattern = new RegexQNamePattern(assocRoleQName.toString());
+            RegexQNamePattern rolePattern = new RegexQNamePattern(assocRoleQName.getNamespaceURI(), assocRoleQName.getLocalName());
             if (!rolePattern.isMatch(assocQName))
             {
                 IntegrityRecord result = new IntegrityRecord(