svn commit: r630598 - in /incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH: build.xml etc/StripesResources.properties etc/i18n/templates/default.properties

[aj...@apache.org]

Author: ajaquith
Date: Sat Feb 23 23:31:32 2008
New Revision: 630598

URL: http://svn.apache.org/viewvc?rev=630598&view=rev
Log:
Removed StripesResources.properties.

Removed:
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/StripesResources.properties
Modified:
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default.properties

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml?rev=630598&r1=630597&r2=630598&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml Sat Feb 23 23:31:32 2008
@@ -392,8 +392,7 @@
        <fileset dir="${code.src}/webdocs-stripes" />
        <webinf dir="${code.src}/webdocs-stripes/WEB-INF" />
        <webinf dir="etc" includes="**" excludes="**.tmpl web.xml ini/** *.jks db/** lib/** classes/**/*.class jspwiki-container.policy" />
-       <!-- FIXME: Do we really need to add in StripesResources if the contents are already in the i18n defaults file? -->
-       <classes dir="etc" includes="oscache.properties,StripesResources.properties" />
+       <classes dir="etc" includes="oscache.properties" />
     </war>
 
     <war warfile="${warfile}"

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default.properties?rev=630598&r1=630597&r2=630598&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default.properties Sat Feb 23 23:31:32 2008
@@ -677,15 +677,12 @@
 ##       - Error messages used in your custom ActionBean classes
 ###############################################################################
 
-# Resource strings used by the <stripes:errors> tag when there are no nested tags
+# Resource strings used by the stripes:errors tag when there are no nested tags
 stripes.errors.header=<div style="color:#b72222; font-weight: bold">Please fix the following errors:</div><ol>
 stripes.errors.beforeError=<li style="color: #b72222;">
 stripes.errors.afterError=</li>
 stripes.errors.footer=</ol>
 
-# Resource strings used by the <stripes:errors> tag when displaying errors for a
-# specific field (e.g. <stripes:errors field="password"/>). If not supplied the
-# values above will be used instead.
 stripes.fieldErrors.header=
 stripes.fieldErrors.beforeError=<span style="color: #b72222;">
 stripes.fieldErrors.afterError=</span><br />
@@ -697,15 +694,7 @@
 stripes.messages.afterMessage=</li>
 stripes.messages.footer=</ul>
 
-# Validation error messages produced by Stripes' built-in converter classes. These
-# are default error messages and can be overridden on per-field and per-form levels.
-# Using the 'invalidNumber' error for a field 'age' of a form posting to
-# '/user/Profile.action', the keys looked for (in order) would be:
-#      1: /user/Profile.action.age.invalidNumber
-#      2: /user/Profile.action.age.errorMessage
-#      3: age.errorMessage
-#      4: /user/Profile.action.invalidNumber
-#      5: converter.number.invalidNumber
+# Validation error messages produced by converter classes
 converter.number.invalidNumber=The value ({1}) entered in field {0} must be a valid number
 converter.byte.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3}
 converter.short.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3}
@@ -715,19 +704,11 @@
 converter.date.invalidDate=The value ({1}) entered in field {0} must be a valid date
 converter.email.invalidEmail=The value ({1}) entered is not a valid email address
 
-# Validation error messages produced by Stripes' annotation based validations. These
-# are default error messages and can be overridden on per-field and per-form levels.
-# Using the 'valueNotPresent' required field error for a field 'username' of a form
-# posting to '/user/Register.action', the keys looked for (in order) would be:
-#      1: /user/Register.action.username.valueNotPresent
-#      2: /user/Register.action.username.errorMessage
-#      3: username.errorMessage
-#      4: /user/Register.action.valueNotPresent
-#      5: validation.required.valueNotPresent
+# Validation error messages produced by the annotation based validations
 validation.required.valueNotPresent={0} is a required field
 validation.minlength.valueTooShort={0} must be at least {2} characters long
 validation.maxlength.valueTooLong={0} must be no more than {2} characters long
 validation.minvalue.valueBelowMinimum=The minimum allowed value for {0} is {2}
 validation.maxvalue.valueAboveMaximum=The maximum allowed value for {0} is {2}
 validation.mask.valueDoesNotMatch=<em>{1}</em> is not a valid {0}
-validation.expression.valueFailedExpression=The value supplied ({1}) for field {0} is invalid
+validation.expression.valueFailedExpression=The value supplied ({1}) for field {0} is invalid
\ No newline at end of file