diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.properties b/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.properties deleted file mode 100644 index d49c743a5..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/DateAction.properties +++ /dev/null @@ -1 +0,0 @@ -struts.date.format=yyyy/MM/dd hh:mm:ss \ No newline at end of file diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml b/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml deleted file mode 100644 index 8bf17c7c1..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - Description1 Is Required !!! - - - - - - Description2 Is Required !!! - - - - - - Description3 Is Required !!! - - - - - - Description4 Is Required !!! - - - - diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample-conversion.properties b/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample-conversion.properties deleted file mode 100644 index 2415dcf3c..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample-conversion.properties +++ /dev/null @@ -1 +0,0 @@ -Element_friends = java.lang.String diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction-conversion.properties b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction-conversion.properties deleted file mode 100644 index 21d3eda97..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction-conversion.properties +++ /dev/null @@ -1 +0,0 @@ -Element_selectedSkills=java.lang.String diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction-validation.xml b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction-validation.xml deleted file mode 100644 index c49959888..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction-validation.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - true - - - - - - - - - diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.properties b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.properties deleted file mode 100644 index e2e548b3c..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction.properties +++ /dev/null @@ -1,9 +0,0 @@ -employee=Employee -employee.firstName=First Name -employee.lastName=Last Name -employee.description=Description - -employee.id.required=Id is required -employee.lastName.required=Last Name is required -employee.birthDate.required=Birthdate is required -employee.backtolist=Back to Employee List diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction_de.properties b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction_de.properties deleted file mode 100644 index ca594de4d..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/EmployeeAction_de.properties +++ /dev/null @@ -1,9 +0,0 @@ -employee=Mitarbeiter -employee.firstName=Vorname -employee.lastName=Nachname -employee.description=Beschreibung - -employee.id.required=ID muß angegeben werden -employee.lastName.required=Nachname wird benötigt -employee.birthDate.required=Geburtsdatum wird benötigt -employee.backtolist=Zurück zur Mitarbeiterliste diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction-validation.xml b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction-validation.xml deleted file mode 100644 index 486e79f61..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction-validation.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - true - - - - diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.properties b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.properties deleted file mode 100644 index 27b7c81df..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction.properties +++ /dev/null @@ -1,6 +0,0 @@ -skill=Skill -skill.name=Name -skill.description=Description - -skill.name.required=Name is required -skill.backtolist=Back to Skill List diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction_de.properties b/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction_de.properties deleted file mode 100644 index 7c7156f71..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/action/SkillAction_de.properties +++ /dev/null @@ -1,6 +0,0 @@ -skill=Kenntnis -skill.name=Name -skill.description=Beschreibung - -skill.name.required=Name muss angegeben werden -skill.backtolist=Zurück zur Kenntnis Liste diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction-conversion.properties b/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction-conversion.properties deleted file mode 100644 index 12f602f16..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/PersonAction-conversion.properties +++ /dev/null @@ -1 +0,0 @@ -Element_persons=org.apache.struts2.showcase.conversion.Person diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml b/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml deleted file mode 100644 index 55f9577b2..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - true - Value must not be empty - - - - - - - Count must be an integer - - - - - diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-conversion.properties b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-conversion.properties deleted file mode 100644 index 2f970dc18..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-conversion.properties +++ /dev/null @@ -1 +0,0 @@ -dateValidatorField=java.util.Date \ No newline at end of file diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml deleted file mode 100644 index 215a7c9ac..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - true - - - - - - true - - - - - - 1 - 10 - - - - - - 01/01/1990 - 01/01/2000 - - - - - - - - - - - - - - - - 4 - 2 - true - - - - - - .*\.txt - - - - - - (fieldExpressionValidatorField == requiredValidatorField) - - - - - - - diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml deleted file mode 100644 index 97250cf93..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - true - - - - - - 1 - 10 - - - - - - 01/01/1990 - 01/01/2000 - - - - - - - - - - - - - - - - 4 - 2 - true - - - - - - .*\.txt - - - - - - (fieldExpressionValidatorField == requiredValidatorField) - - - - - - - diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.properties b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.properties deleted file mode 100644 index 14f04121a..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/FieldValidatorsExampleAction.properties +++ /dev/null @@ -1 +0,0 @@ -i18n.requiredstring=Test String for required Strings... diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml deleted file mode 100644 index cba25b09e..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction-validation.xml b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction-validation.xml deleted file mode 100644 index dd716fade..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/QuizAction-validation.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - You must enter a name - - - - - 13 - 19 - Only people ages 13 to 19 may take this quiz - - - - - diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/User-userContext-validation.xml b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/User-userContext-validation.xml deleted file mode 100644 index 508eb6590..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/User-userContext-validation.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - Name Required - - - - - 1 - 100 - Age Required (1-100) - - - - - Birthday Required - - - - - diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml b/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml deleted file mode 100644 index a8af8f005..000000000 --- a/apps/showcase/src/main/java/org/apache/struts2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - userContext - true - User: - - - - - - diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction-conversion.properties b/apps/showcase/src/main/resources/org/apache/struts2/showcase/conversion/AddressAction-conversion.properties similarity index 100% rename from apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/AddressAction-conversion.properties rename to apps/showcase/src/main/resources/org/apache/struts2/showcase/conversion/AddressAction-conversion.properties diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction-conversion.properties b/apps/showcase/src/main/resources/org/apache/struts2/showcase/conversion/OperationsEnumAction-conversion.properties similarity index 100% rename from apps/showcase/src/main/java/org/apache/struts2/showcase/conversion/OperationsEnumAction-conversion.properties rename to apps/showcase/src/main/resources/org/apache/struts2/showcase/conversion/OperationsEnumAction-conversion.properties