diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index 422ea4a933..f28cd1b9db 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -141,6 +141,7 @@
null.
+ * @return the NodeRef of the commentsRollup ancestor if there is one, else null.
*/
private NodeRef getCommentsRollupAncestor(NodeRef topicNode)
{
+ // We are specifically trying to roll up "comment" counts here. In other words the number of "comments" on a node
+ // as applied through the Share UI.
+ // We are not trying to roll up generic fm:post counts. Although, of course, comments are modelled as fm:post nodes.
+ // So there are two scenarios in which we do not want to roll up changes to the count.
+ // 1. When the fm:post node is not a Share comment.
+ // 2. When the node is being deleted as part of a cascade delete.
+ // If an ancestor node to an fm:post is deleted then the parent structure may have been flattened within the archive store.
+ //
+ NodeRef result = null;
+
NodeRef forumNode = nodeService.getPrimaryParent(topicNode).getParentRef();
- NodeRef commentsRollupNode = nodeService.getPrimaryParent(forumNode).getParentRef();
- if (! nodeService.hasAspect(commentsRollupNode, ForumModel.ASPECT_COMMENTS_ROLLUP))
+ if (ForumModel.TYPE_FORUM.equals(nodeService.getType(forumNode)) && !forumNode.getStoreRef().equals(StoreRef.PROTOCOL_ARCHIVE))
{
- return null;
- }
- else
- {
- return commentsRollupNode;
+ NodeRef commentsRollupNode = nodeService.getPrimaryParent(forumNode).getParentRef();
+
+ if (!commentsRollupNode.getStoreRef().equals(StoreRef.PROTOCOL_ARCHIVE))
+ {
+ if (! nodeService.hasAspect(commentsRollupNode, ForumModel.ASPECT_COMMENTS_ROLLUP))
+ {
+ result = null;
+ }
+ else
+ {
+ result = commentsRollupNode;
+ }
+ }
}
+ return result;
}
}
diff --git a/source/java/org/alfresco/repo/jscript/ValueConverter.java b/source/java/org/alfresco/repo/jscript/ValueConverter.java
index 2c3b1fc396..b0dcb3e374 100644
--- a/source/java/org/alfresco/repo/jscript/ValueConverter.java
+++ b/source/java/org/alfresco/repo/jscript/ValueConverter.java
@@ -117,7 +117,8 @@ public class ValueConverter
try
{
Context.enter();
- // convert array to a native JavaScript Array
+ // Convert array to a native JavaScript Array
+ // Note - a scope is usually required for this to work
value = (Serializable)Context.getCurrentContext().newArray(scope, array);
}
finally
diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderPerformanceTester.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderPerformanceTester.java
index bf4c8cdc05..fe85aa6414 100644
--- a/source/java/org/alfresco/repo/model/filefolder/FileFolderPerformanceTester.java
+++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderPerformanceTester.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -41,7 +41,6 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransacti
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileInfo;
-import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
@@ -86,6 +85,9 @@ public class FileFolderPerformanceTester extends TestCase
private NodeRef rootFolderRef;
private File dataFile;
+ private String USERNAME = AuthenticationUtil.getAdminUserName(); // as admin
+ //private String USERNAME = AuthenticationUtil.getSystemUserName(); // as system (bypass permissions)
+
protected NodeService getNodeService()
{
@@ -103,14 +105,26 @@ public class FileFolderPerformanceTester extends TestCase
searchService = serviceRegistry.getSearchService();
nodeService = getNodeService();
- // authenticate
- authenticationComponent.setSystemUserAsCurrentUser();
+ authenticate(USERNAME);
rootFolderRef = getOrCreateRootFolder();
dataFile = AbstractContentTransformerTest.loadQuickTestFile("txt");
}
+
+ private void authenticate(String userName)
+ {
+ if (AuthenticationUtil.getSystemUserName().equals(userName))
+ {
+ authenticationComponent.setSystemUserAsCurrentUser();
+ }
+ else
+ {
+ authenticationComponent.setCurrentUser(userName);
+ }
+ }
+
public void testSetUp() throws Exception
{
assertNotNull(dataFile);
@@ -118,7 +132,7 @@ public class FileFolderPerformanceTester extends TestCase
protected NodeRef getOrCreateRootFolder()
{
- // find the guest folder
+ // find the company home folder
StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore");
ResultSet rs = searchService.query(storeRef, SearchService.LANGUAGE_XPATH, "/app:company_home");
try
@@ -185,7 +199,7 @@ public class FileFolderPerformanceTester extends TestCase
public void run()
{
// authenticate
- authenticationComponent.setSystemUserAsCurrentUser();
+ authenticate(USERNAME);
// progress around the folders until they have been populated
start = System.currentTimeMillis();
@@ -242,16 +256,20 @@ public class FileFolderPerformanceTester extends TestCase
long time = (end - start);
double average = (double) time / (double) (folderCount * currentBatchCount * filesPerBatch);
double percentComplete = (double) currentBatchCount / (double) batchCount * 100.0;
- logger.debug("\n" +
- "[" + Thread.currentThread().getName() + "] \n" +
- " Created " + (currentBatchCount*filesPerBatch) + " files in each of " + folderCount +
- " folders (" + (randomOrder ? "shuffled" : "in order") + "): \n" +
- " Progress: " + String.format("%9.2f", percentComplete) + " percent complete \n" +
- " Average: " + String.format("%10.2f", average) + " ms per file \n" +
- " Average: " + String.format("%10.2f", 1000.0/average) + " files per second");
+
+ if (percentComplete > 0)
+ {
+ logger.debug("\n" +
+ "[" + Thread.currentThread().getName() + "] \n" +
+ " Created " + (currentBatchCount*filesPerBatch) + " files in each of " + folderCount +
+ " folders (" + (randomOrder ? "shuffled" : "in order") + "): \n" +
+ " Progress: " + String.format("%9.2f", percentComplete) + " percent complete \n" +
+ " Average: " + String.format("%10.2f", average) + " ms per file \n" +
+ " Average: " + String.format("%10.2f", 1000.0/average) + " files per second");
+ }
}
};
-
+
// kick off the required number of threads
logger.debug("\n" +
"Starting " + threadCount +
@@ -282,35 +300,44 @@ public class FileFolderPerformanceTester extends TestCase
}
}
- @SuppressWarnings("unused")
private void readStructure(
final NodeRef parentNodeRef,
final int threadCount,
final int repetitions,
final double[] dumpPoints)
{
- final List children = nodeService.getChildAssocs(parentNodeRef);
+ final List children = fileFolderService.list(parentNodeRef);
Runnable runnable = new Runnable()
{
public void run()
{
// authenticate
- authenticationComponent.setSystemUserAsCurrentUser();
+ authenticate(USERNAME);
for (int i = 0; i < repetitions; i++)
{
// read the contents of each folder
- for (ChildAssociationRef childAssociationRef : children)
+ for (final FileInfo fileInfo : children)
{
- final NodeRef folderRef = childAssociationRef.getChildRef();
+ final NodeRef folderRef = fileInfo.getNodeRef();
RetryingTransactionCallback