Merged V2.1 to HEAD:

6556: AVM performance tweaks
   6557: WCM-758.
   6558: Fixes WCM-753.
   6559: better handling of rename, copy and paste for form instance data and renditions.  addresses WCM-752 and partially addresses WCM-559.
   6560: Renamed JndiTest.java until we decide to keep it or not.
   6561: Oops.
   6562: probable fix WCM-669      
   6563: Build fix after the removal of flushing suport 
   6564: Fix for WCM-728
   6566: Support for avm index clustering via tracking - WCM-762
   6567: Test fix after flush changes
   6568: Fixed AWC-1517: Can now create space based on existing top-level space
   6569: misc IE fixes.
   6570: Various changes to improve AVM import performance and submit performance.
   6571: Session flushing is now deprecated and doesn't fail with an exception.
   6572: Reduced the iteration count to stress nextResults calls a bit more
   6573: WS query sessions put back into cache after more results have been fetched.
   6574: AR-1347: RepositoryServiceSoapBindingStub.queryAssociated() returns nothing when direction=target
   6575: Fixed AR-1680: XPath metadata extraction now handles Node, NodeList and String return values
   6577: Fix for AWC-1518 (User Homes renaming issue, and unreported issue with client config overriding of users home location)


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

source/java/org/alfresco/web/forms/FormInstanceDataImpl.java

@@ -207,19 +207,34 @@ import org.xml.sax.SAXException;
       final List<Rendition> result = new ArrayList<Rendition>(renditionPaths.size());
       for (Serializable path : renditionPaths)
       {
-         if (avmService.lookup(-1, storeName + ':' + (String)path) != null)
+         if (avmService.lookup(-1, storeName + ':' + (String)path) == null)
          {
-            final Rendition r = new RenditionImpl(AVMNodeConverter.ToNodeRef(-1, storeName + ':' + (String)path), 
+            LOGGER.debug("ignoring dangling rendition at " + storeName + ':' + (String)path);
+         }
+         else
+         {
+            final Rendition r = new RenditionImpl(-1, 
+                                                  storeName + ':' + (String)path, 
                                                   this.formsService);
+            try
+            {
+               if (!this.equals(r.getPrimaryFormInstanceData()))
+               {
+                  LOGGER.debug("rendition " + r + 
+                               " points at form instance data " + r.getPrimaryFormInstanceData() +
+                               " instead of " + this + ". Not including in renditions list.");
+                  continue;
+               }
+            }
+            catch (FileNotFoundException fnfe)
+            {
+               continue;
+            }
             if (r.getRenderingEngineTemplate() != null)
             {
                result.add(r);
             }
          }
-         else
-         {
-            LOGGER.debug("ignoring dangling rendition at " + storeName + ':' + (String)path);
-         }
       }
       return result;
    }
@@ -250,6 +265,13 @@ import org.xml.sax.SAXException;
       }
    }
 
+   public boolean equals(final Object other)
+   {
+      return (other instanceof FormInstanceDataImpl &&
+              this.getNodeRef().equals(((FormInstanceDataImpl)other).getNodeRef()));
+
+   }
+
    protected String getParentFormName()
    {
       final NodeService nodeService = this.getServiceRegistry().getNodeService();

source/java/org/alfresco/web/forms/RenditionImpl.java

@@ -234,7 +234,13 @@ import org.xml.sax.SAXException;
 
    public int hashCode()
    {
-      return this.getPath().hashCode() ^ this.getRenderingEngineTemplate().hashCode();
+      return this.getPath().hashCode();
+   }
+
+   public boolean equals(final Object other)
+   {
+      return (other instanceof RenditionImpl &&
+              this.getNodeRef().equals(((RenditionImpl)other).getNodeRef()));
    }
 
    public String toString()