diff --git a/source/java/org/alfresco/repo/rendition/executer/BaseTemplateRenderingEngine.java b/source/java/org/alfresco/repo/rendition/executer/BaseTemplateRenderingEngine.java index 74a2aa6afb..7a04b84501 100644 --- a/source/java/org/alfresco/repo/rendition/executer/BaseTemplateRenderingEngine.java +++ b/source/java/org/alfresco/repo/rendition/executer/BaseTemplateRenderingEngine.java @@ -55,8 +55,6 @@ public abstract class BaseTemplateRenderingEngine extends AbstractRenderingEngin { private static final Log log = LogFactory.getLog(BaseTemplateRenderingEngine.class); - public static final String NAME = "xsltRenderingEngine"; - /** * This optional {@link Map}<{@link String}, {@link Serializable}> parameter * can be used to pass additional arguments to the templating engine when processing a diff --git a/source/java/org/alfresco/repo/rendition/executer/XSLTFunctions.java b/source/java/org/alfresco/repo/rendition/executer/XSLTFunctions.java index a9581ded93..b5fbc481f0 100644 --- a/source/java/org/alfresco/repo/rendition/executer/XSLTFunctions.java +++ b/source/java/org/alfresco/repo/rendition/executer/XSLTFunctions.java @@ -1,26 +1,20 @@ /* * Copyright (C) 2005-2010 Alfresco Software Limited. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, + * 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 General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - * As a special exception to the terms and conditions of version 2.0 of - * the GPL, you may redistribute this Program in connection with Free/Libre - * and Open Source Software ("FLOSS") applications as described in Alfresco's - * FLOSS exception. You should have received a copy of the text describing - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" + * 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 . */ package org.alfresco.repo.rendition.executer; diff --git a/source/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngine.java b/source/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngine.java index f32a790c8a..8f920eb044 100644 --- a/source/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngine.java +++ b/source/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngine.java @@ -52,6 +52,8 @@ import org.xml.sax.SAXException; */ public class XSLTRenderingEngine extends BaseTemplateRenderingEngine { + public static final String NAME = "xsltRenderingEngine"; + private static final Log log = LogFactory.getLog(XSLTRenderingEngine.class); private XSLTFunctions xsltFunctions; @@ -138,7 +140,7 @@ public class XSLTRenderingEngine extends BaseTemplateRenderingEngine } catch (Exception ex) { - + log.warn("Received an exception from parseXMLDocument()", ex); } return d == null ? null : d.getDocumentElement(); } diff --git a/source/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java b/source/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java index 6bbbe44c38..e0dc190a5b 100644 --- a/source/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java +++ b/source/java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java @@ -304,8 +304,7 @@ public class XSLTRenderingEngineTest extends BaseAlfrescoSpringTest "" + "" + - "" + "" + "" - + "" + "" + "" + "" + ""; + "" + "" + + "" + "" + "" + ""; - }