diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml index fab339eba4..219ac3b309 100644 --- a/config/alfresco/bootstrap-context.xml +++ b/config/alfresco/bootstrap-context.xml @@ -173,6 +173,10 @@ /${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.content.childname} alfresco/templates/content_template_examples.xml + + /${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.content.childname} + alfresco/templates/readme_template.xml + /${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.email.childname} alfresco/templates/email_templates.acp @@ -193,6 +197,10 @@ /${spaces.company_home.childname}/${spaces.dictionary.childname} alfresco/bootstrap/webScriptsExtensions.xml + + /${spaces.company_home.childname}/${spaces.dictionary.childname} + alfresco/bootstrap/webScriptsReadme.xml + diff --git a/config/alfresco/import-export-context.xml b/config/alfresco/import-export-context.xml index e564233750..dcb7841c59 100644 --- a/config/alfresco/import-export-context.xml +++ b/config/alfresco/import-export-context.xml @@ -12,6 +12,9 @@ + + + diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties index d402062bb1..6dbb633ad4 100644 --- a/config/alfresco/messages/patch-service.properties +++ b/config/alfresco/messages/patch-service.properties @@ -160,3 +160,6 @@ patch.redeploySubmitProcess.description=Re-deploy WCM Submit Process Definition. patch.AVMLocking.description=Adds existing web projects to locking service. patch.AVMLocking.result=Necessary web projects added. + +patch.ReadmeTemplate.description=Deployed ReadMe Template +patch.webScriptsReadme.description=Applied ReadMe template to Web Scripts folders diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml index f467bca85c..1fbd327e61 100644 --- a/config/alfresco/patch/patch-services-context.xml +++ b/config/alfresco/patch/patch-services-context.xml @@ -826,5 +826,41 @@ + + + patch.ReadmeTemplate + patch.ReadmeTemplate.description + 0 + 59 + 60 + + + + + + + /${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.content.childname} + alfresco/templates/readme_template.xml + + + + + + patch.webScriptsReadme + patch.webScriptsReadme.description + 0 + 59 + 60 + + + + + + + /${spaces.company_home.childname}/${spaces.dictionary.childname} + alfresco/bootstrap/webScriptsReadme.xml + + + diff --git a/source/java/org/alfresco/repo/importer/view/ViewParser.java b/source/java/org/alfresco/repo/importer/view/ViewParser.java index 6e83aeb13d..5b10a70a14 100644 --- a/source/java/org/alfresco/repo/importer/view/ViewParser.java +++ b/source/java/org/alfresco/repo/importer/view/ViewParser.java @@ -38,6 +38,7 @@ import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.PropertyDefinition; import org.alfresco.service.cmr.dictionary.TypeDefinition; import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.cmr.view.ImporterException; import org.alfresco.service.namespace.NamespaceService; @@ -87,6 +88,7 @@ public class ViewParser implements Parser // Supporting services private NamespaceService namespaceService; + private NodeService nodeService; private DictionaryService dictionaryService; // Parser Context maintained during each parse @@ -125,6 +127,14 @@ public class ViewParser implements Parser this.namespaceService = namespaceService; } + /** + * @param nodeService the node service + */ + public void setNodeService(NodeService nodeService) + { + this.nodeService = nodeService; + } + /** * @param dictionaryService the dictionary service */ @@ -439,6 +449,7 @@ public class ViewParser implements Parser { NodeRef nodeRef = new NodeRef(nodeRefAttr); node.setUUID(nodeRef.getId()); + node.setTypeDefinition(dictionaryService.getType(nodeService.getType(nodeRef))); } else if (idRefAttr != null && idRefAttr.length() > 0) { @@ -449,6 +460,7 @@ public class ViewParser implements Parser throw new ImporterException("Cannot find node referenced by id " + idRefAttr); } node.setUUID(nodeRef.getId()); + node.setTypeDefinition(dictionaryService.getType(nodeService.getType(nodeRef))); } else if (pathRefAttr != null && pathRefAttr.length() > 0) { @@ -458,8 +470,9 @@ public class ViewParser implements Parser throw new ImporterException("Cannot find node referenced by path " + pathRefAttr); } node.setUUID(referencedRef.getId()); + node.setTypeDefinition(dictionaryService.getType(nodeService.getType(referencedRef))); } - + // Extract child name if explicitly defined String childName = xpp.getAttributeValue(NamespaceService.REPOSITORY_VIEW_1_0_URI, VIEW_CHILD_NAME_ATTR); if (childName != null && childName.length() > 0)