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

Commit 024567a

Browse files
ajeftsajefts
authored
Merge pull request #252 from appirio-tech/dev
struts upgrade, design challenge registration end date change, f2f reg duration
2 parents e9aa142 + dea309c commit 024567a

File tree

68 files changed

+1881
-1794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1881
-1794
lines changed

‎build-dependencies.xml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -356,9 +356,9 @@
356356

357357
<property name="tccache.jar" value="${tcs_libdir}/tc_cache/1.0.0/tc_cache.jar"/>
358358
<!-- 3rd party dependencies -->
359-
<property name="asm-3.3.jar" value="${ext_libdir}/asm/asm-3.3.jar"/>
360-
<property name="asm-commons-3.3.jar" value="${ext_libdir}/asm/asm-commons-3.3.jar"/>
361-
<property name="asm-tree-3.3.jar" value="${ext_libdir}/asm/asm-tree-3.3.jar"/>
359+
<property name="asm-5.1.jar" value="${ext_libdir}/asm/asm-5.1.jar"/>
360+
<property name="asm-commons-5.1.jar" value="${ext_libdir}/asm/asm-commons-5.1.jar"/>
361+
<property name="asm-tree-5.1.jar" value="${ext_libdir}/asm/asm-tree-5.1.jar"/>
362362
<property name="aws-java-sdk.jar" value="${ext_libdir}/aws-java-sdk/aws-java-sdk-1.0.004.jar"/>
363363
<property name="jackson-core.jar" value="${ext_libdir}/jackson/1.9.7/jackson-core-asl.jar"/>
364364
<property name="jackson-mapper.jar" value="${ext_libdir}/jackson/1.9.7/jackson-mapper-asl.jar"/>
@@ -413,23 +413,23 @@
413413
-->
414414

415415
<!-- Struts 2 libs -->
416-
<property name="struts2_libdir" value="${ext_libdir}/struts/2.3.32"/>
417-
<property name="commons-beanutils-1.8.0.jar" value="${struts2_libdir}/commons-beanutils-1.8.0.jar"/>
418-
<property name="commons-collections-3.2.2.jar" value="${struts2_libdir}/commons-collections-3.2.2.jar"/>
416+
<property name="struts2_libdir" value="${ext_libdir}/struts/2.5.10.1"/>
417+
<property name="commons-beanutils-1.9.2.jar" value="${struts2_libdir}/commons-beanutils-1.9.2.jar"/>
418+
<property name="commons-collections-3.2.1.jar" value="${struts2_libdir}/commons-collections-3.2.1.jar"/>
419419
<property name="commons-fileupload-1.3.2.jar" value="${struts2_libdir}/commons-fileupload-1.3.2.jar"/>
420-
<property name="commons-io-2.2.jar" value="${struts2_libdir}/commons-io-2.2.jar"/>
420+
<property name="commons-io-2.4.jar" value="${struts2_libdir}/commons-io-2.4.jar"/>
421421
<property name="commons-lang-2.4.jar" value="${struts2_libdir}/commons-lang-2.4.jar"/>
422-
<property name="commons-lang3-3.2.jar" value="${struts2_libdir}/commons-lang3-3.2.jar"/>
422+
<property name="commons-lang3-3.4.jar" value="${struts2_libdir}/commons-lang3-3.4.jar"/>
423423
<property name="commons-logging-1.1.3.jar" value="${struts2_libdir}/commons-logging-1.1.3.jar"/>
424424
<property name="ezmorph-1.0.6.jar" value="${struts2_libdir}/ezmorph-1.0.6.jar"/>
425-
<property name="freemarker-2.3.22.jar" value="${struts2_libdir}/freemarker-2.3.22.jar"/>
425+
<property name="freemarker-2.3.23.jar" value="${struts2_libdir}/freemarker-2.3.23.jar"/>
426426
<property name="json-lib-2.3-jdk15.jar" value="${struts2_libdir}/json-lib-2.3-jdk15.jar"/>
427-
<property name="ognl-3.0.19.jar" value="${struts2_libdir}/ognl-3.0.19.jar"/>
428-
<property name="struts2-convention-plugin-2.3.32.jar" value="${struts2_libdir}/struts2-convention-plugin-2.3.32.jar"/>
429-
<property name="struts2-core-2.3.32.jar" value="${struts2_libdir}/struts2-core-2.3.32.jar"/>
430-
<property name="struts2-spring-plugin-2.3.32.jar" value="${struts2_libdir}/struts2-spring-plugin-2.3.32.jar"/>
431-
<property name="struts2-json-plugin-2.3.32.jar" value="${struts2_libdir}/struts2-json-plugin-2.3.32.jar"/>
432-
<property name="xwork-core-2.3.32.jar" value="${struts2_libdir}/xwork-core-2.3.32.jar"/>
427+
<property name="log4j-api-2.7.jar" value="${struts2_libdir}/log4j-api-2.7.jar"/>
428+
<property name="ognl-3.1.12.jar" value="${struts2_libdir}/ognl-3.1.12.jar"/>
429+
<property name="struts2-convention-plugin-2.5.10.1.jar" value="${struts2_libdir}/struts2-convention-plugin-2.5.10.1.jar"/>
430+
<property name="struts2-core-2.5.10.1.jar" value="${struts2_libdir}/struts2-core-2.5.10.1.jar"/>
431+
<property name="struts2-spring-plugin-2.5.10.1.jar" value="${struts2_libdir}/struts2-spring-plugin-2.5.10.1.jar"/>
432+
<property name="struts2-json-plugin-2.5.10.1.jar" value="${struts2_libdir}/struts2-json-plugin-2.5.10.1.jar"/>
433433
<property name="struts2-ssl-plugin-1.2.1.jar" value="${ext_libdir}/struts/struts2-ssl-plugin-1.2.1.jar"/>
434434
<property name="xwork-1.2.3.jar" value="${ext_libdir}/struts/xwork-1.2.3.jar"/>
435435

@@ -486,24 +486,24 @@
486486

487487
<!-- Struts2 libraries -->
488488
<path id="struts.libs">
489-
<pathelement location="${commons-beanutils-1.8.0.jar}"/>
490-
<pathelement location="${commons-collections-3.2.2.jar}"/>
489+
<pathelement location="${commons-beanutils-1.9.2.jar}"/>
490+
<pathelement location="${commons-collections-3.2.1.jar}"/>
491491
<pathelement location="${commons-fileupload-1.3.2.jar}"/>
492-
<pathelement location="${commons-io-2.2.jar}"/>
492+
<pathelement location="${commons-io-2.4.jar}"/>
493493
<pathelement location="${commons-lang-2.4.jar}"/>
494-
<pathelement location="${commons-lang3-3.2.jar}"/>
494+
<pathelement location="${commons-lang3-3.4.jar}"/>
495495
<pathelement location="${commons-logging-1.1.3.jar}"/>
496496
<pathelement location="${ezmorph-1.0.6.jar}"/>
497-
<pathelement location="${freemarker-2.3.22.jar}"/>
497+
<pathelement location="${freemarker-2.3.23.jar}"/>
498498
<pathelement location="${json-lib-2.3-jdk15.jar}"/>
499-
<pathelement location="${ognl-3.0.19.jar}"/>
500-
<pathelement location="${struts2-convention-plugin-2.3.32.jar}"/>
501-
<pathelement location="${struts2-core-2.3.32.jar}"/>
502-
<pathelement location="${struts2-spring-plugin-2.3.32.jar}"/>
503-
<pathelement location="${struts2-json-plugin-2.3.32.jar}"/>
499+
<pathelement location="${log4j-api-2.7.jar}"/>
500+
<pathelement location="${ognl-3.1.12.jar}"/>
501+
<pathelement location="${struts2-convention-plugin-2.5.10.1.jar}"/>
502+
<pathelement location="${struts2-core-2.5.10.1.jar}"/>
503+
<pathelement location="${struts2-spring-plugin-2.5.10.1.jar}"/>
504+
<pathelement location="${struts2-json-plugin-2.5.10.1.jar}"/>
504505
<pathelement location="${struts2-ssl-plugin-1.2.1.jar}"/>
505506
<pathelement location="${xwork-1.2.3.jar}"/>
506-
<pathelement location="${xwork-core-2.3.32.jar}"/>
507507
</path>
508508

509509
<!-- Spring libraries -->
@@ -545,9 +545,9 @@
545545

546546
<!-- Asm libraries -->
547547
<path id="asm.libs">
548-
<pathelement location="${asm-commons-3.3.jar}"/>
549-
<pathelement location="${asm-tree-3.3.jar}"/>
550-
<pathelement location="${asm-3.3.jar}"/>
548+
<pathelement location="${asm-commons-5.1.jar}"/>
549+
<pathelement location="${asm-tree-5.1.jar}"/>
550+
<pathelement location="${asm-5.1.jar}"/>
551551
</path>
552552

553553
<path id="svnant.lib">

‎build.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,9 @@
230230
<copy file="${user_project_data_store.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
231231

232232
<!-- third-party libs -->
233-
<copy file="${asm-3.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
234-
<copy file="${asm-commons-3.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
235-
<copy file="${asm-tree-3.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
233+
<copy file="${asm-5.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
234+
<copy file="${asm-commons-5.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
235+
<copy file="${asm-tree-5.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
236236
<copy file="${aws-java-sdk.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
237237
<copy file="${axis.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
238238
<copy file="${commons-dbcp.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
@@ -257,24 +257,24 @@
257257
<copy file="${spring-test.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
258258
<copy file="${spring-tx.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
259259
<copy file="${common-annotations.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
260-
<copy file="${commons-beanutils-1.8.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
261-
<copy file="${commons-collections-3.2.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
260+
<copy file="${commons-beanutils-1.9.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
261+
<copy file="${commons-collections-3.2.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
262262
<copy file="${commons-fileupload-1.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
263-
<copy file="${commons-io-2.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
263+
<copy file="${commons-io-2.4.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
264264
<copy file="${commons-lang-2.4.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
265-
<copy file="${commons-lang3-3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
265+
<copy file="${commons-lang3-3.4.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
266266
<copy file="${commons-logging-1.1.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
267267
<copy file="${ezmorph-1.0.6.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
268-
<copy file="${freemarker-2.3.22.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
268+
<copy file="${freemarker-2.3.23.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
269269
<copy file="${json-lib-2.3-jdk15.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
270-
<copy file="${ognl-3.0.19.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
271-
<copy file="${struts2-convention-plugin-2.3.32.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
272-
<copy file="${struts2-core-2.3.32.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
273-
<copy file="${struts2-spring-plugin-2.3.32.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
274-
<copy file="${struts2-json-plugin-2.3.32.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
275-
<copy file="${struts2-ssl-plugin-1.2.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
270+
<copy file="${log4j-api-2.7.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
271+
<copy file="${ognl-3.1.12.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
272+
<copy file="${struts2-convention-plugin-2.5.10.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
273+
<copy file="${struts2-core-2.5.10.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
274+
<copy file="${struts2-spring-plugin-2.5.10.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
275+
<copy file="${struts2-json-plugin-2.5.10.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
276+
<copy file="${struts2-ssl-plugin-1.2.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
276277
<copy file="${xwork-1.2.3.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
277-
<copy file="${xwork-core-2.3.32.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
278278
<copy file="${jboss-cache-jdk50.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
279279
<copy file="${jgroups.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
280280
<copy file="${ehcache.jar}" todir="${ear_shared_libdir}" overwrite="true"/>

‎components/topcoder_cockpit_project_metadata_services/build-dependencies.xml‎

Lines changed: 1 addition & 1 deletion
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/2.3.32/commons-logging-1.1.3.jar"/>
24+
<property name="commons-logging.jar" value="${ext_libdir}/struts/2.5.10.1/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‎

Lines changed: 1 addition & 1 deletion
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/2.3.32/commons-logging-1.1.3.jar"/>
30+
<property name="commons-logging.jar" value="${ext_libdir}/struts/2.5.10.1/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/phase_templates/TCSTemplate_Design_F2F.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
</PhaseTypes>
1010
<!-- A set of project phases defined in this template. -->
1111
<Phases>
12-
<Phase id="registrationPhase" length="2592000000" type="registration" phaseId="1">
12+
<Phase id="registrationPhase" length="864000000" type="registration" phaseId="1">
1313
</Phase>
1414

15-
<Phase id="submissionPhase" length="2592000000" type="submission" phaseId="2">
15+
<Phase id="submissionPhase" length="864000000" type="submission" phaseId="2">
1616
<Dependency id="registrationPhase" isDependencyStart="true" isDependentStart="true" lagTime="300000"/>
1717
</Phase>
1818

19-
<Phase id="reviewPhase" length="2592000000" type="review" phaseId="4">
19+
<Phase id="reviewPhase" length="864000000" type="review" phaseId="4">
2020
<Dependency id="submissionPhase" isDependencyStart="true" isDependentStart="true" lagTime="0"/>
2121
</Phase>
2222
</Phases>

‎conf/phase_templates/TCSTemplate_F2F.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
</PhaseTypes>
1010
<!-- A set of project phases defined in this template. -->
1111
<Phases>
12-
<Phase id="registrationPhase" length="2592000000" type="registration" phaseId="1">
12+
<Phase id="registrationPhase" length="864000000" type="registration" phaseId="1">
1313
</Phase>
1414

15-
<Phase id="submissionPhase" length="2592000000" type="submission" phaseId="2">
15+
<Phase id="submissionPhase" length="864000000" type="submission" phaseId="2">
1616
<Dependency id="registrationPhase" isDependencyStart="true" isDependentStart="true" lagTime="300000"/>
1717
</Phase>
1818

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE struts PUBLIC
3-
"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
4-
"http://struts.apache.org/dtds/struts-2.0.dtd">
3+
"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
4+
"http://struts.apache.org/dtds/struts-2.5.dtd">
55
<struts>
66
<!--
77
This is a configuration file for Struts2 context to be used by TC Direct application.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
<filter>
3636
<filter-name>direct</filter-name>
37-
<filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
37+
<filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
3838
</filter>
3939

4040
<filter-mapping>

‎lib/third_party/asm/asm-3.3.jar‎

-42.6 KB
Binary file not shown.

‎lib/third_party/asm/asm-5.1.jar‎

52.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)