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

1) Do not import copied from references

Browse Source 
2) ACP zip file now contains content files with appropriate extension for easy viewing of content

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2018 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2005-12-09 13:44:37 +00:00
parent 7be4e3ef83
commit f89817cf12
6 changed files with 97 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/java/org/alfresco/repo/importer/view/NodeContext.java
View File

@@ -137,16 +137,15 @@ public class NodeContext extends ElementContext
*/
public void addPropertyCollection(QName property)
{
// Do not import properties of sys:referenceable or cm:versionable
// Do not import properties of sys:referenceable or cm:versionable or cm:copiedfrom
// TODO: Make this configurable...
PropertyDefinition propDef = getDictionaryService().getProperty(property);
ClassDefinition classDef = (propDef == null) ? null : propDef.getContainerClass();
if (classDef != null)
{
if (classDef.getName().equals(ContentModel.ASPECT_REFERENCEABLE) ||
classDef.getName().equals(ContentModel.ASPECT_VERSIONABLE))
if (!isImportableClass(classDef.getName()))
{
return;
return;
}
}
@@ -170,10 +169,9 @@ public class NodeContext extends ElementContext
ClassDefinition classDef = (propDef == null) ? null : propDef.getContainerClass();
if (classDef != null)
{
if (classDef.getName().equals(ContentModel.ASPECT_REFERENCEABLE) ||
classDef.getName().equals(ContentModel.ASPECT_VERSIONABLE))
if (!isImportableClass(classDef.getName()))
{
return;
return;
}
}
@@ -234,7 +232,10 @@ public class NodeContext extends ElementContext
*/
public void addAspect(AspectDefinition aspect)
{
nodeAspects.put(aspect.getName(), aspect);
if (isImportableClass(aspect.getName()))
{
nodeAspects.put(aspect.getName(), aspect);
}
}
/* (non-Javadoc)
@@ -328,6 +329,19 @@ public class NodeContext extends ElementContext
return def;
}
/**
* Determine if the provided class name is to be imported
*
* @param className class to check (type or aspect)
* @return true => import, false => ignore on import
*/
private boolean isImportableClass(QName className)
{
return !(className.equals(ContentModel.ASPECT_REFERENCEABLE) ||
className.equals(ContentModel.ASPECT_COPIEDFROM) ||
className.equals(ContentModel.ASPECT_VERSIONABLE));
}
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/