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

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)

Browse Source 
86233: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      86211: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
         86138: MNT-12400: Merged DEV to V4.1-BUG-FIX (4.1.10)
            84644: MNT-12400: Bulk File System Import Tool logs incorrectly failed files
               - In case of IntegrityException show "Failed on batch commit" message instead of incorrect id entry. Show cm:name for nodes for which constraint check failed.
            84647: MNT-12400: Bulk File System Import Tool logs incorrectly failed files
               - Skip import for content with invalid metadata files.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 09:45:18 +00:00
parent 01699f3e60
commit 236bf1e6c8
4 changed files with 72 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/node/integrity/PropertiesIntegrityEvent.java
View File

@@ -153,9 +153,11 @@ public class PropertiesIntegrityEvent extends AbstractIntegrityEvent
// check that enforced, mandatoryproperties are set
if (propertyDef.isMandatory() && propertyDef.isMandatoryEnforced() && !nodeProperties.containsKey(propertyQName))
{
String nameProp = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
IntegrityRecord result = new IntegrityRecord(
"Mandatory property not set: \n" +
" Node: " + nodeRef + "\n" +
(nameProp != null ? " Name: " + nameProp + "\n" : "") +
" Type: " + typeQName + "\n" +
" Property: " + propertyQName);
eventResults.add(result);
@@ -168,9 +170,11 @@ public class PropertiesIntegrityEvent extends AbstractIntegrityEvent
{
if (propertyValue != null && !(propertyValue instanceof SealedObject))
{
String nameProp = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
IntegrityRecord result = new IntegrityRecord(
"Property must be encrypted: \n" +
" Node: " + nodeRef + "\n" +
(nameProp != null ? " Name: " + nameProp + "\n" : "") +
" Type: " + typeQName + "\n" +
" Property: " + propertyQName);
eventResults.add(result);
@@ -188,9 +192,11 @@ public class PropertiesIntegrityEvent extends AbstractIntegrityEvent
}
catch (ConstraintException e)
{
String nameProp = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
IntegrityRecord result = new IntegrityRecord(
"Invalid property value: \n" +
" Node: " + nodeRef + "\n" +
(nameProp != null ? " Name: " + nameProp + "\n" : "") +
" Type: " + typeQName + "\n" +
" Property: " + propertyQName + "\n" +
" Constraint: " + e.getMessage());