RM-1582: Unable to upgrade from RM 1.0 or RM 2.0 to RM 2.2

* fixed report template patching



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@75528 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2014-07-02 00:14:43 +00:00
parent 2e66ca0828
commit 3873bb592a
3 changed files with 21 additions and 3 deletions

View File

@@ -77,8 +77,19 @@ public class RMv21ReportServicePatch extends RMv21PatchComponent
if (LOGGER.isDebugEnabled())
{
LOGGER.debug(" ... adding template root folder");
}
}
NodeRef reportTemplates = createNode(
RM_CONFIG_FOLDER,
ContentModel.TYPE_FOLDER,
"rm_report_templates",
"Records Management Report Templates",
"rm_report_templates",
"Records Management Report Templates",
"Records Management Report Templates");
nodeService.addAspect(reportTemplates, ContentModel.ASPECT_TITLED, null);
nodeService.addAspect(reportTemplates, ContentModel.ASPECT_AUTHOR, null);
if (LOGGER.isDebugEnabled())
{
LOGGER.debug(" ... adding destruction report template");
@@ -86,6 +97,7 @@ public class RMv21ReportServicePatch extends RMv21PatchComponent
// create report templates
NodeRef destructionTemplate = createNode(
TEMPLATE_ROOT,
ContentModel.TYPE_CONTENT,
"rmr_destructionReport",
"report_rmr_destructionReport.html.ftl",
@@ -104,7 +116,7 @@ public class RMv21ReportServicePatch extends RMv21PatchComponent
}
}
private NodeRef createNode(QName type, String id, String name, String assocName, String title, String description)
private NodeRef createNode(NodeRef parent, QName type, String id, String name, String assocName, String title, String description)
{
Map<QName, Serializable> props = new HashMap<QName, Serializable>(4);
props.put(ContentModel.PROP_DESCRIPTION, description);
@@ -119,7 +131,7 @@ public class RMv21ReportServicePatch extends RMv21PatchComponent
// create the node
return nodeService.createNode(
RM_CONFIG_FOLDER,
parent,
ContentModel.ASSOC_CONTAINS,
assocQName,
type,

View File

@@ -25,6 +25,7 @@ import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.patch.AbstractModulePatch;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
@@ -99,6 +100,8 @@ public class RMv22HoldReportPatch extends AbstractModulePatch
// put the content
ContentWriter writer = contentService.getWriter(node.getChildRef(), ContentModel.PROP_CONTENT, true);
writer.setEncoding("UTF-8");
writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
InputStream is = getClass().getClassLoader().getResourceAsStream(REPORT_TEMPLATE_PATH);
writer.putContent(is);
}

View File

@@ -25,6 +25,7 @@ import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.patch.AbstractModulePatch;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
@@ -103,6 +104,8 @@ public class RMv22ReportTemplatePatch extends AbstractModulePatch
// put the content
ContentWriter writer = contentService.getWriter(node.getChildRef(), ContentModel.PROP_CONTENT, true);
InputStream is = getClass().getClassLoader().getResourceAsStream(REPORT_TEMPLATE_PATH);
writer.setEncoding("UTF-8");
writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
writer.putContent(is);
}
}