inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 1.4 to HEAD

Browse Source 
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4192 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4197 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4205 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4206 .
   svn resolved root\projects\repository\source\java\org\alfresco\filesys\server\config\ServerConfiguration.java
   svn revert root\projects\repository\config\alfresco\version.properties
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4219 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4224 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-18 11:58:55 +00:00
parent df4fd38e52
commit ff07ea1e7d
18 changed files with 1411 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/repo/node/BaseNodeServiceTest.java
View File

@@ -645,12 +645,17 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
// control checks
assertEquals("n6 not present", 1, countNodesByReference(n6Ref));
assertEquals("n8 not present", 1, countNodesByReference(n8Ref));
assertTrue("n8 exists failure", nodeService.exists(n8Ref));
assertEquals("n6 primary parent association not present on n3", 1, countChildrenOfNode(n3Ref));
assertEquals("n6 secondary parent association not present on n4", 1, countChildrenOfNode(n4Ref));
assertEquals("n8 secondary parent association not present on n7", 1, countChildrenOfNode(n7Ref));
// delete n6
nodeService.deleteNode(n6Ref);
// ensure that we can't see cascaded nodes in-transaction
assertFalse("n8 not cascade deleted in-transaction", nodeService.exists(n8Ref));
// commit to check
setComplete();
endTransaction();

2
source/java/org/alfresco/repo/template/NodeSearchResultsMap.java
View File

@@ -48,7 +48,7 @@ public class NodeSearchResultsMap extends BaseSearchResultsMap
if (key != null)
{
String ref = key.toString().replace(":", "\\:");
ref = ref.replace("/", "\\/");
ref = "ID:" + ref.replace("/", "\\/");
List<TemplateNode> results = query(ref);

1
source/java/org/alfresco/repo/version/common/counter/VersionCounterServiceTest.java
View File

@@ -112,6 +112,7 @@ public class VersionCounterServiceTest extends TestCase
public void testConcurrentVersionNumber() throws Throwable
{
counter.currentVersionNumber(storeRef1);
VersionCounterThread[] threads = new VersionCounterThread[threadCount];
for (int i = 0; i < threadCount; i++)
{