svn commit: r1718816 - in /manifoldcf/trunk: CHANGES.txt connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java

[kwright]

Author: kwright
Date: Wed Dec  9 11:03:47 2015
New Revision: 1718816

URL: http://svn.apache.org/viewvc?rev=1718816&view=rev
Log:
Fix for CONNECTORS-1262.  Committed on behalf of Chalitha Perera.

Modified:
    manifoldcf/trunk/CHANGES.txt
    
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1718816&r1=1718815&r2=1718816&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Dec  9 11:03:47 2015
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 2.3-dev =====================
 
+CONNECTORS-1262: Fix Alfresco-webscript connector's version string,
+so changes to ACLs will be detected as document changes.
+(Chalitha Perera)
+
 CONNECTORS-1264: Fix handling of slashes in unquoted attribute values
 in html parsing.
 (Issei Nishigata, Karl Wright)

Modified: 
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java?rev=1718816&r1=1718815&r2=1718816&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java
 (original)
+++ 
manifoldcf/trunk/connectors/alfresco-webscript/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/alfrescowebscript/AlfrescoConnector.java
 Wed Dec  9 11:03:47 2015
@@ -290,7 +290,20 @@ public class AlfrescoConnector extends B
           continue;
         }
 
-        String documentVersion = (enableDocumentProcessing?"+":"-") + new 
Long(modifiedDate.getTime()).toString();
+        StringBuilder sb = new StringBuilder();
+          
+        sb.append((enableDocumentProcessing?"+":"-"));
+        sb.append(new Long(modifiedDate.getTime()).toString());
+          
+        @SuppressWarnings("unchecked")
+        List<String> permissions = (List<String>) 
properties.remove(AUTHORITIES_PROPERTY);
+        if(permissions != null){
+            for (String permission : permissions) {
+                sb.append(permission);
+            }
+        }
+          
+        String documentVersion = sb.toString();
 
         if(!activities.checkDocumentNeedsReindexing(doc, documentVersion))
           continue;
@@ -357,8 +370,6 @@ public class AlfrescoConnector extends B
           rd.setMimeType(mimeType);
 
         // Indexing Permissions
-        @SuppressWarnings("unchecked")
-        List<String> permissions = (List<String>) 
properties.remove(AUTHORITIES_PROPERTY);
         if(permissions != null){
           rd.setSecurityACL(RepositoryDocument.SECURITY_TYPE_DOCUMENT,
                             permissions.toArray(new 
String[permissions.size()]));