inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-06-30 18:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
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
This commit is contained in:
Alan Davis 2014-02-11 20:59:19 +00:00
parent d33d2335f8
commit e733ee65f4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/bulkimport/impl/AbstractNodeImporter.java
View File

@ -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);
}