Merge pull request #187 from appirio-tech/dev-struts-upgrade

Dev struts upgrade

Author: skyhit

.gitignore

@@ -1,4 +1,3 @@
-lib/
 lib/tcs
 build/
 direct.ear

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 -->

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"/>

components/copilot_pool_and_profiles_services/build-dependencies.xml

@@ -26,10 +26,6 @@
   <property name="jaxb-api.jar" value="${ext_libdir}/jaxb/2.1.7/jaxb-api.jar"/>
   <property name="javaee.jar" value="${ext_libdir}/j2ee/1.5/javaee.jar"/>
 
-   <!-- Struts jars -->
-   <property name="struts_dir" value="${ext_libdir}/struts/2.0.14/lib" />
-   <property name="commons-logging.jar" value="${struts_dir}/commons-logging-1.0.4.jar"/>
-  
   <!-- Spring jars -->
 
 

components/topcoder_cockpit_project_metadata_services/build-dependencies.xml

@@ -21,7 +21,7 @@
     <property name="ifxjdbc.jar" value="${ext_libdir}/informix/ifxjdbc.jar"/>
 
     <property name="commons-dbcp.jar" value="${ext_libdir}/commons-dbcp/commons-dbcp.jar"/>
-    <property name="commons-logging.jar" value="${ext_libdir}/struts/commons-logging-1.1.1.jar"/>
+    <property name="commons-logging.jar" value="${ext_libdir}/struts/2.3.31/commons-logging-1.1.3.jar"/>
     <property name="commons-pool.jar" value="${ext_libdir}/commons-pool/commons-pool.jar"/>
     <property name="log4j.jar" value="${ext_libdir}/jboss/log4j.jar"/>
     <property name="hibernate3.jar" value="${ext_libdir}/hibernate/hibernate3.jar"/>

components/topcoder_cockpit_task_management_services/build-dependencies.xml

@@ -27,7 +27,7 @@
     <property name="spring-framework.dir" value="${ext_libdir}/spring"/>
     <property name="mockito.jar" value="${ext_libdir}/mockito/1.9.5/mockito-all-1.9.5.jar"/>
     <property name="easymock.jar" value="${ext_libdir}/easymock/3.1/easymock-3.1.jar"/>
-    <property name="commons-logging.jar" value="${ext_libdir}/struts/commons-logging-1.1.1.jar"/>
+    <property name="commons-logging.jar" value="${ext_libdir}/struts/2.3.31/commons-logging-1.1.3.jar"/>
     <property name="commons-dbcp.jar" value="${ext_libdir}/commons-dbcp/commons-dbcp.jar"/>
     <property name="commons-pool.jar" value="${ext_libdir}/commons-pool/commons-pool.jar"/>