Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

upgrade struts2 version to 2.3.31 #188

Merged
merged 9 commits into from
Dec 25, 2016
Merged

upgrade struts2 version to 2.3.31 #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d162526
updated excludeParams for struts
ajefts Dec 23, 2016
28aad5f
Merge branch 'dev' of https://github.com/appirio-tech/direct-app into…
ajefts Dec 23, 2016
b05e713
updated excludeParams for struts
ajefts Dec 23, 2016
973c8e2
change devMode to false
sudo-tc Dec 24, 2016
39255ba
upgrade struts2 to 2.3.31
skyhit Dec 25, 2016
ed94440
Merge pull request #185 from skyhit/upgrade_struts2_version
skyhit Dec 25, 2016
0ecb1f8
fix dependencies
skyhit Dec 25, 2016
f440214
Merge pull request #186 from skyhit/upgrade_struts2_version
skyhit Dec 25, 2016
1a30d48
Merge pull request #187 from appirio-tech/dev-struts-upgrade
skyhit Dec 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
lib/
lib/tcs
build/
direct.ear
Expand Down
46 changes: 23 additions & 23 deletions build-dependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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 -->
Expand Down
20 changes: 10 additions & 10 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
4 changes: 0 additions & 4 deletions components/copilot_pool_and_profiles_services/build-dependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->


Expand Down
2 changes: 1 addition & 1 deletion components/topcoder_cockpit_project_metadata_services/build-dependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
2 changes: 1 addition & 1 deletion components/topcoder_cockpit_task_management_services/build-dependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

Expand Down
10 changes: 5 additions & 5 deletions conf/web/WEB-INF/struts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
This is a configuration file for Struts2 context to be used by TC Direct application.
-->
<constant name="struts.objectFactory" value="spring"/>
<constant name="struts.devMode" value="true"/>
<constant name="struts.devMode" value="false"/>
<constant name="struts.locale" value="en_US"/>
<constant name="struts.i18n.encoding" value="utf-8"></constant>
<constant name="struts.custom.i18n.resources" value="Messages"/>
Expand All @@ -30,7 +30,7 @@
<interceptor-ref name="i18n"/>
<interceptor-ref name="params">
<param name="acceptParamNames">\w+((\.\w+)|(\[\d+\])|(\['(\w|\s)+'\]))*</param>
<param name="excludeParams">dojo\..*,^struts\..*,directjs.*</param>
<param name="excludeParams">(.*\.|^|.*|\[('|"))(c|C)lass(\.|('|")]|\[).*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
</interceptor-ref>
<interceptor-ref name="prepare"/>
<interceptor-ref name="chain"/>
Expand All @@ -44,7 +44,7 @@
<interceptor-ref name="actionMappingParams"/>
<interceptor-ref name="params">
<param name="acceptParamNames">\w+((\.\w+)|(\[\d+\])|(\['(\w|\s)+'\]))*</param>
<param name="excludeParams">dojo\..*,^struts\..*,directjs.*</param>
<param name="excludeParams">(.*\.|^|.*|\[('|"))(c|C)lass(\.|('|")]|\[).*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
</interceptor-ref>
<interceptor-ref name="conversionError"/>
<interceptor-ref name="validation">
Expand Down Expand Up @@ -188,7 +188,7 @@
<interceptor-ref name="i18n"/>
<interceptor-ref name="params">
<param name="acceptParamNames">\w+((\.\w+)|(\[\d+\])|(\['(\w|\s)+'\]))*</param>
<param name="excludeParams">dojo\..*,^struts\..*,directjs.*</param>
<param name="excludeParams">(.*\.|^|.*|\[('|"))(c|C)lass(\.|('|")]|\[).*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
</interceptor-ref>
<interceptor-ref name="prepare"/>
<interceptor-ref name="chain"/>
Expand All @@ -202,7 +202,7 @@
<interceptor-ref name="actionMappingParams"/>
<interceptor-ref name="params">
<param name="acceptParamNames">\w+((\.\w+)|(\[\d+\])|(\['(\w|\s)+'\]))*</param>
<param name="excludeParams">dojo\..*,^struts\..*,directjs.*</param>
<param name="excludeParams">(.*\.|^|.*|\[('|"))(c|C)lass(\.|('|")]|\[).*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
</interceptor-ref>
<interceptor-ref name="conversionError"/>
<interceptor-ref name="validation">
Expand Down
0 ..._party/struts/commons-beanutils-1.8.0.jar → ...struts/2.3.31/commons-beanutils-1.8.0.jar
View file
Open in desktop
File renamed without changes.
Binary file added lib/third_party/struts/2.3.31/commons-collections-3.2.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added lib/third_party/struts/2.3.31/commons-fileupload-1.3.2.jar
View file
Open in desktop
Binary file not shown.
Binary file added lib/third_party/struts/2.3.31/commons-io-2.2.jar
View file
Open in desktop
Binary file not shown.
0 lib/third_party/struts/commons-lang-2.4.jar → ..._party/struts/2.3.31/commons-lang-2.4.jar
View file
Open in desktop
File renamed without changes.
0 ...hird_party/struts/commons-lang3-3.3.2.jar → ...rty/struts/2.3.31/commons-lang3-3.3.2.jar
View file
Open in desktop
File renamed without changes.
0 ...rd_party/struts/commons-logging-1.1.3.jar → ...y/struts/2.3.31/commons-logging-1.1.3.jar
View file
Open in desktop
File renamed without changes.
0 lib/third_party/struts/ezmorph-1.0.6.jar → ...ird_party/struts/2.3.31/ezmorph-1.0.6.jar
View file
Open in desktop
File renamed without changes.
Binary file added lib/third_party/struts/2.3.31/freemarker-2.3.22.jar
View file
Open in desktop
Binary file not shown.
0 ...third_party/struts/json-lib-2.3-jdk15.jar → ...arty/struts/2.3.31/json-lib-2.3-jdk15.jar
View file
Open in desktop
File renamed without changes.
Binary file renamed lib/third_party/struts/ognl-3.0.6.jar → ...third_party/struts/2.3.31/ognl-3.0.19.jar
View file
Open in desktop
Binary file not shown.
Binary file added lib/third_party/struts/2.3.31/struts2-convention-plugin-2.3.31.jar
View file
Open in desktop
Binary file not shown.
Binary file added lib/third_party/struts/2.3.31/struts2-core-2.3.31.jar
View file
Open in desktop
Binary file not shown.
Binary file added lib/third_party/struts/2.3.31/struts2-json-plugin-2.3.31.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed ...struts/struts2-spring-plugin-2.3.15.1.jar → ...s/2.3.31/struts2-spring-plugin-2.3.31.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed ...hird_party/struts/xwork-core-2.3.15.1.jar → ...party/struts/2.3.31/xwork-core-2.3.31.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/third_party/struts/commons-collections-3.2.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/third_party/struts/commons-fileupload-1.3.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/third_party/struts/commons-io-2.0.1.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/third_party/struts/freemarker-2.3.19.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/third_party/struts/struts2-convention-plugin-2.3.15.1.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/third_party/struts/struts2-core-2.3.15.1.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/third_party/struts/struts2-json-plugin-2.3.15.1.jar
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions services/contest_service_facade/build-dependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@
<property name="tcwebcommon.jar" value="${tcs_libdir}/${tcwebcommon.jar.name}"/>

<property name="aws-java.jar" value="${ext_libdir}/aws-java-sdk/aws-java-sdk-1.0.004.jar"/>
<property name="commons-io-2.0.1.jar" value="${ext_libdir}/struts/commons-io-2.0.1.jar"/>
<property name="commons-lang-2.4.jar" value="${ext_libdir}/struts/commons-lang-2.4.jar"/>
<property name="commons-io-2.2.jar" value="${ext_libdir}/struts/2.3.31/commons-io-2.2.jar"/>
<property name="commons-lang-2.4.jar" value="${ext_libdir}/struts/2.3.31/commons-lang-2.4.jar"/>

<path id="component.tcs-dependencies">
<pathelement location="${jboss_login_module.jar}"/>
Expand Down Expand Up @@ -319,7 +319,7 @@
<pathelement location="${jaxb-impl.jar}"/>

<pathelement location="${aws-java.jar}"/>
<pathelement location="${commons-io-2.0.1.jar}"/>
<pathelement location="${commons-io-2.2.jar}"/>
<pathelement location="${commons-lang-2.4.jar}"/>
</path>

Expand Down
5 changes: 1 addition & 4 deletions ...opcoder/direct/services/view/action/contest/launch/XMLGregorianCalendarTypeConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down