This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/master by this push:
new 5871631 Adds struts-conversion.properties as a preferred source
5871631 is described below
commit 58716316d5bc9e9f80214173c713b6875f48bf7a
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Fri Mar 4 12:12:07 2022 +0100
Adds struts-conversion.properties as a preferred source
---
source/core-developers/type-conversion-annotation.md | 4 ++--
source/core-developers/type-conversion.md | 11 ++++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/source/core-developers/type-conversion-annotation.md
b/source/core-developers/type-conversion-annotation.md
index 9875348..f163f93 100644
--- a/source/core-developers/type-conversion-annotation.md
+++ b/source/core-developers/type-conversion-annotation.md
@@ -18,8 +18,8 @@ This annotation is used for class and application wide
conversion rules.
- Application wide conversion:
- The conversion rules will be assembled within the
`xwork-conversion.properties` file within the classpath root.
- Set type to: `type = ConversionType.APPLICATION`
+ The conversion rules will be assembled within the
`struts-conversion.properties` or `xwork-conversion.properties` (deprecated)
+ file within the classpath root. Set type to: `type =
ConversionType.APPLICATION`
## Usage
diff --git a/source/core-developers/type-conversion.md
b/source/core-developers/type-conversion.md
index ea4b938..dd2918f 100644
--- a/source/core-developers/type-conversion.md
+++ b/source/core-developers/type-conversion.md
@@ -111,7 +111,8 @@ amount=com.acme.converters.MyCustomBigDecimalConverter
## Applying a Type Converter for an application
-Application-wide converters can be specified in a file called
`xwork-conversion.properties` located in the root of the classpath.
+Application-wide converters can be specified in a file called
`struts-conversion.properties` or `xwork-conversion.properties` (deprecated)
+located in the root of the classpath.
```
# syntax: <type> = <converterClassName>
@@ -144,10 +145,10 @@ in FreeMarker) and it will be printed as "3, 22" again.
As such, if you submit t
converted back to a Point once again.
In some situations you may wish to apply a type converter globally. This can
be done by editing the file
-`xwork-conversion.properties` in the root of your class path (typically
WEB-INF/classes) and providing a
-property in the form of the class name of the object you wish to convert on
the left hand side and the class name of
-the type converter on the right hand side. For example, providing a type
converter for all Point objects would mean
-adding the following entry:
+`struts-conversion.properties` or `xwork-conversion.properties` (deprecated)
in the root of your class path
+(typically WEB-INF/classes) and providing a property in the form of the class
name of the object you wish to convert
+on the left hand side and the class name of the type converter on the right
hand side. For example, providing a type
+converter for all Point objects would mean adding the following entry:
```
com.acme.Point = com.acme.PointConverter
