Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-31 19:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-5078 Removes support for <xwork> DTDs

Browse Source
This commit is contained in:
Lukasz Lenart
2020-07-08 08:49:05 +02:00
parent a72d1a8ddf
commit b4bc5dcf75
94 changed files with 1033 additions and 1010 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/bean-validation/src/test/java/org/apache/struts/beanvalidation/BeanValidationInterceptorTest.java
+2 -1
View File
@@ -26,6 +26,7 @@ import org.apache.struts.beanvalidation.actions.FieldAction;
import org.apache.struts.beanvalidation.actions.FieldMatchAction;
import org.apache.struts.beanvalidation.actions.ModelDrivenAction;
import org.apache.struts.beanvalidation.actions.ValidateGroupAction;
import org.apache.struts2.config.StrutsXmlConfigurationProvider;
import java.util.Collection;
import java.util.List;
@@ -280,6 +281,6 @@ public class BeanValidationInterceptorTest extends XWorkTestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
loadConfigurationProviders(new XmlConfigurationProvider("bean-validation-test.xml"));
loadConfigurationProviders(new StrutsXmlConfigurationProvider("bean-validation-test.xml"));
}
}
plugins/bean-validation/src/test/resources/bean-validation-test.xml
+5 -7
View File
@@ -19,12 +19,10 @@
* under the License.
*/
-->
<!DOCTYPE xwork PUBLIC
"-//Apache Struts//XWork 2.5//EN"
"http://struts.apache.org/dtds/xwork-2.5.dtd"
>
<xwork>
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
"http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<constant name="struts.beanValidation.providerClass" value="org.hibernate.validator.HibernateValidator"/>
<constant name="struts.beanValidation.ignoreXMLConfiguration" value="false"/>
<constant name="struts.beanValidation.convertMessageToUtf" value="false"/>
@@ -72,4 +70,4 @@
</action>
</package>
</xwork>
</struts>