upgrade struts2 to 2.3.31

appirio-tech · Dec 25, 2016 · 39255ba · 39255ba
1 parent 9cc218f
commit 39255ba
Show file tree

Hide file tree

Showing 27 changed files with 34 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-lib/
 lib/tcs
 build/
 direct.ear

diff --git a/build-dependencies.xml b/build-dependencies.xml
@@ -410,25 +410,25 @@
 -->
 
     <!-- Struts 2 libs -->
-    <property name="struts2_libdir" value="${ext_libdir}/struts"/>
+    <property name="struts2_libdir" value="${ext_libdir}/struts/2.3.31"/>
     <property name="commons-beanutils-1.8.0.jar" value="${struts2_libdir}/commons-beanutils-1.8.0.jar"/>
-    <property name="commons-collections-3.2.jar" value="${struts2_libdir}/commons-collections-3.2.jar"/>
-    <property name="commons-fileupload-1.3.jar" value="${struts2_libdir}/commons-fileupload-1.3.jar"/>
-    <property name="commons-io-2.0.1.jar" value="${struts2_libdir}/commons-io-2.0.1.jar"/>
+    <property name="commons-collections-3.2.2.jar" value="${struts2_libdir}/commons-collections-3.2.2.jar"/>
+    <property name="commons-fileupload-1.3.2.jar" value="${struts2_libdir}/commons-fileupload-1.3.2.jar"/>
+    <property name="commons-io-2.2.jar" value="${struts2_libdir}/commons-io-2.2.jar"/>
     <property name="commons-lang-2.4.jar" value="${struts2_libdir}/commons-lang-2.4.jar"/>
     <property name="commons-lang3-3.3.2.jar" value="${struts2_libdir}/commons-lang3-3.3.2.jar"/>
     <property name="commons-logging-1.1.3.jar" value="${struts2_libdir}/commons-logging-1.1.3.jar"/>
     <property name="ezmorph-1.0.6.jar" value="${struts2_libdir}/ezmorph-1.0.6.jar"/>
-    <property name="freemarker-2.3.19.jar" value="${struts2_libdir}/freemarker-2.3.19.jar"/>
+    <property name="freemarker-2.3.22.jar" value="${struts2_libdir}/freemarker-2.3.22.jar"/>
     <property name="json-lib-2.3-jdk15.jar" value="${struts2_libdir}/json-lib-2.3-jdk15.jar"/>
-    <property name="ognl-3.0.6.jar" value="${struts2_libdir}/ognl-3.0.6.jar"/>
-    <property name="struts2-convention-plugin-2.3.15.1.jar" value="${struts2_libdir}/struts2-convention-plugin-2.3.15.1.jar"/>
-    <property name="struts2-core-2.3.15.1.jar" value="${struts2_libdir}/struts2-core-2.3.15.1.jar"/>
-    <property name="struts2-spring-plugin-2.3.15.1.jar" value="${struts2_libdir}/struts2-spring-plugin-2.3.15.1.jar"/>
-    <property name="struts2-json-plugin-2.3.15.1.jar" value="${struts2_libdir}/struts2-json-plugin-2.3.15.1.jar"/>
-    <property name="struts2-ssl-plugin-1.2.1.jar" value="${struts2_libdir}/struts2-ssl-plugin-1.2.1.jar"/>
-    <property name="xwork-1.2.3.jar" value="${struts2_libdir}/xwork-1.2.3.jar"/>
-    <property name="xwork-core-2.3.15.1.jar" value="${struts2_libdir}/xwork-core-2.3.15.1.jar"/>
+    <property name="ognl-3.0.19.jar" value="${struts2_libdir}/ognl-3.0.19.jar"/>
+    <property name="struts2-convention-plugin-2.3.31.jar" value="${struts2_libdir}/struts2-convention-plugin-2.3.31.jar"/>
+    <property name="struts2-core-2.3.31.jar" value="${struts2_libdir}/struts2-core-2.3.31.jar"/>
+    <property name="struts2-spring-plugin-2.3.31.jar" value="${struts2_libdir}/struts2-spring-plugin-2.3.31.jar"/>
+    <property name="struts2-json-plugin-2.3.31.jar" value="${struts2_libdir}/struts2-json-plugin-2.3.31.jar"/>
+    <property name="xwork-core-2.3.31.jar" value="${struts2_libdir}/xwork-core-2.3.31.jar"/>
+    <property name="struts2-ssl-plugin-1.2.1.jar" value="${ext_libdir}/struts/struts2-ssl-plugin-1.2.1.jar"/>
+    <property name="xwork-1.2.3.jar" value="${ext_libdir}/struts/xwork-1.2.3.jar"/>
 
     <!-- Spring libs -->
     <property name="spring_libdir" value="${ext_libdir}/spring"/>
@@ -484,23 +484,23 @@
     <!-- Struts2 libraries -->
     <path id="struts.libs">
         <pathelement location="${commons-beanutils-1.8.0.jar}"/>
-        <pathelement location="${commons-collections-3.2.jar}"/>
-        <pathelement location="${commons-fileupload-1.3.jar}"/>
-        <pathelement location="${commons-io-2.0.1.jar}"/>
+        <pathelement location="${commons-collections-3.2.2.jar}"/>
+        <pathelement location="${commons-fileupload-1.3.2.jar}"/>
+        <pathelement location="${commons-io-2.2.jar}"/>
         <pathelement location="${commons-lang-2.4.jar}"/>
         <pathelement location="${commons-lang3-3.3.2.jar}"/>
         <pathelement location="${commons-logging-1.1.3.jar}"/>
         <pathelement location="${ezmorph-1.0.6.jar}"/>
-        <pathelement location="${freemarker-2.3.19.jar}"/>
+        <pathelement location="${freemarker-2.3.22.jar}"/>
         <pathelement location="${json-lib-2.3-jdk15.jar}"/>
-        <pathelement location="${ognl-3.0.6.jar}"/>
-        <pathelement location="${struts2-convention-plugin-2.3.15.1.jar}"/>
-        <pathelement location="${struts2-core-2.3.15.1.jar}"/>
-        <pathelement location="${struts2-spring-plugin-2.3.15.1.jar}"/>
-        <pathelement location="${struts2-json-plugin-2.3.15.1.jar}"/>
+        <pathelement location="${ognl-3.0.19.jar}"/>
+        <pathelement location="${struts2-convention-plugin-2.3.31.jar}"/>
+        <pathelement location="${struts2-core-2.3.31.jar}"/>
+        <pathelement location="${struts2-spring-plugin-2.3.31.jar}"/>
+        <pathelement location="${struts2-json-plugin-2.3.31.jar}"/>
         <pathelement location="${struts2-ssl-plugin-1.2.1.jar}"/>
         <pathelement location="${xwork-1.2.3.jar}"/>
-        <pathelement location="${xwork-core-2.3.15.1.jar}"/>
+        <pathelement location="${xwork-core-2.3.31.jar}"/>
     </path>
 
     <!-- Spring libraries -->

diff --git a/build.xml b/build.xml
@@ -254,23 +254,23 @@
         <copy file="${spring-tx.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${common-annotations.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${commons-beanutils-1.8.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${commons-collections-3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${commons-fileupload-1.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${commons-io-2.0.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${commons-collections-3.2.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${commons-fileupload-1.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${commons-io-2.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${commons-lang-2.4.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${commons-lang3-3.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${commons-logging-1.1.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${ezmorph-1.0.6.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${freemarker-2.3.19.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${freemarker-2.3.22.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${json-lib-2.3-jdk15.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${ognl-3.0.6.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${struts2-convention-plugin-2.3.15.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${struts2-core-2.3.15.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${struts2-spring-plugin-2.3.15.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${struts2-json-plugin-2.3.15.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${ognl-3.0.19.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${struts2-convention-plugin-2.3.31.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${struts2-core-2.3.31.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${struts2-spring-plugin-2.3.31.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${struts2-json-plugin-2.3.31.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
 		<copy file="${struts2-ssl-plugin-1.2.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${xwork-1.2.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
-        <copy file="${xwork-core-2.3.15.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
+        <copy file="${xwork-core-2.3.31.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${jboss-cache-jdk50.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${jgroups.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
         <copy file="${ehcache.jar}" todir="${ear_shared_libdir}" overwrite="true"/>

diff --git a/..._party/struts/commons-beanutils-1.8.0.jar → ...struts/2.3.31/commons-beanutils-1.8.0.jar b/..._party/struts/commons-beanutils-1.8.0.jar → ...struts/2.3.31/commons-beanutils-1.8.0.jar
diff --git a/lib/third_party/struts/2.3.31/commons-collections-3.2.2.jar b/lib/third_party/struts/2.3.31/commons-collections-3.2.2.jar
diff --git a/lib/third_party/struts/2.3.31/commons-fileupload-1.3.2.jar b/lib/third_party/struts/2.3.31/commons-fileupload-1.3.2.jar
diff --git a/lib/third_party/struts/2.3.31/commons-io-2.2.jar b/lib/third_party/struts/2.3.31/commons-io-2.2.jar
diff --git a/lib/third_party/struts/commons-lang-2.4.jar → ..._party/struts/2.3.31/commons-lang-2.4.jar b/lib/third_party/struts/commons-lang-2.4.jar → ..._party/struts/2.3.31/commons-lang-2.4.jar
diff --git a/...hird_party/struts/commons-lang3-3.3.2.jar → ...rty/struts/2.3.31/commons-lang3-3.3.2.jar b/...hird_party/struts/commons-lang3-3.3.2.jar → ...rty/struts/2.3.31/commons-lang3-3.3.2.jar
diff --git a/...rd_party/struts/commons-logging-1.1.3.jar → ...y/struts/2.3.31/commons-logging-1.1.3.jar b/...rd_party/struts/commons-logging-1.1.3.jar → ...y/struts/2.3.31/commons-logging-1.1.3.jar
diff --git a/lib/third_party/struts/ezmorph-1.0.6.jar → ...ird_party/struts/2.3.31/ezmorph-1.0.6.jar b/lib/third_party/struts/ezmorph-1.0.6.jar → ...ird_party/struts/2.3.31/ezmorph-1.0.6.jar
diff --git a/lib/third_party/struts/2.3.31/freemarker-2.3.22.jar b/lib/third_party/struts/2.3.31/freemarker-2.3.22.jar
diff --git a/...third_party/struts/json-lib-2.3-jdk15.jar → ...arty/struts/2.3.31/json-lib-2.3-jdk15.jar b/...third_party/struts/json-lib-2.3-jdk15.jar → ...arty/struts/2.3.31/json-lib-2.3-jdk15.jar
diff --git a/lib/third_party/struts/ognl-3.0.6.jar → ...third_party/struts/2.3.31/ognl-3.0.19.jar b/lib/third_party/struts/ognl-3.0.6.jar → ...third_party/struts/2.3.31/ognl-3.0.19.jar
diff --git a/lib/third_party/struts/2.3.31/struts2-convention-plugin-2.3.31.jar b/lib/third_party/struts/2.3.31/struts2-convention-plugin-2.3.31.jar
diff --git a/lib/third_party/struts/2.3.31/struts2-core-2.3.31.jar b/lib/third_party/struts/2.3.31/struts2-core-2.3.31.jar
diff --git a/lib/third_party/struts/2.3.31/struts2-json-plugin-2.3.31.jar b/lib/third_party/struts/2.3.31/struts2-json-plugin-2.3.31.jar
diff --git a/...struts/struts2-spring-plugin-2.3.15.1.jar → ...s/2.3.31/struts2-spring-plugin-2.3.31.jar b/...struts/struts2-spring-plugin-2.3.15.1.jar → ...s/2.3.31/struts2-spring-plugin-2.3.31.jar
diff --git a/...hird_party/struts/xwork-core-2.3.15.1.jar → ...party/struts/2.3.31/xwork-core-2.3.31.jar b/...hird_party/struts/xwork-core-2.3.15.1.jar → ...party/struts/2.3.31/xwork-core-2.3.31.jar
diff --git a/lib/third_party/struts/commons-collections-3.2.jar b/lib/third_party/struts/commons-collections-3.2.jar
diff --git a/lib/third_party/struts/commons-fileupload-1.3.jar b/lib/third_party/struts/commons-fileupload-1.3.jar
diff --git a/lib/third_party/struts/commons-io-2.0.1.jar b/lib/third_party/struts/commons-io-2.0.1.jar
diff --git a/lib/third_party/struts/freemarker-2.3.19.jar b/lib/third_party/struts/freemarker-2.3.19.jar
diff --git a/lib/third_party/struts/struts2-convention-plugin-2.3.15.1.jar b/lib/third_party/struts/struts2-convention-plugin-2.3.15.1.jar
diff --git a/lib/third_party/struts/struts2-core-2.3.15.1.jar b/lib/third_party/struts/struts2-core-2.3.15.1.jar
diff --git a/lib/third_party/struts/struts2-json-plugin-2.3.15.1.jar b/lib/third_party/struts/struts2-json-plugin-2.3.15.1.jar
diff --git a/...opcoder/direct/services/view/action/contest/launch/XMLGregorianCalendarTypeConverter.java b/...opcoder/direct/services/view/action/contest/launch/XMLGregorianCalendarTypeConverter.java
@@ -17,7 +17,6 @@
 import com.opensymphony.xwork2.XWorkException;
 import com.opensymphony.xwork2.conversion.TypeConversionException;
 import com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter;
-import com.opensymphony.xwork2.ObjectFactory;
 import com.opensymphony.xwork2.config.Configuration;
 import com.opensymphony.xwork2.config.ContainerProvider;
 import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
@@ -141,10 +140,8 @@ private synchronized XWorkBasicConverter getXWorkBasicConverter() {
             List<ContainerProvider> providers = new ArrayList<ContainerProvider>();
             providers.add(new XWorkConfigurationProvider());
             config.reloadContainer(providers);
-            ObjectFactory objectFactory = new ObjectFactory();
-            objectFactory.setContainer(config.getContainer());
             basicConverter = new XWorkBasicConverter();
-            basicConverter.setObjectFactory(objectFactory);
+            basicConverter.setContainer(config.getContainer());
         }
         return basicConverter;
     }