From e733ee65f47d84a896bc0e976b51a2e85cb1652a Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 11 Feb 2014 20:59:19 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 57507: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3) 57352: Merged DEV to V4.2-BUG-FIX (4.2) with corrections 57313: MNT-9851: Bulk import must warn when finding nodes without content - Call afterCreateNode only if node wasn't skipped - Change logging in AbstractNodeImporter - Add/modify unit tests. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61837 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/bulkimport/impl/AbstractNodeImporter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/bulkimport/impl/AbstractNodeImporter.java b/source/java/org/alfresco/repo/bulkimport/impl/AbstractNodeImporter.java index 6c0d059f00..03e1f0a022 100644 --- a/source/java/org/alfresco/repo/bulkimport/impl/AbstractNodeImporter.java +++ b/source/java/org/alfresco/repo/bulkimport/impl/AbstractNodeImporter.java @@ -281,7 +281,7 @@ public abstract class AbstractNodeImporter implements NodeImporter } else { - if (logger.isDebugEnabled()) logger.debug("Skipping creation of new node '" + nodeName + "' within node '" + target.toString() + "' since it doesn't have a content file."); + if (logger.isWarnEnabled()) logger.warn("Skipping creation of new node '" + nodeName + "' within node '" + target.toString() + "' since it doesn't have a content file."); nodeRef = null; nodeState = NodeState.SKIPPED; } @@ -440,7 +440,7 @@ public abstract class AbstractNodeImporter implements NodeImporter { if (logger.isInfoEnabled()) { - logger.info("Skipping '" + getFileName(importableItem.getHeadRevision().getContentFile()) + "' as it already exists in the repository and 'replace existing' is false."); + logger.info("Skipping '" + getFileName(importableItem.getHeadRevision().getContentFile())); } importStatus.incrementImportableItemsSkipped(importableItem, true); } @@ -449,7 +449,7 @@ public abstract class AbstractNodeImporter implements NodeImporter { if (logger.isInfoEnabled()) { - logger.info("Skipping '" + getFileName(importableItem.getHeadRevision().getContentFile()) + "' as it already exists in the repository and 'replace existing' is false."); + logger.info("Skipping '" + getFileName(importableItem.getHeadRevision().getContentFile())); } importStatus.incrementImportableItemsSkipped(importableItem, false); }