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

Merged DEV to HEAD:

Browse Source 
54373: MNT-2641 : User can delete or move a working copy
   54469: Compilation fix for MNT-2641 test
   54470: Removed thousands of tabs
   54523: Fixed ALF-19843: Integrity checking does not enforce mandatory aspects on aspects
   54525: Pull IntegrityChecker properties into property file (ALF-19843)
   54527: Fixed Eclipse warning about potentially unclosed file
   54528: Prevent cm:workingcopy aspect from being removed directly (MNT-2641)
   54529: Nail down behaviour around cm:workingcopy


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54798 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2013-09-02 17:45:26 +00:00
parent 312dfc9ad3
commit 8fa8216fef
8 changed files with 1824 additions and 1386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/java/org/alfresco/repo/admin/patch/impl/CopiedFromAspectPatch.java
View File

@@ -229,6 +229,7 @@ public class CopiedFromAspectPatch extends AbstractPatch
}
finally
{
try { outputFile.close(); } catch (IOException e) {}
try { file.close(); } catch (IOException e) {}
}
}

18
source/java/org/alfresco/repo/coci/WorkingCopyAspect.java
View File

@@ -21,6 +21,7 @@ package org.alfresco.repo.coci;
import java.io.Serializable;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.alfresco.model.ContentModel;
@@ -34,12 +35,13 @@ import org.alfresco.repo.policy.JavaBehaviour;
import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.service.cmr.coci.CheckOutCheckInService;
import org.alfresco.service.cmr.lock.LockService;
import org.alfresco.service.cmr.repository.AssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.GUID;
public class WorkingCopyAspect implements CopyServicePolicies.OnCopyNodePolicy
public class WorkingCopyAspect implements CopyServicePolicies.OnCopyNodePolicy, NodeServicePolicies.OnRemoveAspectPolicy
{
private PolicyComponent policyComponent;
private NodeService nodeService;
@@ -117,7 +119,12 @@ public class WorkingCopyAspect implements CopyServicePolicies.OnCopyNodePolicy
NodeServicePolicies.BeforeDeleteNodePolicy.QNAME,
ContentModel.ASPECT_WORKING_COPY,
new JavaBehaviour(this, "beforeDeleteWorkingCopy"));
// register onBeforeDelete class behaviour for the checked-out aspect
// Watch for removal of the aspect and ensure that the cm:workingcopylink assoc is removed
this.policyComponent.bindClassBehaviour(
NodeServicePolicies.OnRemoveAspectPolicy.QNAME,
ContentModel.ASPECT_WORKING_COPY,
new JavaBehaviour(this, "onRemoveAspect"));
}
/**
@@ -143,6 +150,13 @@ public class WorkingCopyAspect implements CopyServicePolicies.OnCopyNodePolicy
}
}
@Override
public void onRemoveAspect(NodeRef nodeRef, QName aspectTypeQName)
{
// This is simply not allowed.
throw new UnsupportedOperationException("Use CheckOutCheckInservice to manipulate working copies.");
}
/**
* @return Returns {@link WorkingCopyAspectCopyBehaviourCallback}
*/

31
source/java/org/alfresco/repo/node/integrity/AspectsIntegrityEvent.java
View File

@@ -18,6 +18,7 @@
*/
package org.alfresco.repo.node.integrity;
import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -77,7 +78,9 @@ public class AspectsIntegrityEvent extends AbstractIntegrityEvent
QName nodeTypeQName = nodeService.getType(nodeRef);
// get the aspects that should exist
TypeDefinition typeDef = dictionaryService.getType(nodeTypeQName);
List<AspectDefinition> mandatoryAspectDefs = typeDef.getDefaultAspects();
List<AspectDefinition> mandatoryAspectDefs = (typeDef == null)
? Collections.<AspectDefinition>emptyList()
: typeDef.getDefaultAspects();
// check
for (AspectDefinition aspect : mandatoryAspectDefs)
@@ -96,6 +99,32 @@ public class AspectsIntegrityEvent extends AbstractIntegrityEvent
// next one
continue;
}
// Now, each aspect's mandatory aspects have to be checked
for (QName aspectQName : aspects)
{
AspectDefinition aspectDef = dictionaryService.getAspect(aspectQName);
mandatoryAspectDefs = (aspectDef == null)
? Collections.<AspectDefinition>emptyList()
: aspectDef.getDefaultAspects();
for (AspectDefinition aspect : mandatoryAspectDefs)
{
if (aspects.contains(aspect.getName()))
{
// it's fine
continue;
}
IntegrityRecord result = new IntegrityRecord(
"Mandatory aspect (aspect-declared) not set: \n" +
" Node: " + nodeRef + "\n" +
" Aspect: " + aspectQName + "\n" +
" Missing: " + aspect.getName());
eventResults.add(result);
// next one
continue;
}
}
// done
}
}

912
source/test-java/org/alfresco/repo/coci/CheckOutCheckInServiceImplTest.java
View File

File diff suppressed because it is too large Load Diff

62
source/test-java/org/alfresco/repo/node/integrity/IntegrityTest.java
View File

@@ -80,6 +80,7 @@ public class IntegrityTest extends TestCase
public static final QName TEST_ASPECT_WITH_PROPERTIES = QName.createQName(NAMESPACE, "aspectWithProperties");
public static final QName TEST_ASPECT_WITH_ASSOC = QName.createQName(NAMESPACE, "aspectWithAssoc");
public static final QName TEST_ASPECT_WITH_ASPECT = QName.createQName(NAMESPACE, "aspectWithAspect");
public static final QName TEST_PROP_TEXT_A = QName.createQName(NAMESPACE, "prop-text-a");
public static final QName TEST_PROP_TEXT_B = QName.createQName(NAMESPACE, "prop-text-b");
@@ -289,6 +290,19 @@ public class IntegrityTest extends TestCase
checkIntegrityExpectFailure("Failed to removal of mandatory aspect", 1);
}
public void testCreateWithAspectForAspect() throws Exception
{
NodeRef nodeRef = createNode("abc", TEST_TYPE_WITHOUT_ANYTHING, null);
// Add the aspect
nodeService.addAspect(nodeRef, TEST_ASPECT_WITH_ASPECT, allProperties);
assertTrue("Mandatory aspect missing", nodeService.hasAspect(nodeRef, TEST_ASPECT_WITH_PROPERTIES));
checkIntegrityNoFailure();
// Remove the implied mandatory aspect
nodeService.removeAspect(nodeRef, TEST_ASPECT_WITH_PROPERTIES);
checkIntegrityExpectFailure("Failed to detect missing aspect for aspect", 1);
}
public void testCreateTargetOfAssocsWithMandatorySourcesPresent() throws Exception
{
// this is the target of 3 assoc types where the source cardinality is 1..1
@@ -383,35 +397,29 @@ public class IntegrityTest extends TestCase
checkIntegrityExpectFailure("Failed to detect missing assoc targets", 3);
}
/**
* TODO: Reactivate once cascade delete notifications are back on
* <p>
* <b>Does nothing</b>.
*/
public void testRemoveTargetsOfMandatoryAssocs() throws Exception
{
// NodeRef source = createNode("abc", TEST_TYPE_WITH_ASSOCS, null);
// NodeRef target = createNode("target", TEST_TYPE_WITHOUT_ANYTHING, null);
// nodeService.createAssociation(source, target, TEST_ASSOC_NODE_ONE_ONE);
//
// NodeRef parent = createNode("parent", TEST_TYPE_WITH_CHILD_ASSOCS, null);
// NodeRef child = createNode("child", TEST_TYPE_WITHOUT_ANYTHING, null);
// nodeService.addChild(parent, child, TEST_ASSOC_CHILD_ONE_ONE, QName.createQName(NAMESPACE, "one-to-one"));
//
// NodeRef aspectSource = createNode("aspectSource", TEST_TYPE_WITHOUT_ANYTHING, null);
// nodeService.addAspect(aspectSource, TEST_ASPECT_WITH_ASSOC, null);
// NodeRef aspectTarget = createNode("aspectTarget", TEST_TYPE_WITHOUT_ANYTHING, null);
// nodeService.createAssociation(aspectSource, aspectTarget, TEST_ASSOC_ASPECT_ONE_ONE);
//
// checkIntegrityNoFailure();
//
// // remove target nodes
// nodeService.deleteNode(target);
// nodeService.deleteNode(child);
// nodeService.deleteNode(aspectTarget);
//
// checkIntegrityExpectFailure("Failed to detect removal of mandatory assoc targets", 3);
logger.error("Method commented out: testRemoveTargetsOfMandatoryAssocs");
NodeRef source = createNode("abc", TEST_TYPE_WITH_ASSOCS, null);
NodeRef target = createNode("target", TEST_TYPE_WITHOUT_ANYTHING, null);
nodeService.createAssociation(source, target, TEST_ASSOC_NODE_ONE_ONE);
NodeRef parent = createNode("parent", TEST_TYPE_WITH_CHILD_ASSOCS, null);
NodeRef child = createNode("child", TEST_TYPE_WITHOUT_ANYTHING, null);
nodeService.addChild(parent, child, TEST_ASSOC_CHILD_ONE_ONE, QName.createQName(NAMESPACE, "one-to-one"));
NodeRef aspectSource = createNode("aspectSource", TEST_TYPE_WITHOUT_ANYTHING, null);
nodeService.addAspect(aspectSource, TEST_ASPECT_WITH_ASSOC, null);
NodeRef aspectTarget = createNode("aspectTarget", TEST_TYPE_WITHOUT_ANYTHING, null);
nodeService.createAssociation(aspectSource, aspectTarget, TEST_ASSOC_ASPECT_ONE_ONE);
checkIntegrityNoFailure();
// remove target nodes
nodeService.deleteNode(target);
nodeService.deleteNode(child);
nodeService.deleteNode(aspectTarget);
checkIntegrityExpectFailure("Failed to detect removal of mandatory assoc targets", 3);
}
public void testExcessTargetsOfOneToOneAssocs() throws Exception

7
source/test-resources/org/alfresco/repo/node/integrity/IntegrityTest_model.xml
View File

@@ -191,6 +191,13 @@
</association>
</associations>
</aspect>
<!-- aspect with aspects -->
<aspect name="test:aspectWithAspect">
<title>Aspect with aspects</title>
<mandatory-aspects>
<aspect>test:aspectWithProperties</aspect>
</mandatory-aspects>
</aspect>
</aspects>
</model>