diff --git a/apps/pom.xml b/apps/pom.xml index ffc4b1f05..e7e0fa6e8 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -1,8 +1,6 @@ diff --git a/apps/rest-showcase/src/main/resources/struts.xml b/apps/rest-showcase/src/main/resources/struts.xml index 16d073978..daf26d076 100644 --- a/apps/rest-showcase/src/main/resources/struts.xml +++ b/apps/rest-showcase/src/main/resources/struts.xml @@ -1,8 +1,6 @@ diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml index 383eeb86f..3d728f30c 100644 --- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml +++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml @@ -1,4 +1,24 @@ - + diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction-validation.xml index a82f7654b..2fb09bc77 100644 --- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction-validation.xml +++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/EmployeeAction-validation.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/SkillAction-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/SkillAction-validation.xml index 911e1fad3..0c0929ff2 100644 --- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/SkillAction-validation.xml +++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/action/SkillAction-validation.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml index 989656e42..df2dd55d8 100644 --- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml +++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/fileupload/FileUploadAction-validation.xml @@ -1,5 +1,25 @@ - + diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/NewPersonAction-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/NewPersonAction-validation.xml index 6d7f85fe1..56a20829b 100644 --- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/NewPersonAction-validation.xml +++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/NewPersonAction-validation.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/Person-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/Person-validation.xml index 4d8a374b2..553203363 100644 --- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/Person-validation.xml +++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/person/Person-validation.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml index 981cf73e3..44eb0032f 100644 --- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml +++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml @@ -1,5 +1,25 @@ - + diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml index 2f5bad26b..16273112a 100644 --- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml +++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml @@ -1,5 +1,24 @@ - + diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml index 26a87f3be..d1e68215e 100644 --- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml +++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml @@ -1,5 +1,24 @@ - + diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml index 71673c1f1..92fb2313e 100644 --- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml +++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml @@ -1,5 +1,24 @@ - + diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/QuizAction-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/QuizAction-validation.xml index 4da868ac4..1c062bc6f 100644 --- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/QuizAction-validation.xml +++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/QuizAction-validation.xml @@ -1,5 +1,24 @@ - + diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/User-userContext-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/User-userContext-validation.xml index 7984609c0..1020aa60a 100644 --- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/User-userContext-validation.xml +++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/User-userContext-validation.xml @@ -1,5 +1,24 @@ - + diff --git a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml index 3789b1c39..7e24f4bb2 100644 --- a/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml +++ b/apps/showcase/src/main/resources/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml @@ -1,5 +1,24 @@ - + diff --git a/apps/showcase/src/main/resources/struts-actionchaining.xml b/apps/showcase/src/main/resources/struts-actionchaining.xml index ab0f2ea5b..f140f9e96 100644 --- a/apps/showcase/src/main/resources/struts-actionchaining.xml +++ b/apps/showcase/src/main/resources/struts-actionchaining.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/struts-conversion.xml b/apps/showcase/src/main/resources/struts-conversion.xml index e597b25c0..a3c147bd6 100644 --- a/apps/showcase/src/main/resources/struts-conversion.xml +++ b/apps/showcase/src/main/resources/struts-conversion.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/struts-filedownload.xml b/apps/showcase/src/main/resources/struts-filedownload.xml index de50f5abd..56d083f0a 100644 --- a/apps/showcase/src/main/resources/struts-filedownload.xml +++ b/apps/showcase/src/main/resources/struts-filedownload.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/struts-fileupload.xml b/apps/showcase/src/main/resources/struts-fileupload.xml index d9d0cfcac..a13739aa5 100644 --- a/apps/showcase/src/main/resources/struts-fileupload.xml +++ b/apps/showcase/src/main/resources/struts-fileupload.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/struts-freemarker.xml b/apps/showcase/src/main/resources/struts-freemarker.xml index 9a6c9017f..26ee8aedc 100644 --- a/apps/showcase/src/main/resources/struts-freemarker.xml +++ b/apps/showcase/src/main/resources/struts-freemarker.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/struts-hangman.xml b/apps/showcase/src/main/resources/struts-hangman.xml index b8540630a..ee1f4f6a1 100644 --- a/apps/showcase/src/main/resources/struts-hangman.xml +++ b/apps/showcase/src/main/resources/struts-hangman.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/struts-interactive.xml b/apps/showcase/src/main/resources/struts-interactive.xml index 7c50d3753..ad584a17a 100644 --- a/apps/showcase/src/main/resources/struts-interactive.xml +++ b/apps/showcase/src/main/resources/struts-interactive.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/struts-model-driven.xml b/apps/showcase/src/main/resources/struts-model-driven.xml index 56e4bdfbe..c8731e980 100644 --- a/apps/showcase/src/main/resources/struts-model-driven.xml +++ b/apps/showcase/src/main/resources/struts-model-driven.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/struts-person.xml b/apps/showcase/src/main/resources/struts-person.xml index e880e5b27..946c4c104 100644 --- a/apps/showcase/src/main/resources/struts-person.xml +++ b/apps/showcase/src/main/resources/struts-person.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/struts-tags-non-ui.xml b/apps/showcase/src/main/resources/struts-tags-non-ui.xml index 9ecf1528b..484341976 100644 --- a/apps/showcase/src/main/resources/struts-tags-non-ui.xml +++ b/apps/showcase/src/main/resources/struts-tags-non-ui.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/struts-tags-ui.xml b/apps/showcase/src/main/resources/struts-tags-ui.xml index 659e97934..69b9bdac0 100644 --- a/apps/showcase/src/main/resources/struts-tags-ui.xml +++ b/apps/showcase/src/main/resources/struts-tags-ui.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/struts-tags.xml b/apps/showcase/src/main/resources/struts-tags.xml index 8485a64f0..b2896dace 100644 --- a/apps/showcase/src/main/resources/struts-tags.xml +++ b/apps/showcase/src/main/resources/struts-tags.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/struts-tiles.xml b/apps/showcase/src/main/resources/struts-tiles.xml index caa0727f0..6845710dc 100644 --- a/apps/showcase/src/main/resources/struts-tiles.xml +++ b/apps/showcase/src/main/resources/struts-tiles.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/struts-token.xml b/apps/showcase/src/main/resources/struts-token.xml index 8b545df04..ffdf2761a 100644 --- a/apps/showcase/src/main/resources/struts-token.xml +++ b/apps/showcase/src/main/resources/struts-token.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/struts-validation.xml b/apps/showcase/src/main/resources/struts-validation.xml index 63fcd7970..7872d42b0 100755 --- a/apps/showcase/src/main/resources/struts-validation.xml +++ b/apps/showcase/src/main/resources/struts-validation.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/struts-wait.xml b/apps/showcase/src/main/resources/struts-wait.xml index 1a5556d73..273e8e550 100644 --- a/apps/showcase/src/main/resources/struts-wait.xml +++ b/apps/showcase/src/main/resources/struts-wait.xml @@ -1,4 +1,24 @@ + diff --git a/apps/showcase/src/main/resources/struts-xslt.xml b/apps/showcase/src/main/resources/struts-xslt.xml index d3a040bb7..5bbdc55b5 100644 --- a/apps/showcase/src/main/resources/struts-xslt.xml +++ b/apps/showcase/src/main/resources/struts-xslt.xml @@ -1,5 +1,24 @@ - + diff --git a/apps/showcase/src/main/resources/struts.xml b/apps/showcase/src/main/resources/struts.xml index 11ca7246a..46611f9cd 100644 --- a/apps/showcase/src/main/resources/struts.xml +++ b/apps/showcase/src/main/resources/struts.xml @@ -1,5 +1,24 @@ - + diff --git a/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml b/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml index c4a105954..f5c15414c 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml +++ b/apps/showcase/src/main/webapp/WEB-INF/applicationContext.xml @@ -1,4 +1,24 @@ + - + diff --git a/apps/showcase/src/main/webapp/WEB-INF/dwr.xml b/apps/showcase/src/main/webapp/WEB-INF/dwr.xml index 99869bf4a..e2ce2bef3 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/dwr.xml +++ b/apps/showcase/src/main/webapp/WEB-INF/dwr.xml @@ -1,5 +1,24 @@ - + diff --git a/apps/showcase/src/main/webapp/WEB-INF/tiles.xml b/apps/showcase/src/main/webapp/WEB-INF/tiles.xml index a74de1b6b..890e38718 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/tiles.xml +++ b/apps/showcase/src/main/webapp/WEB-INF/tiles.xml @@ -9,7 +9,7 @@ * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,6 @@ * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * */ --> diff --git a/apps/showcase/src/main/webapp/WEB-INF/validation.xml b/apps/showcase/src/main/webapp/WEB-INF/validation.xml index 284975364..289e83c43 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/validation.xml +++ b/apps/showcase/src/main/webapp/WEB-INF/validation.xml @@ -1,5 +1,24 @@ - + diff --git a/apps/showcase/src/main/webapp/WEB-INF/web.xml b/apps/showcase/src/main/webapp/WEB-INF/web.xml index 5b7f48aaa..d597101c3 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/web.xml +++ b/apps/showcase/src/main/webapp/WEB-INF/web.xml @@ -1,5 +1,25 @@ - + diff --git a/assembly/pom.xml b/assembly/pom.xml index 0e7d34246..a7518bac1 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -1,3 +1,23 @@ + 4.0.0 diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml index 6d8fefb69..ab63068c9 100644 --- a/assembly/src/main/assembly/all.xml +++ b/assembly/src/main/assembly/all.xml @@ -1,7 +1,5 @@ - diff --git a/assembly/src/main/assembly/apps.xml b/assembly/src/main/assembly/apps.xml index 37ec61afd..3d574dad9 100644 --- a/assembly/src/main/assembly/apps.xml +++ b/assembly/src/main/assembly/apps.xml @@ -1,7 +1,5 @@ - diff --git a/assembly/src/main/assembly/lib.xml b/assembly/src/main/assembly/lib.xml index e25418d12..3abb7c218 100644 --- a/assembly/src/main/assembly/lib.xml +++ b/assembly/src/main/assembly/lib.xml @@ -1,7 +1,5 @@ - diff --git a/assembly/src/main/assembly/min-lib.xml b/assembly/src/main/assembly/min-lib.xml index f139dd07c..af9bd8831 100644 --- a/assembly/src/main/assembly/min-lib.xml +++ b/assembly/src/main/assembly/min-lib.xml @@ -1,7 +1,5 @@ - diff --git a/assembly/src/main/assembly/src.xml b/assembly/src/main/assembly/src.xml index c520129ee..a25653d77 100644 --- a/assembly/src/main/assembly/src.xml +++ b/assembly/src/main/assembly/src.xml @@ -1,7 +1,5 @@ - diff --git a/assembly/src/main/resources/build.xml b/assembly/src/main/resources/build.xml index d271ab66d..2c27d6bb2 100644 --- a/assembly/src/main/resources/build.xml +++ b/assembly/src/main/resources/build.xml @@ -1,4 +1,24 @@ - + + diff --git a/bom/pom.xml b/bom/pom.xml index 482fb1985..fe72ff2ef 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -1,4 +1,24 @@ + 4.0.0 diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index bfe74548f..f6eeba272 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -1,4 +1,24 @@ + 4.0.0 diff --git a/bundles/admin/src/main/resources/struts.xml b/bundles/admin/src/main/resources/struts.xml index a6e545e5f..404c3b3b7 100644 --- a/bundles/admin/src/main/resources/struts.xml +++ b/bundles/admin/src/main/resources/struts.xml @@ -1,24 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> + 4.0.0 diff --git a/bundles/demo/src/main/resources/META-INF/spring/applicationContext.xml b/bundles/demo/src/main/resources/META-INF/spring/applicationContext.xml index aae9d2b42..38cd7bf7a 100644 --- a/bundles/demo/src/main/resources/META-INF/spring/applicationContext.xml +++ b/bundles/demo/src/main/resources/META-INF/spring/applicationContext.xml @@ -1,4 +1,24 @@ + diff --git a/bundles/demo/src/main/resources/struts.xml b/bundles/demo/src/main/resources/struts.xml index 3f72ce861..5a10fb315 100644 --- a/bundles/demo/src/main/resources/struts.xml +++ b/bundles/demo/src/main/resources/struts.xml @@ -1,4 +1,24 @@ + diff --git a/bundles/pom.xml b/bundles/pom.xml index cb4f36c9f..f326433c0 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -1,8 +1,6 @@ diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index e1b52667c..3c68264d2 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -1,8 +1,6 @@ diff --git a/core/src/test/resources/XSLTResultTest-val.xml b/core/src/test/resources/XSLTResultTest-val.xml index 6fe5614ae..a32a07a94 100644 --- a/core/src/test/resources/XSLTResultTest-val.xml +++ b/core/src/test/resources/XSLTResultTest-val.xml @@ -1,8 +1,6 @@ diff --git a/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-some-alias-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-some-alias-validation.xml index e22d20680..1949998f6 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-some-alias-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-some-alias-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-subproperty-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-subproperty-validation.xml index 849b5acb5..870acda69 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-subproperty-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-subproperty-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validation.xml index e1e9e458e..96334ab43 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validationAlias-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validationAlias-validation.xml index e22d20680..1949998f6 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validationAlias-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/SimpleAction-validationAlias-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/TestBean-anotherContext-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/TestBean-anotherContext-validation.xml index b1eee9e3d..2c50150aa 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/TestBean-anotherContext-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/TestBean-anotherContext-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/TestBean-badtest-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/TestBean-badtest-validation.xml index 2d2aa4ef0..7bff857d3 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/TestBean-badtest-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/TestBean-badtest-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/TestBean-beanMessageBundle-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/TestBean-beanMessageBundle-validation.xml index 4e0a3df48..2a085048d 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/TestBean-beanMessageBundle-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/TestBean-beanMessageBundle-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/TestBean-expressionValidation-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/TestBean-expressionValidation-validation.xml index 5537544a6..7233fc664 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/TestBean-expressionValidation-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/TestBean-expressionValidation-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/TestBean-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/TestBean-validation.xml index 7a3efc588..54ed03d04 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/TestBean-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/TestBean-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorChildValidation-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorChildValidation-validation.xml index cdae277b2..797db01f3 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorChildValidation-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorChildValidation-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorValidation-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorValidation-validation.xml index fabf79497..0173c71e9 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorValidation-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/TestBean-visitorValidation-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/TestChildBean-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/TestChildBean-validation.xml index 93298018c..48c94b41f 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/TestChildBean-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/TestChildBean-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/ValidationOrderAction-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/ValidationOrderAction-validation.xml index 481aa34db..ddb2ce12c 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/ValidationOrderAction-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/ValidationOrderAction-validation.xml @@ -1,5 +1,24 @@ - + diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder1/xwork-test-load-order.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder1/xwork-test-load-order.xml index c62a21cce..f95289eb2 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder1/xwork-test-load-order.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/loadorder1/xwork-test-load-order.xml @@ -1,3 +1,23 @@ + + + diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml index 493320ca8..a7d9bc5d5 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptor-params.xml @@ -1,3 +1,23 @@ + + diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml index 41d98c86a..7f562afff 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-interceptors-basic.xml @@ -1,3 +1,23 @@ + 17 23 diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml index 0e270dbc3..3d669e4a7 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-multilevel.xml @@ -1,3 +1,23 @@ + - + diff --git a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml index 5df61c707..25b84b538 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/config/providers/xwork-test-results.xml @@ -1,3 +1,23 @@ + + diff --git a/core/src/test/resources/com/opensymphony/xwork2/spring/autowireContext.xml b/core/src/test/resources/com/opensymphony/xwork2/spring/autowireContext.xml index 8422e8bad..4704c8418 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/spring/autowireContext.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/spring/autowireContext.xml @@ -1,4 +1,24 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/spring/resolverApplicationContext.xml b/core/src/test/resources/com/opensymphony/xwork2/spring/resolverApplicationContext.xml index 6f0908f92..c955021ba 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/spring/resolverApplicationContext.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/spring/resolverApplicationContext.xml @@ -1,4 +1,24 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/spring/xwork-autowire.xml b/core/src/test/resources/com/opensymphony/xwork2/spring/xwork-autowire.xml index a86ce2088..b83d3b92f 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/spring/xwork-autowire.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/spring/xwork-autowire.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validation.xml index 8bc0a7b3d..3b3f480cf 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validationAlias-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validationAlias-validation.xml index f32dd3bb0..983683cf3 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validationAlias-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/test/DataAware-validationAlias-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/test/DataAware2-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/test/DataAware2-validation.xml index 054d34fd5..6d48a6437 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/test/DataAware2-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/test/DataAware2-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/test/Equidae-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/test/Equidae-validation.xml index b59fe1f51..0c2f5ef56 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/test/Equidae-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/test/Equidae-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validation.xml index a48237f67..720188138 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validationAlias-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validationAlias-validation.xml index e22d20680..1949998f6 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validationAlias-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/test/SimpleAction2-validationAlias-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/test/User-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/test/User-validation.xml index afe5d3354..83375c9f5 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/test/User-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/test/User-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/test/UserMarker-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/test/UserMarker-validation.xml index e96fa5487..5a04f14d7 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/test/UserMarker-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/test/UserMarker-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/util/location/xml-with-location.xml b/core/src/test/resources/com/opensymphony/xwork2/util/location/xml-with-location.xml index 3e709c87e..e6f80345b 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/util/location/xml-with-location.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/util/location/xml-with-location.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml index 69380c685..7ff581d74 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml index be4d34c97..b841d1973 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateArray-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml index f83f1018b..1b766d67f 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validateList-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml index 03dfc5bf3..3ef45f2ab 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml index 69380c685..7ff581d74 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorChildValidation-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml index 69380c685..7ff581d74 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidation-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml index c9fc4f764..aa3f2e04b 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test.xml index 9302f2f76..98eccd1bc 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test2.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test2.xml index cf7798ad5..bb51b8ca7 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test2.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test2.xml @@ -1,4 +1,24 @@ - + diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test3.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test3.xml index b09037bd2..11638fcce 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test3.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test3.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test4.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test4.xml index 379f216e9..d32756ae3 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test4.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test4.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test5.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test5.xml index 3f4bbb61c..fe3f6046d 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test5.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test5.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test6.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test6.xml index 1ecd594b1..cc293a267 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test6.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/validator/validator-parser-test6.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml b/core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml index 890a4a184..eaf9f381d 100644 --- a/core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml +++ b/core/src/test/resources/com/opensymphony/xwork2/validator/validators-fail.xml @@ -1,4 +1,24 @@ + diff --git a/core/src/test/resources/includeTest.xml b/core/src/test/resources/includeTest.xml index d8b2a19a0..66bfd1300 100644 --- a/core/src/test/resources/includeTest.xml +++ b/core/src/test/resources/includeTest.xml @@ -1,3 +1,23 @@ + + diff --git a/core/src/test/resources/my-validators.xml b/core/src/test/resources/my-validators.xml index ac5f2e7f3..bc4543e40 100644 --- a/core/src/test/resources/my-validators.xml +++ b/core/src/test/resources/my-validators.xml @@ -1,4 +1,24 @@ + diff --git a/core/src/test/resources/myOther-validators.xml b/core/src/test/resources/myOther-validators.xml index c8fd91b0a..128c186de 100644 --- a/core/src/test/resources/myOther-validators.xml +++ b/core/src/test/resources/myOther-validators.xml @@ -1,4 +1,24 @@ + diff --git a/core/src/test/resources/org/apache/struts2/TestAction-validation.xml b/core/src/test/resources/org/apache/struts2/TestAction-validation.xml index 717f73746..28f323e64 100644 --- a/core/src/test/resources/org/apache/struts2/TestAction-validation.xml +++ b/core/src/test/resources/org/apache/struts2/TestAction-validation.xml @@ -1,7 +1,5 @@ diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/IntValidationAction-validation.xml b/core/src/test/resources/org/apache/struts2/views/jsp/ui/IntValidationAction-validation.xml index 3f058a9ab..8dbc0a4ce 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/IntValidationAction-validation.xml +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/IntValidationAction-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/User-validation.xml b/core/src/test/resources/org/apache/struts2/views/jsp/ui/User-validation.xml index 93473001e..10dc9876c 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/User-validation.xml +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/User-validation.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/struts-object-factory-result-builder.xml b/core/src/test/resources/struts-object-factory-result-builder.xml index 67d379aee..5db810d8e 100644 --- a/core/src/test/resources/struts-object-factory-result-builder.xml +++ b/core/src/test/resources/struts-object-factory-result-builder.xml @@ -1,7 +1,5 @@ diff --git a/core/src/test/resources/xwork-class-param-test.xml b/core/src/test/resources/xwork-class-param-test.xml index f12c08384..6a5b22a0e 100644 --- a/core/src/test/resources/xwork-class-param-test.xml +++ b/core/src/test/resources/xwork-class-param-test.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/xwork-param-test.xml b/core/src/test/resources/xwork-param-test.xml index 7a97df146..15f540840 100644 --- a/core/src/test/resources/xwork-param-test.xml +++ b/core/src/test/resources/xwork-param-test.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/xwork-proxyinvoke.xml b/core/src/test/resources/xwork-proxyinvoke.xml index 7338496e2..42639e64a 100644 --- a/core/src/test/resources/xwork-proxyinvoke.xml +++ b/core/src/test/resources/xwork-proxyinvoke.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/xwork-sample.xml b/core/src/test/resources/xwork-sample.xml index 2cdee20c7..6a6202814 100644 --- a/core/src/test/resources/xwork-sample.xml +++ b/core/src/test/resources/xwork-sample.xml @@ -1,3 +1,23 @@ + diff --git a/core/src/test/resources/xwork-test-default.xml b/core/src/test/resources/xwork-test-default.xml index fdfc609c9..e31bbb4e0 100644 --- a/core/src/test/resources/xwork-test-default.xml +++ b/core/src/test/resources/xwork-test-default.xml @@ -1,3 +1,23 @@ + + \ No newline at end of file diff --git a/plugins/cdi/src/test/resources/log4j2.xml b/plugins/cdi/src/test/resources/log4j2.xml index 3edabe1bf..84e67390a 100644 --- a/plugins/cdi/src/test/resources/log4j2.xml +++ b/plugins/cdi/src/test/resources/log4j2.xml @@ -1,4 +1,24 @@ + diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml index 8ede1c1db..a7d9ed632 100644 --- a/plugins/config-browser/pom.xml +++ b/plugins/config-browser/pom.xml @@ -1,8 +1,6 @@ 4.0.0 diff --git a/plugins/convention/src/main/resources/struts-plugin.xml b/plugins/convention/src/main/resources/struts-plugin.xml index e710f00ca..5205f1813 100644 --- a/plugins/convention/src/main/resources/struts-plugin.xml +++ b/plugins/convention/src/main/resources/struts-plugin.xml @@ -1,8 +1,6 @@ diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/tagPlugins.xml b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/tagPlugins.xml index c5c280655..d513c2d6d 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/tagPlugins.xml +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/tagplugins/jstl/tagPlugins.xml @@ -1,19 +1,23 @@ diff --git a/plugins/embeddedjsp/src/main/resources/struts-plugin.xml b/plugins/embeddedjsp/src/main/resources/struts-plugin.xml index fc5b993d1..2f7b5565c 100644 --- a/plugins/embeddedjsp/src/main/resources/struts-plugin.xml +++ b/plugins/embeddedjsp/src/main/resources/struts-plugin.xml @@ -1,8 +1,6 @@ 4.0.0 diff --git a/plugins/gxp/src/main/resources/struts-plugin.xml b/plugins/gxp/src/main/resources/struts-plugin.xml index 478c92682..b6d9c8ffb 100644 --- a/plugins/gxp/src/main/resources/struts-plugin.xml +++ b/plugins/gxp/src/main/resources/struts-plugin.xml @@ -1,5 +1,24 @@ - + diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index c993716dc..50ed778fe 100644 --- a/plugins/jasperreports/pom.xml +++ b/plugins/jasperreports/pom.xml @@ -1,8 +1,6 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> 4.0.0 diff --git a/plugins/javatemplates/src/main/resources/struts-plugin.xml b/plugins/javatemplates/src/main/resources/struts-plugin.xml index 6ea5110b6..537095792 100644 --- a/plugins/javatemplates/src/main/resources/struts-plugin.xml +++ b/plugins/javatemplates/src/main/resources/struts-plugin.xml @@ -1,26 +1,24 @@ - - +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index 061a50eb0..ffccb737b 100644 --- a/plugins/jfreechart/pom.xml +++ b/plugins/jfreechart/pom.xml @@ -1,8 +1,6 @@ diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index e231c82be..2ccc794be 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -1,8 +1,6 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> diff --git a/plugins/junit/src/test/resources/struts-convention-configuration.xml b/plugins/junit/src/test/resources/struts-convention-configuration.xml index 9d9dd218e..ff279f2cc 100644 --- a/plugins/junit/src/test/resources/struts-convention-configuration.xml +++ b/plugins/junit/src/test/resources/struts-convention-configuration.xml @@ -1,8 +1,6 @@ - +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> diff --git a/plugins/junit/src/test/resources/struts.xml b/plugins/junit/src/test/resources/struts.xml index 1c860907d..f99b8421c 100644 --- a/plugins/junit/src/test/resources/struts.xml +++ b/plugins/junit/src/test/resources/struts.xml @@ -1,24 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +--> diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml index 258604040..08e2c3e60 100644 --- a/plugins/osgi/pom.xml +++ b/plugins/osgi/pom.xml @@ -1,4 +1,24 @@ + 4.0.0 diff --git a/plugins/osgi/src/main/resources/beanRefContext.xml b/plugins/osgi/src/main/resources/beanRefContext.xml index 4b9b1615d..70d66f8f5 100644 --- a/plugins/osgi/src/main/resources/beanRefContext.xml +++ b/plugins/osgi/src/main/resources/beanRefContext.xml @@ -1,4 +1,24 @@ + diff --git a/plugins/osgi/src/main/resources/struts-plugin.xml b/plugins/osgi/src/main/resources/struts-plugin.xml index 302c7b45b..8e529244f 100644 --- a/plugins/osgi/src/main/resources/struts-plugin.xml +++ b/plugins/osgi/src/main/resources/struts-plugin.xml @@ -1,5 +1,24 @@ - + diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml index 12d37edb7..2982969c0 100644 --- a/plugins/oval/pom.xml +++ b/plugins/oval/pom.xml @@ -1,8 +1,6 @@ + 4.0.0 diff --git a/plugins/portlet/src/main/resources/struts-plugin.xml b/plugins/portlet/src/main/resources/struts-plugin.xml index 2d95d904b..7b9144767 100644 --- a/plugins/portlet/src/main/resources/struts-plugin.xml +++ b/plugins/portlet/src/main/resources/struts-plugin.xml @@ -1,8 +1,6 @@ diff --git a/plugins/portlet/src/test/resources/struts.xml b/plugins/portlet/src/test/resources/struts.xml index 15d7a4a41..d8c52875b 100644 --- a/plugins/portlet/src/test/resources/struts.xml +++ b/plugins/portlet/src/test/resources/struts.xml @@ -1,4 +1,24 @@ + diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index f85b4962a..7f4bf8d5b 100644 --- a/plugins/rest/pom.xml +++ b/plugins/rest/pom.xml @@ -1,8 +1,6 @@ diff --git a/src/etc/header.txt b/src/etc/header.txt index 3470b3ccd..51ceab3b5 100644 --- a/src/etc/header.txt +++ b/src/etc/header.txt @@ -1,5 +1,3 @@ -$Id$ - Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information diff --git a/src/main/idea/project.xml b/src/main/idea/project.xml deleted file mode 100644 index e80b654cd..000000000 --- a/src/main/idea/project.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - diff --git a/src/main/idea/workspace.xml b/src/main/idea/workspace.xml deleted file mode 100644 index 479e9807a..000000000 --- a/src/main/idea/workspace.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -