From ca8f2ddd3c7ba14580e74430ec557578961f2bd2 Mon Sep 17 00:00:00 2001 From: Toby Jee Date: Sat, 10 Jun 2006 04:19:27 +0000 Subject: [PATCH] WW-1336 - separate webapp (showcase) resources into a separate /resource directory rather that currently in its /java directory git-svn-id: https://svn.apache.org/repos/asf/struts/action2/trunk@413224 13f79535-47bb-0310-9956-ffa450edef68 --- .../action2/showcase/DateAction.properties | 1 + ...-lotsOfRichtexteditorSubmit-validation.xml | 30 ++++++++ .../UITagExample-conversion.properties | 1 + .../EmployeeAction-conversion.properties | 1 + .../action/EmployeeAction-validation.xml | 21 ++++++ .../showcase/action/EmployeeAction.properties | 9 +++ .../action/EmployeeAction_de.properties | 9 +++ .../action/SkillAction-validation.xml | 11 +++ .../showcase/action/SkillAction.properties | 6 ++ .../showcase/action/SkillAction_de.properties | 6 ++ .../PersonAction-conversion.properties | 1 + .../person/CreatePerson-validation.xml | 8 ++ .../person/EditPerson-conversion.properties | 3 + .../showcase/person/Person-validation.xml | 13 ++++ .../IteratorGeneratorTagDemo-validation.xml | 22 ++++++ ...idatorsExampleAction-conversion.properties | 1 + ...ClientSideValidationExample-validation.xml | 74 +++++++++++++++++++ ...bmitFieldValidatorsExamples-validation.xml | 68 +++++++++++++++++ .../FieldValidatorsExampleAction.properties | 1 + ...tNonFieldValidatorsExamples-validation.xml | 18 +++++ .../validation/QuizAction-validation.xml | 23 ++++++ .../User-userContext-validation.xml | 27 +++++++ ...itVisitorValidatorsExamples-validation.xml | 20 +++++ ...TestConversionAction-conversion.properties | 1 + 24 files changed, 375 insertions(+) create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/DateAction.properties create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/UITagExample-conversion.properties create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/EmployeeAction-conversion.properties create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/EmployeeAction-validation.xml create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/EmployeeAction.properties create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/EmployeeAction_de.properties create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/SkillAction-validation.xml create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/SkillAction.properties create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/SkillAction_de.properties create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/conversion/PersonAction-conversion.properties create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/person/CreatePerson-validation.xml create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/person/EditPerson-conversion.properties create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/person/Person-validation.xml create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-conversion.properties create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.properties create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/QuizAction-validation.xml create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/User-userContext-validation.xml create mode 100644 apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml create mode 100644 apps/showcase/src/main/resources/tmjee/TestConversionAction-conversion.properties diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/DateAction.properties b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/DateAction.properties new file mode 100644 index 000000000..d49c743a5 --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/DateAction.properties @@ -0,0 +1 @@ +struts.date.format=yyyy/MM/dd hh:mm:ss \ No newline at end of file diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml new file mode 100644 index 000000000..8bf17c7c1 --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/LotsOfRichtexteditorAction-lotsOfRichtexteditorSubmit-validation.xml @@ -0,0 +1,30 @@ + + + + + + Description1 Is Required !!! + + + + + + Description2 Is Required !!! + + + + + + Description3 Is Required !!! + + + + + + Description4 Is Required !!! + + + + diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/UITagExample-conversion.properties b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/UITagExample-conversion.properties new file mode 100644 index 000000000..2415dcf3c --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/UITagExample-conversion.properties @@ -0,0 +1 @@ +Element_friends = java.lang.String diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/EmployeeAction-conversion.properties b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/EmployeeAction-conversion.properties new file mode 100644 index 000000000..21d3eda97 --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/EmployeeAction-conversion.properties @@ -0,0 +1 @@ +Element_selectedSkills=java.lang.String diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/EmployeeAction-validation.xml b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/EmployeeAction-validation.xml new file mode 100644 index 000000000..c49959888 --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/EmployeeAction-validation.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + true + + + + + + + + + diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/EmployeeAction.properties b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/EmployeeAction.properties new file mode 100644 index 000000000..e2e548b3c --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/EmployeeAction.properties @@ -0,0 +1,9 @@ +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/resources/org/apache/struts/action2/showcase/action/EmployeeAction_de.properties b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/EmployeeAction_de.properties new file mode 100644 index 000000000..ca594de4d --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/EmployeeAction_de.properties @@ -0,0 +1,9 @@ +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/resources/org/apache/struts/action2/showcase/action/SkillAction-validation.xml b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/SkillAction-validation.xml new file mode 100644 index 000000000..486e79f61 --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/SkillAction-validation.xml @@ -0,0 +1,11 @@ + + + + + + + true + + + + diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/SkillAction.properties b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/SkillAction.properties new file mode 100644 index 000000000..27b7c81df --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/SkillAction.properties @@ -0,0 +1,6 @@ +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/resources/org/apache/struts/action2/showcase/action/SkillAction_de.properties b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/SkillAction_de.properties new file mode 100644 index 000000000..7c7156f71 --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/action/SkillAction_de.properties @@ -0,0 +1,6 @@ +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/resources/org/apache/struts/action2/showcase/conversion/PersonAction-conversion.properties b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/conversion/PersonAction-conversion.properties new file mode 100644 index 000000000..10ba2dd73 --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/conversion/PersonAction-conversion.properties @@ -0,0 +1 @@ +Element_persons=org.apache.struts.action2.showcase.conversion.Person diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/person/CreatePerson-validation.xml b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/person/CreatePerson-validation.xml new file mode 100644 index 000000000..6d19ebdf6 --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/person/CreatePerson-validation.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/person/EditPerson-conversion.properties b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/person/EditPerson-conversion.properties new file mode 100644 index 000000000..4e4e5dc7e --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/person/EditPerson-conversion.properties @@ -0,0 +1,3 @@ +KeyProperty_persons=id +Element_persons=org.apache.struts.action2.showcase.person.Person +CreateIfNull_persons=true diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/person/Person-validation.xml b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/person/Person-validation.xml new file mode 100644 index 000000000..da2c81f0c --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/person/Person-validation.xml @@ -0,0 +1,13 @@ + + + + + You must enter a first name. + + + + + You must enter a last name + + + diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml new file mode 100644 index 000000000..55f9577b2 --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo-validation.xml @@ -0,0 +1,22 @@ + + + + + + + true + Value must not be empty + + + + + + + Count must be an integer + + + + + diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-conversion.properties b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-conversion.properties new file mode 100644 index 000000000..2f970dc18 --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-conversion.properties @@ -0,0 +1 @@ +dateValidatorField=java.util.Date \ No newline at end of file diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml new file mode 100644 index 000000000..215a7c9ac --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitClientSideValidationExample-validation.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + true + + + + + + true + + + + + + 1 + 10 + + + + + + 01/01/1990 + 01/01/2000 + + + + + + + + + + + + + + + + 4 + 2 + true + + + + + + .*\.txt + + + + + + (fieldExpressionValidatorField == requiredValidatorField) + + + + + + + diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml new file mode 100644 index 000000000..97250cf93 --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction-submitFieldValidatorsExamples-validation.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + true + + + + + + 1 + 10 + + + + + + 01/01/1990 + 01/01/2000 + + + + + + + + + + + + + + + + 4 + 2 + true + + + + + + .*\.txt + + + + + + (fieldExpressionValidatorField == requiredValidatorField) + + + + + + + diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.properties b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.properties new file mode 100644 index 000000000..14f04121a --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/FieldValidatorsExampleAction.properties @@ -0,0 +1 @@ +i18n.requiredstring=Test String for required Strings... diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml new file mode 100644 index 000000000..cba25b09e --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/NonFieldValidatorsExampleAction-submitNonFieldValidatorsExamples-validation.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/QuizAction-validation.xml b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/QuizAction-validation.xml new file mode 100644 index 000000000..dd716fade --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/QuizAction-validation.xml @@ -0,0 +1,23 @@ + + + + + + + + You must enter a name + + + + + 13 + 19 + Only people ages 13 to 19 may take this quiz + + + + + diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/User-userContext-validation.xml b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/User-userContext-validation.xml new file mode 100644 index 000000000..508eb6590 --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/User-userContext-validation.xml @@ -0,0 +1,27 @@ + + + + + + + + Name Required + + + + + 1 + 100 + Age Required (1-100) + + + + + Birthday Required + + + + + diff --git a/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml new file mode 100644 index 000000000..a8af8f005 --- /dev/null +++ b/apps/showcase/src/main/resources/org/apache/struts/action2/showcase/validation/VisitorValidatorsExampleAction-submitVisitorValidatorsExamples-validation.xml @@ -0,0 +1,20 @@ + + + + + + + + + + userContext + true + User: + + + + + + diff --git a/apps/showcase/src/main/resources/tmjee/TestConversionAction-conversion.properties b/apps/showcase/src/main/resources/tmjee/TestConversionAction-conversion.properties new file mode 100644 index 000000000..7648f3c57 --- /dev/null +++ b/apps/showcase/src/main/resources/tmjee/TestConversionAction-conversion.properties @@ -0,0 +1 @@ +myLittleDates=tmjee.DateConverter