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

Commit adebe31

Browse files
skyhitskyhit
authored
Merge pull request #188 from appirio-tech/dev
upgrade struts2 version to 2.3.31
2 parents 9b551d3 + 1a30d48 commit adebe31

32 files changed

+44
-52
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
lib/
21
lib/tcs
32
build/
43
direct.ear

‎build-dependencies.xml

+23-23
Original file line numberDiff line numberDiff line change
@@ -410,25 +410,25 @@
410410
-->
411411

412412
<!-- Struts 2 libs -->
413-
<property name="struts2_libdir" value="${ext_libdir}/struts"/>
413+
<property name="struts2_libdir" value="${ext_libdir}/struts/2.3.31"/>
414414
<property name="commons-beanutils-1.8.0.jar" value="${struts2_libdir}/commons-beanutils-1.8.0.jar"/>
415-
<property name="commons-collections-3.2.jar" value="${struts2_libdir}/commons-collections-3.2.jar"/>
416-
<property name="commons-fileupload-1.3.jar" value="${struts2_libdir}/commons-fileupload-1.3.jar"/>
417-
<property name="commons-io-2.0.1.jar" value="${struts2_libdir}/commons-io-2.0.1.jar"/>
415+
<property name="commons-collections-3.2.2.jar" value="${struts2_libdir}/commons-collections-3.2.2.jar"/>
416+
<property name="commons-fileupload-1.3.2.jar" value="${struts2_libdir}/commons-fileupload-1.3.2.jar"/>
417+
<property name="commons-io-2.2.jar" value="${struts2_libdir}/commons-io-2.2.jar"/>
418418
<property name="commons-lang-2.4.jar" value="${struts2_libdir}/commons-lang-2.4.jar"/>
419419
<property name="commons-lang3-3.3.2.jar" value="${struts2_libdir}/commons-lang3-3.3.2.jar"/>
420420
<property name="commons-logging-1.1.3.jar" value="${struts2_libdir}/commons-logging-1.1.3.jar"/>
421421
<property name="ezmorph-1.0.6.jar" value="${struts2_libdir}/ezmorph-1.0.6.jar"/>
422-
<property name="freemarker-2.3.19.jar" value="${struts2_libdir}/freemarker-2.3.19.jar"/>
422+
<property name="freemarker-2.3.22.jar" value="${struts2_libdir}/freemarker-2.3.22.jar"/>
423423
<property name="json-lib-2.3-jdk15.jar" value="${struts2_libdir}/json-lib-2.3-jdk15.jar"/>
424-
<property name="ognl-3.0.6.jar" value="${struts2_libdir}/ognl-3.0.6.jar"/>
425-
<property name="struts2-convention-plugin-2.3.15.1.jar" value="${struts2_libdir}/struts2-convention-plugin-2.3.15.1.jar"/>
426-
<property name="struts2-core-2.3.15.1.jar" value="${struts2_libdir}/struts2-core-2.3.15.1.jar"/>
427-
<property name="struts2-spring-plugin-2.3.15.1.jar" value="${struts2_libdir}/struts2-spring-plugin-2.3.15.1.jar"/>
428-
<property name="struts2-json-plugin-2.3.15.1.jar" value="${struts2_libdir}/struts2-json-plugin-2.3.15.1.jar"/>
429-
<property name="struts2-ssl-plugin-1.2.1.jar" value="${struts2_libdir}/struts2-ssl-plugin-1.2.1.jar"/>
430-
<property name="xwork-1.2.3.jar" value="${struts2_libdir}/xwork-1.2.3.jar"/>
431-
<property name="xwork-core-2.3.15.1.jar" value="${struts2_libdir}/xwork-core-2.3.15.1.jar"/>
424+
<property name="ognl-3.0.19.jar" value="${struts2_libdir}/ognl-3.0.19.jar"/>
425+
<property name="struts2-convention-plugin-2.3.31.jar" value="${struts2_libdir}/struts2-convention-plugin-2.3.31.jar"/>
426+
<property name="struts2-core-2.3.31.jar" value="${struts2_libdir}/struts2-core-2.3.31.jar"/>
427+
<property name="struts2-spring-plugin-2.3.31.jar" value="${struts2_libdir}/struts2-spring-plugin-2.3.31.jar"/>
428+
<property name="struts2-json-plugin-2.3.31.jar" value="${struts2_libdir}/struts2-json-plugin-2.3.31.jar"/>
429+
<property name="xwork-core-2.3.31.jar" value="${struts2_libdir}/xwork-core-2.3.31.jar"/>
430+
<property name="struts2-ssl-plugin-1.2.1.jar" value="${ext_libdir}/struts/struts2-ssl-plugin-1.2.1.jar"/>
431+
<property name="xwork-1.2.3.jar" value="${ext_libdir}/struts/xwork-1.2.3.jar"/>
432432

433433
<!-- Spring libs -->
434434
<property name="spring_libdir" value="${ext_libdir}/spring"/>
@@ -484,23 +484,23 @@
484484
<!-- Struts2 libraries -->
485485
<path id="struts.libs">
486486
<pathelement location="${commons-beanutils-1.8.0.jar}"/>
487-
<pathelement location="${commons-collections-3.2.jar}"/>
488-
<pathelement location="${commons-fileupload-1.3.jar}"/>
489-
<pathelement location="${commons-io-2.0.1.jar}"/>
487+
<pathelement location="${commons-collections-3.2.2.jar}"/>
488+
<pathelement location="${commons-fileupload-1.3.2.jar}"/>
489+
<pathelement location="${commons-io-2.2.jar}"/>
490490
<pathelement location="${commons-lang-2.4.jar}"/>
491491
<pathelement location="${commons-lang3-3.3.2.jar}"/>
492492
<pathelement location="${commons-logging-1.1.3.jar}"/>
493493
<pathelement location="${ezmorph-1.0.6.jar}"/>
494-
<pathelement location="${freemarker-2.3.19.jar}"/>
494+
<pathelement location="${freemarker-2.3.22.jar}"/>
495495
<pathelement location="${json-lib-2.3-jdk15.jar}"/>
496-
<pathelement location="${ognl-3.0.6.jar}"/>
497-
<pathelement location="${struts2-convention-plugin-2.3.15.1.jar}"/>
498-
<pathelement location="${struts2-core-2.3.15.1.jar}"/>
499-
<pathelement location="${struts2-spring-plugin-2.3.15.1.jar}"/>
500-
<pathelement location="${struts2-json-plugin-2.3.15.1.jar}"/>
496+
<pathelement location="${ognl-3.0.19.jar}"/>
497+
<pathelement location="${struts2-convention-plugin-2.3.31.jar}"/>
498+
<pathelement location="${struts2-core-2.3.31.jar}"/>
499+
<pathelement location="${struts2-spring-plugin-2.3.31.jar}"/>
500+
<pathelement location="${struts2-json-plugin-2.3.31.jar}"/>
501501
<pathelement location="${struts2-ssl-plugin-1.2.1.jar}"/>
502502
<pathelement location="${xwork-1.2.3.jar}"/>
503-
<pathelement location="${xwork-core-2.3.15.1.jar}"/>
503+
<pathelement location="${xwork-core-2.3.31.jar}"/>
504504
</path>
505505

506506
<!-- Spring libraries -->

‎build.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -254,23 +254,23 @@
254254
<copy file="${spring-tx.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
255255
<copy file="${common-annotations.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
256256
<copy file="${commons-beanutils-1.8.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
257-
<copy file="${commons-collections-3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
258-
<copy file="${commons-fileupload-1.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
259-
<copy file="${commons-io-2.0.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
257+
<copy file="${commons-collections-3.2.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
258+
<copy file="${commons-fileupload-1.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
259+
<copy file="${commons-io-2.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
260260
<copy file="${commons-lang-2.4.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
261261
<copy file="${commons-lang3-3.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
262262
<copy file="${commons-logging-1.1.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
263263
<copy file="${ezmorph-1.0.6.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
264-
<copy file="${freemarker-2.3.19.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
264+
<copy file="${freemarker-2.3.22.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
265265
<copy file="${json-lib-2.3-jdk15.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
266-
<copy file="${ognl-3.0.6.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
267-
<copy file="${struts2-convention-plugin-2.3.15.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
268-
<copy file="${struts2-core-2.3.15.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
269-
<copy file="${struts2-spring-plugin-2.3.15.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
270-
<copy file="${struts2-json-plugin-2.3.15.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
266+
<copy file="${ognl-3.0.19.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
267+
<copy file="${struts2-convention-plugin-2.3.31.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
268+
<copy file="${struts2-core-2.3.31.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
269+
<copy file="${struts2-spring-plugin-2.3.31.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
270+
<copy file="${struts2-json-plugin-2.3.31.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
271271
<copy file="${struts2-ssl-plugin-1.2.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
272272
<copy file="${xwork-1.2.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
273-
<copy file="${xwork-core-2.3.15.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
273+
<copy file="${xwork-core-2.3.31.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
274274
<copy file="${jboss-cache-jdk50.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
275275
<copy file="${jgroups.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
276276
<copy file="${ehcache.jar}" todir="${ear_shared_libdir}" overwrite="true"/>

‎components/copilot_pool_and_profiles_services/build-dependencies.xml

-4
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
<property name="jaxb-api.jar" value="${ext_libdir}/jaxb/2.1.7/jaxb-api.jar"/>
2727
<property name="javaee.jar" value="${ext_libdir}/j2ee/1.5/javaee.jar"/>
2828

29-
<!-- Struts jars -->
30-
<property name="struts_dir" value="${ext_libdir}/struts/2.0.14/lib" />
31-
<property name="commons-logging.jar" value="${struts_dir}/commons-logging-1.0.4.jar"/>
32-
3329
<!-- Spring jars -->
3430

3531

‎components/topcoder_cockpit_project_metadata_services/build-dependencies.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<property name="ifxjdbc.jar" value="${ext_libdir}/informix/ifxjdbc.jar"/>
2222

2323
<property name="commons-dbcp.jar" value="${ext_libdir}/commons-dbcp/commons-dbcp.jar"/>
24-
<property name="commons-logging.jar" value="${ext_libdir}/struts/commons-logging-1.1.1.jar"/>
24+
<property name="commons-logging.jar" value="${ext_libdir}/struts/2.3.31/commons-logging-1.1.3.jar"/>
2525
<property name="commons-pool.jar" value="${ext_libdir}/commons-pool/commons-pool.jar"/>
2626
<property name="log4j.jar" value="${ext_libdir}/jboss/log4j.jar"/>
2727
<property name="hibernate3.jar" value="${ext_libdir}/hibernate/hibernate3.jar"/>

‎components/topcoder_cockpit_task_management_services/build-dependencies.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<property name="spring-framework.dir" value="${ext_libdir}/spring"/>
2828
<property name="mockito.jar" value="${ext_libdir}/mockito/1.9.5/mockito-all-1.9.5.jar"/>
2929
<property name="easymock.jar" value="${ext_libdir}/easymock/3.1/easymock-3.1.jar"/>
30-
<property name="commons-logging.jar" value="${ext_libdir}/struts/commons-logging-1.1.1.jar"/>
30+
<property name="commons-logging.jar" value="${ext_libdir}/struts/2.3.31/commons-logging-1.1.3.jar"/>
3131
<property name="commons-dbcp.jar" value="${ext_libdir}/commons-dbcp/commons-dbcp.jar"/>
3232
<property name="commons-pool.jar" value="${ext_libdir}/commons-pool/commons-pool.jar"/>
3333

‎conf/web/WEB-INF/struts.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
This is a configuration file for Struts2 context to be used by TC Direct application.
88
-->
99
<constant name="struts.objectFactory" value="spring"/>
10-
<constant name="struts.devMode" value="true"/>
10+
<constant name="struts.devMode" value="false"/>
1111
<constant name="struts.locale" value="en_US"/>
1212
<constant name="struts.i18n.encoding" value="utf-8"></constant>
1313
<constant name="struts.custom.i18n.resources" value="Messages"/>
@@ -30,7 +30,7 @@
3030
<interceptor-ref name="i18n"/>
3131
<interceptor-ref name="params">
3232
<param name="acceptParamNames">\w+((\.\w+)|(\[\d+\])|(\['(\w|\s)+'\]))*</param>
33-
<param name="excludeParams">dojo\..*,^struts\..*,directjs.*</param>
33+
<param name="excludeParams">(.*\.|^|.*|\[('|"))(c|C)lass(\.|('|")]|\[).*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
3434
</interceptor-ref>
3535
<interceptor-ref name="prepare"/>
3636
<interceptor-ref name="chain"/>
@@ -44,7 +44,7 @@
4444
<interceptor-ref name="actionMappingParams"/>
4545
<interceptor-ref name="params">
4646
<param name="acceptParamNames">\w+((\.\w+)|(\[\d+\])|(\['(\w|\s)+'\]))*</param>
47-
<param name="excludeParams">dojo\..*,^struts\..*,directjs.*</param>
47+
<param name="excludeParams">(.*\.|^|.*|\[('|"))(c|C)lass(\.|('|")]|\[).*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
4848
</interceptor-ref>
4949
<interceptor-ref name="conversionError"/>
5050
<interceptor-ref name="validation">
@@ -188,7 +188,7 @@
188188
<interceptor-ref name="i18n"/>
189189
<interceptor-ref name="params">
190190
<param name="acceptParamNames">\w+((\.\w+)|(\[\d+\])|(\['(\w|\s)+'\]))*</param>
191-
<param name="excludeParams">dojo\..*,^struts\..*,directjs.*</param>
191+
<param name="excludeParams">(.*\.|^|.*|\[('|"))(c|C)lass(\.|('|")]|\[).*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
192192
</interceptor-ref>
193193
<interceptor-ref name="prepare"/>
194194
<interceptor-ref name="chain"/>
@@ -202,7 +202,7 @@
202202
<interceptor-ref name="actionMappingParams"/>
203203
<interceptor-ref name="params">
204204
<param name="acceptParamNames">\w+((\.\w+)|(\[\d+\])|(\['(\w|\s)+'\]))*</param>
205-
<param name="excludeParams">dojo\..*,^struts\..*,directjs.*</param>
205+
<param name="excludeParams">(.*\.|^|.*|\[('|"))(c|C)lass(\.|('|")]|\[).*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^action:.*,^method:.*</param>
206206
</interceptor-ref>
207207
<interceptor-ref name="conversionError"/>
208208
<interceptor-ref name="validation">

‎lib/third_party/struts/commons-beanutils-1.8.0.jar renamed to ‎lib/third_party/struts/2.3.31/commons-beanutils-1.8.0.jar

File renamed without changes.

‎lib/third_party/struts/2.3.31/commons-collections-3.2.2.jar

575 KB
Binary file not shown.

‎lib/third_party/struts/2.3.31/commons-fileupload-1.3.2.jar

68.6 KB
Binary file not shown.

‎lib/third_party/struts/2.3.31/commons-io-2.2.jar

170 KB
Binary file not shown.

‎lib/third_party/struts/commons-lang-2.4.jar renamed to ‎lib/third_party/struts/2.3.31/commons-lang-2.4.jar

File renamed without changes.

‎lib/third_party/struts/commons-lang3-3.3.2.jar renamed to ‎lib/third_party/struts/2.3.31/commons-lang3-3.3.2.jar

File renamed without changes.

‎lib/third_party/struts/commons-logging-1.1.3.jar renamed to ‎lib/third_party/struts/2.3.31/commons-logging-1.1.3.jar

File renamed without changes.

‎lib/third_party/struts/ezmorph-1.0.6.jar renamed to ‎lib/third_party/struts/2.3.31/ezmorph-1.0.6.jar

File renamed without changes.

‎lib/third_party/struts/2.3.31/freemarker-2.3.22.jar

1.24 MB
Binary file not shown.

‎lib/third_party/struts/json-lib-2.3-jdk15.jar renamed to ‎lib/third_party/struts/2.3.31/json-lib-2.3-jdk15.jar

File renamed without changes.

‎lib/third_party/struts/ognl-3.0.6.jar renamed to ‎lib/third_party/struts/2.3.31/ognl-3.0.19.jar

223 KB
Binary file not shown.

‎lib/third_party/struts/2.3.31/struts2-convention-plugin-2.3.31.jar

66.3 KB
Binary file not shown.

‎lib/third_party/struts/2.3.31/struts2-core-2.3.31.jar

854 KB
Binary file not shown.

‎lib/third_party/struts/2.3.31/struts2-json-plugin-2.3.31.jar

71 KB
Binary file not shown.

‎lib/third_party/struts/struts2-spring-plugin-2.3.15.1.jar renamed to ‎lib/third_party/struts/2.3.31/struts2-spring-plugin-2.3.31.jar

21.3 KB
Binary file not shown.

‎lib/third_party/struts/xwork-core-2.3.15.1.jar renamed to ‎lib/third_party/struts/2.3.31/xwork-core-2.3.31.jar

625 KB
Binary file not shown.

‎lib/third_party/struts/commons-collections-3.2.jar

-558 KB
Binary file not shown.

‎lib/third_party/struts/commons-fileupload-1.3.jar

-67 KB
Binary file not shown.

‎lib/third_party/struts/commons-io-2.0.1.jar

-156 KB
Binary file not shown.

‎lib/third_party/struts/freemarker-2.3.19.jar

-909 KB
Binary file not shown.

‎lib/third_party/struts/struts2-convention-plugin-2.3.15.1.jar

-65.5 KB
Binary file not shown.

‎lib/third_party/struts/struts2-core-2.3.15.1.jar

-783 KB
Binary file not shown.

‎lib/third_party/struts/struts2-json-plugin-2.3.15.1.jar

-69.4 KB
Binary file not shown.

‎services/contest_service_facade/build-dependencies.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@
230230
<property name="tcwebcommon.jar" value="${tcs_libdir}/${tcwebcommon.jar.name}"/>
231231

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

236236
<path id="component.tcs-dependencies">
237237
<pathelement location="${jboss_login_module.jar}"/>
@@ -319,7 +319,7 @@
319319
<pathelement location="${jaxb-impl.jar}"/>
320320

321321
<pathelement location="${aws-java.jar}"/>
322-
<pathelement location="${commons-io-2.0.1.jar}"/>
322+
<pathelement location="${commons-io-2.2.jar}"/>
323323
<pathelement location="${commons-lang-2.4.jar}"/>
324324
</path>
325325

‎src/java/main/com/topcoder/direct/services/view/action/contest/launch/XMLGregorianCalendarTypeConverter.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.opensymphony.xwork2.XWorkException;
1818
import com.opensymphony.xwork2.conversion.TypeConversionException;
1919
import com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter;
20-
import com.opensymphony.xwork2.ObjectFactory;
2120
import com.opensymphony.xwork2.config.Configuration;
2221
import com.opensymphony.xwork2.config.ContainerProvider;
2322
import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
@@ -141,10 +140,8 @@ private synchronized XWorkBasicConverter getXWorkBasicConverter() {
141140
List<ContainerProvider> providers = new ArrayList<ContainerProvider>();
142141
providers.add(new XWorkConfigurationProvider());
143142
config.reloadContainer(providers);
144-
ObjectFactory objectFactory = new ObjectFactory();
145-
objectFactory.setContainer(config.getContainer());
146143
basicConverter = new XWorkBasicConverter();
147-
basicConverter.setObjectFactory(objectFactory);
144+
basicConverter.setContainer(config.getContainer());
148145
}
149146
return basicConverter;
150147
}

0 commit comments

Comments
 (0)