struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [2/2] struts git commit: Process default conversion as required
Date Fri, 24 Mar 2017 07:29:06 GMT
Process default conversion as required


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3d3bee02
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3d3bee02
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3d3bee02

Branch: refs/heads/master
Commit: 3d3bee02182e061c4aeb9f8d1ac1ccc5fc2c52bf
Parents: 98467c2
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Thu Mar 23 15:28:58 2017 +0100
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Thu Mar 23 15:28:58 2017 +0100

----------------------------------------------------------------------
 .../com/opensymphony/xwork2/conversion/impl/XWorkConverter.java   | 3 +--
 core/src/main/resources/struts-default-conversion.properties      | 1 +
 core/src/main/resources/xwork-default-conversion.properties       | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/3d3bee02/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
index bdf74c2..4257411 100644
--- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
+++ b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
@@ -173,8 +173,7 @@ public class XWorkConverter extends DefaultTypeConverter {
 
     @Inject
     public void setConversionPropertiesProcessor(ConversionPropertiesProcessor propertiesProcessor)
{
-        // note: this file is deprecated
-        propertiesProcessor.process("xwork-default-conversion.properties");
+        propertiesProcessor.processRequired("struts-default-conversion.properties");
         propertiesProcessor.process("xwork-conversion.properties");
     }
 

http://git-wip-us.apache.org/repos/asf/struts/blob/3d3bee02/core/src/main/resources/struts-default-conversion.properties
----------------------------------------------------------------------
diff --git a/core/src/main/resources/struts-default-conversion.properties b/core/src/main/resources/struts-default-conversion.properties
new file mode 100644
index 0000000..43d0fe9
--- /dev/null
+++ b/core/src/main/resources/struts-default-conversion.properties
@@ -0,0 +1 @@
+java.io.File=org.apache.struts2.conversion.UploadedFileConverter

http://git-wip-us.apache.org/repos/asf/struts/blob/3d3bee02/core/src/main/resources/xwork-default-conversion.properties
----------------------------------------------------------------------
diff --git a/core/src/main/resources/xwork-default-conversion.properties b/core/src/main/resources/xwork-default-conversion.properties
deleted file mode 100644
index 43d0fe9..0000000
--- a/core/src/main/resources/xwork-default-conversion.properties
+++ /dev/null
@@ -1 +0,0 @@
-java.io.File=org.apache.struts2.conversion.UploadedFileConverter


Mime
View raw message