Adds proper XML header

apps/showcase/src/main/resources/org/apache/struts2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

apps/showcase/src/main/resources/org/apache/struts2/showcase/person/NewPersonAction-validation.xml

@@ -1,4 +1,4 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,7 @@
  * under the License.
  */
 -->
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="person">
         <field-validator type="visitor">

apps/showcase/src/main/resources/org/apache/struts2/showcase/person/Person-validation.xml

@@ -1,4 +1,4 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,7 @@
  * under the License.
  */
 -->
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.dtd">
 <validators>
     <field name="name">
         <field-validator type="requiredstring">

apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/QuizAction-validation.xml

@@ -1,4 +1,4 @@
-<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,7 @@
  * under the License.
  */
 -->
+<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.2//EN" "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd">
 <!--  START SNIPPET: quizValidators -->
 <!--
     Add the following DOCTYPE declaration as first line of your XXX-validation.xml file:

apps/showcase/src/main/webapp/WEB-INF/decorators.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

apps/showcase/src/main/webapp/WEB-INF/sitemesh.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

apps/showcase/src/main/webapp/WEB-INF/tiles.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

apps/showcase/src/main/webapp/WEB-INF/validation.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

assembly/pom.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

assembly/src/main/assembly/all.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

assembly/src/main/assembly/apps.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

assembly/src/main/assembly/docs.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

assembly/src/main/assembly/lib.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

assembly/src/main/assembly/min-lib.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

assembly/src/main/assembly/src.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/main/resources/xwork-default.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/site/site.xml

@@ -19,7 +19,7 @@
  * under the License.
  */
 -->
-<project name="Struts 2">
+<project name="Apache Struts">
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>

core/src/test/java/com/opensymphony/xwork2/validator/DefaultValidatorFileParserTest.java

@@ -101,7 +101,7 @@ public void testParser() {
         assertEquals("required", cfg.getType());
         assertEquals("foo", cfg.getParams().get("fieldName"));
         assertEquals("You must enter a value for foo.", cfg.getDefaultMessage());
-        assertEquals(24, cfg.getLocation().getLineNumber());
+        assertEquals(25, cfg.getLocation().getLineNumber());
 
         cfg = (ValidatorConfig) configs.get(3);
         assertEquals("required", cfg.getType());
@@ -124,7 +124,7 @@ public void testParserWithBadValidation() {
         try {
             parser.parseActionValidatorConfigs((ValidatorFactory) mockValidatorFactory.proxy(), is, testFileName3);
         } catch (XWorkException ex) {
-            assertTrue("Wrong line number", 23 == ex.getLocation().getLineNumber());
+            assertTrue("Wrong line number", 24 == ex.getLocation().getLineNumber());
             pass = true;
         }
         assertTrue("Validation file should have thrown exception", pass);
@@ -137,7 +137,7 @@ public void testParserWithBadXML() {
         try {
             parser.parseActionValidatorConfigs((ValidatorFactory) mockValidatorFactory.proxy(), is, testFileName4);
         } catch (XWorkException ex) {
-            assertTrue("Wrong line number: " + ex.getLocation(), 33 == ex.getLocation().getLineNumber());
+            assertTrue("Wrong line number: " + ex.getLocation(), 34 == ex.getLocation().getLineNumber());
             pass = true;
         }
         assertTrue("Validation file should have thrown exception", pass);
@@ -163,7 +163,7 @@ public void testValidatorDefinitionsWithBadClassName() {
         try {
             parser.parseActionValidatorConfigs((ValidatorFactory) mockValidatorFactory.proxy(), is, testFileName5);
         } catch (XWorkException ex) {
-            assertTrue("Wrong line number", 23 == ex.getLocation().getLineNumber());
+            assertTrue("Wrong line number", 24 == ex.getLocation().getLineNumber());
             pass = true;
         }
         assertTrue("Validation file should have thrown exception", pass);

core/src/test/resources/com/opensymphony/xwork2/ModelDrivenAction-validation.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/SimpleAction-some-alias-validation.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/SimpleAction-subproperty-validation.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validation.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validationAlias-validation.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/TestBean-anotherContext-validation.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/TestBean-badtest-validation.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/TestBean-beanMessageBundle-validation.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/TestBean-expressionValidation-validation.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/TestBean-validation.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorChildValidation-validation.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorValidation-validation.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/TestChildBean-validation.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder1/xwork-test-load-order.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder2/xwork-test-load-order.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder3/xwork-test-load-order.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork- test.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package-2.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-after-package.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package-2.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-before-package.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-include-parent.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-action-invalid.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions-packagedefaultclassref.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-actions.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-bad-inheritance.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-basic-packages.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-default-package.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-defaultclassref-package.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-envs-substitution.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-exception-mappings.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-include-wildcard.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-defaultref.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-inheritance.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-spring.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-invalid-file.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-package-inheritance.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-inheritance.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-result-names.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-1.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-wildcard-2.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
  * Licensed to the Apache Software Foundation (ASF) under one