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

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

Browse Source 
78438: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      77695: ACE-2149 - EOL AVM / WCM. Ripped WCM out of Explorer.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:18:05 +00:00
parent 8801446a2b
commit c532a2288d
2 changed files with 27 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/java/org/alfresco/repo/rendition/StandardRenditionLocationResolverImpl.java
View File

@@ -27,6 +27,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import javax.xml.XMLConstants;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.model.Repository;
import org.alfresco.repo.rendition.executer.AbstractRenderingEngine;
@@ -45,11 +47,13 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.repository.TemplateException;
import org.alfresco.util.FreeMarkerUtil;
import org.alfresco.util.XMLUtil;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import freemarker.ext.dom.NodeModel;
import freemarker.template.SimpleDate;
@@ -270,7 +274,7 @@ public class StandardRenditionLocationResolverImpl implements RenditionLocationR
try
{
Document xml = XMLUtil.parse(sourceNode, serviceRegistry.getContentService());
pathTemplate = FreeMarkerUtil.buildNamespaceDeclaration(xml) + pathTemplate;
pathTemplate = buildNamespaceDeclaration(xml) + pathTemplate;
root.put("xml", NodeModel.wrap(xml));
} catch (Exception ex)
{
@@ -322,4 +326,25 @@ public class StandardRenditionLocationResolverImpl implements RenditionLocationR
return result;
}
public static String buildNamespaceDeclaration(final Document xml)
{
final Element docEl = xml.getDocumentElement();
final NamedNodeMap attributes = docEl.getAttributes();
final StringBuilder result = new StringBuilder();
for (int i = 0; i < attributes.getLength(); i++)
{
final Node a = attributes.item(i);
if (a.getNodeName().startsWith(XMLConstants.XMLNS_ATTRIBUTE))
{
final String prefix = a.getNodeName().substring((XMLConstants.XMLNS_ATTRIBUTE + ":").length());
final String uri = a.getNodeValue();
if (result.length() != 0)
{
result.append(",\n");
}
result.append("\"").append(prefix).append("\":\"").append(uri).append("\"");
}
}
return "<#ftl ns_prefixes={\n" + result.toString() + "}>\n";
}
}

60
source/java/org/alfresco/util/FreeMarkerUtil.java
View File

@@ -1,60 +0,0 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.util;
import java.io.*;
import java.util.LinkedList;
import javax.xml.XMLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NamedNodeMap;
import org.xml.sax.SAXException;
/**
* FreeMarker utility functions.
*
* @author Ariel Backenroth
*/
public class FreeMarkerUtil
{
public static String buildNamespaceDeclaration(final Document xml)
{
final Element docEl = xml.getDocumentElement();
final NamedNodeMap attributes = docEl.getAttributes();
final StringBuilder result = new StringBuilder();
for (int i = 0; i < attributes.getLength(); i++)
{
final Node a = attributes.item(i);
if (a.getNodeName().startsWith(XMLConstants.XMLNS_ATTRIBUTE))
{
final String prefix = a.getNodeName().substring((XMLConstants.XMLNS_ATTRIBUTE + ":").length());
final String uri = a.getNodeValue();
if (result.length() != 0)
{
result.append(",\n");
}
result.append("\"").append(prefix).append("\":\"").append(uri).append("\"");
}
}
return "<#ftl ns_prefixes={\n" + result.toString() + "}>\n";
}
}