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

Mark out which bits need to be changed to support ALF-4476

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21991 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2010-08-25 13:36:31 +00:00
parent a82a04c9a6
commit e7439974f2
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/java/org/alfresco/repo/replication/ReplicationActionExecutor.java
View File

@@ -162,6 +162,7 @@ public class ReplicationActionExecutor extends ActionExecuterAbstractBase {
new TransferDefinition(); new TransferDefinition();
transferDefinition.setNodes(toTransfer); transferDefinition.setNodes(toTransfer);
transferDefinition.setSync(true); transferDefinition.setSync(true);
// transferDefinition.setReadOnly(true); // TODO Make read only, but then need to fix tests
return transferDefinition; return transferDefinition;
} }

10
source/java/org/alfresco/repo/replication/ReplicationServiceIntegrationTest.java
View File

@@ -42,6 +42,8 @@ import org.alfresco.repo.transfer.manifest.TransferManifestNodeFactory;
import org.alfresco.service.cmr.action.ActionService; import org.alfresco.service.cmr.action.ActionService;
import org.alfresco.service.cmr.action.ActionStatus; import org.alfresco.service.cmr.action.ActionStatus;
import org.alfresco.service.cmr.action.ActionTrackingService; import org.alfresco.service.cmr.action.ActionTrackingService;
import org.alfresco.service.cmr.lock.LockService;
import org.alfresco.service.cmr.lock.UnableToReleaseLockException;
import org.alfresco.service.cmr.replication.ReplicationDefinition; import org.alfresco.service.cmr.replication.ReplicationDefinition;
import org.alfresco.service.cmr.replication.ReplicationService; import org.alfresco.service.cmr.replication.ReplicationService;
import org.alfresco.service.cmr.replication.ReplicationServiceException; import org.alfresco.service.cmr.replication.ReplicationServiceException;
@@ -60,7 +62,6 @@ import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService; import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.BaseAlfrescoSpringTest;
import org.alfresco.util.GUID; import org.alfresco.util.GUID;
import org.alfresco.util.Pair; import org.alfresco.util.Pair;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
@@ -84,6 +85,7 @@ public class ReplicationServiceIntegrationTest extends TestCase
private JobLockService jobLockService; private JobLockService jobLockService;
private ActionService actionService; private ActionService actionService;
private NodeService nodeService; private NodeService nodeService;
private LockService lockService;
private Repository repositoryHelper; private Repository repositoryHelper;
private ActionTrackingService actionTrackingService; private ActionTrackingService actionTrackingService;
@@ -120,6 +122,7 @@ public class ReplicationServiceIntegrationTest extends TestCase
jobLockService = (JobLockService) ctx.getBean("jobLockService"); jobLockService = (JobLockService) ctx.getBean("jobLockService");
actionService = (ActionService) ctx.getBean("actionService"); actionService = (ActionService) ctx.getBean("actionService");
nodeService = (NodeService) ctx.getBean("nodeService"); nodeService = (NodeService) ctx.getBean("nodeService");
lockService = (LockService) ctx.getBean("lockService");
repositoryHelper = (Repository) ctx.getBean("repositoryHelper"); repositoryHelper = (Repository) ctx.getBean("repositoryHelper");
actionTrackingService = (ActionTrackingService) ctx.getBean("actionTrackingService"); actionTrackingService = (ActionTrackingService) ctx.getBean("actionTrackingService");
@@ -847,6 +850,7 @@ public class ReplicationServiceIntegrationTest extends TestCase
TransferDefinition td = replicationActionExecutor.buildTransferDefinition(rd, nodes); TransferDefinition td = replicationActionExecutor.buildTransferDefinition(rd, nodes);
assertEquals(true, td.isSync()); assertEquals(true, td.isSync());
// assertEquals(true, td.isReadOnly());// TODO Make read only, and fix tests
assertEquals(2, td.getNodes().size()); assertEquals(2, td.getNodes().size());
assertEquals(true, td.getNodes().contains(folder1)); assertEquals(true, td.getNodes().contains(folder1));
assertEquals(true, td.getNodes().contains(content1_1)); assertEquals(true, td.getNodes().contains(content1_1));
@@ -866,6 +870,10 @@ public class ReplicationServiceIntegrationTest extends TestCase
NodeRef existing = nodeService.getChildByName(parent, ContentModel.ASSOC_CONTAINS, name); NodeRef existing = nodeService.getChildByName(parent, ContentModel.ASSOC_CONTAINS, name);
if(existing != null) { if(existing != null) {
System.err.println("Zapped existing node " + existing + " for name " + name); System.err.println("Zapped existing node " + existing + " for name " + name);
try {
lockService.unlock(existing, true);
} catch(UnableToReleaseLockException e) {}
nodeService.deleteNode(existing); nodeService.deleteNode(existing);
} }