From commits-return-18614-archive-asf-public=cust-asf.ponee.io@struts.apache.org Tue Dec 3 08:32:56 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 8FDF2180629 for ; Tue, 3 Dec 2019 09:32:56 +0100 (CET) Received: (qmail 5200 invoked by uid 500); 3 Dec 2019 08:32:51 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 4795 invoked by uid 99); 3 Dec 2019 08:32:51 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Dec 2019 08:32:51 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 04CC08D809; Tue, 3 Dec 2019 08:32:51 +0000 (UTC) Date: Tue, 03 Dec 2019 08:32:55 +0000 To: "commits@struts.apache.org" Subject: [struts] 05/11: WW-5049 Extends xwork DTD as well MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: lukaszlenart@apache.org In-Reply-To: <157536197076.5064.5383242339880123229@gitbox.apache.org> References: <157536197076.5064.5383242339880123229@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: struts X-Git-Refname: refs/heads/WW-5049-velocity-plugin X-Git-Reftype: branch X-Git-Rev: 258153b66fd13f1ce7621f27ff2cad9f0b95dbe1 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20191203083251.04CC08D809@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch WW-5049-velocity-plugin in repository https://gitbox.apache.org/repos/asf/struts.git commit 258153b66fd13f1ce7621f27ff2cad9f0b95dbe1 Author: Lukasz Lenart AuthorDate: Tue Nov 26 20:27:28 2019 +0100 WW-5049 Extends xwork DTD as well --- .../config/providers/XmlConfigurationProvider.java | 3 +- .../config/StrutsXmlConfigurationProvider.java | 1 + core/src/main/resources/xwork-2.6.dtd | 157 +++++++++++++++++++++ 3 files changed, 160 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java index cec1c65..40e5cac 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java @@ -116,6 +116,7 @@ public class XmlConfigurationProvider implements ConfigurationProvider { this.errorIfMissing = errorIfMissing; Map mappings = new HashMap<>(); + mappings.put("-//Apache Struts//XWork 2.6//EN", "xwork-2.6.dtd"); mappings.put("-//Apache Struts//XWork 2.5//EN", "xwork-2.5.dtd"); mappings.put("-//Apache Struts//XWork 2.3//EN", "xwork-2.3.dtd"); mappings.put("-//Apache Struts//XWork 2.1.3//EN", "xwork-2.1.3.dtd"); @@ -224,7 +225,7 @@ public class XmlConfigurationProvider implements ConfigurationProvider { String impl = child.getAttribute("class"); try { Class classImpl = ClassLoaderUtil.loadClass(impl, getClass()); - if (classImpl.isAssignableFrom(ConfigurationProvider.class)) { + if (ConfigurationProvider.class.isAssignableFrom(classImpl)) { ConfigurationProvider provider = (ConfigurationProvider) classImpl.newInstance(); provider.register(containerBuilder, props); } else { diff --git a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java index ef27b6c..5f4bf9e 100644 --- a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java @@ -73,6 +73,7 @@ public class StrutsXmlConfigurationProvider extends XmlConfigurationProvider { dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN", "struts-2.1.7.dtd"); dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 2.3//EN", "struts-2.3.dtd"); dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 2.5//EN", "struts-2.5.dtd"); + dtdMappings.put("-//Apache Software Foundation//DTD Struts Configuration 2.6//EN", "struts-2.6.dtd"); setDtdMappings(dtdMappings); File file = new File(filename); if (file.getParent() != null) { diff --git a/core/src/main/resources/xwork-2.6.dtd b/core/src/main/resources/xwork-2.6.dtd new file mode 100644 index 0000000..6f0e319 --- /dev/null +++ b/core/src/main/resources/xwork-2.6.dtd @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +