v1.0.8 pom

pom.xml

@@ -5,7 +5,7 @@
 	
 	<groupId>com.inteligr8.alfresco.activiti</groupId>
 	<artifactId>model-share-activiti-app-ext</artifactId>
-	<version>1.0.6</version>
+	<version>1.0.8</version>
 	<packaging>jar</packaging>
 	
 	<name>Model Share APS Extension</name>

src/main/java/com/inteligr8/alfresco/activiti/share/ModelShareWorker.java

@@ -209,18 +209,17 @@ public class ModelShareWorker implements Bootstrappable {
     }
     
     public void shareAllModels() {
-        if (this.tenantId != null)
-            this.shareAllModels(this.tenantId);
-        this.shareAllModels(null);
-    }
-    
-    public void shareAllModels(Long tenantId) {
         this.shareApsFormModels();
         this.shareApsDataModels();
         this.shareApsDecisionTableModels();
         this.shareApsProcessModels();
         this.shareApsAppModels();
-        this.shareAllActivitiModels(tenantId);
+        
+        if (this.tenantId != null) {
+            this.shareAllActivitiModels(this.tenantId);
+        } else {
+            this.shareAllActivitiModels(null);
+        }
     }
     
     private void shareApsFormModels() {
@@ -284,7 +283,7 @@ public class ModelShareWorker implements Bootstrappable {
         this.logger.trace("Discovering activiti models with page size: {}", perPage);
         List<org.activiti.engine.repository.Model> models = query.listPage((page-1)*perPage, perPage);
         if (models.isEmpty()) {
-        	this.logger.debug("procDef counts: {}", this.services.getRepositoryService().createProcessDefinitionQuery().latestVersion().count());
+        	this.logger.debug("No activiti models; procDef count: {}", this.services.getRepositoryService().createProcessDefinitionQuery().latestVersion().count());
         }
         
         while (!models.isEmpty()) {
@@ -361,9 +360,15 @@ public class ModelShareWorker implements Bootstrappable {
             for (ModelShareInfo share : shares)
                 map.put(new HashableGroup(share.getGroup()), share.getPermission());
             
+            pageable = pageable.next();
             shares = this.shareInfoRepo.findByModelIdOrderByShareDateAsc(model.getId(), pageable);
         }
         
+        if (this.logger.isTraceEnabled()) {
+            this.logger.trace("Found existing shares: {}", map);
+        } else {
+            this.logger.debug("Found existing shares: {}", map.size());
+        }
         return map;
     }
     
@@ -419,7 +424,13 @@ public class ModelShareWorker implements Bootstrappable {
         
         @Override
         public boolean equals(Object obj) {
-            return this.group.getId().equals(((Group) obj).getId());
+            if (obj instanceof HashableGroup) {
+                return this.group.getId().equals(((HashableGroup) obj).getGroup().getId());
+            } else if (obj instanceof Group) {
+                return this.group.getId().equals(((Group) obj).getId());
+            } else {
+                return false;
+            }
         }
         
         @Override