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

Commit 28a62b0

Browse files
ajeftsajefts
authored
Merge pull request #360 from appirio-tech/dev
Prepare For Release
2 parents 8968000 + 3d48fa3 commit 28a62b0

File tree

68 files changed

+2293
-688
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

+2293
-688
lines changed

‎build-dependencies.xml

+15-10
Original file line numberDiff line numberDiff line change
@@ -353,11 +353,11 @@
353353
<property name="asm-commons-5.2.jar" value="${ext_libdir}/asm/asm-commons-5.2.jar"/>
354354
<property name="asm-tree-5.2.jar" value="${ext_libdir}/asm/asm-tree-5.2.jar"/>
355355
<property name="aws-java-sdk.jar" value="${ext_libdir}/aws-java-sdk/aws-java-sdk-1.0.004.jar"/>
356-
<property name="jackson-core.jar" value="${ext_libdir}/jackson/1.9.7/jackson-core-asl.jar"/>
357-
<property name="jackson-mapper.jar" value="${ext_libdir}/jackson/1.9.7/jackson-mapper-asl.jar"/>
358-
<property name="jackson-annotations-2.3.0.jar" value="${ext_libdir}/jackson/1.9.7/jackson-annotations-2.3.0.jar"/>
359-
<property name="jackson-core-2.3.2.jar" value="${ext_libdir}/jackson/1.9.7/jackson-core-2.3.2.jar"/>
360-
<property name="jackson-databind-2.3.2.jar" value="${ext_libdir}/jackson/1.9.7/jackson-databind-2.3.2.jar"/>
356+
<property name="jackson-core.jar" value="${ext_libdir}/jackson/2.8.1/jackson-core-asl.jar"/>
357+
<property name="jackson-mapper.jar" value="${ext_libdir}/jackson/2.8.1/jackson-mapper-asl.jar"/>
358+
<property name="jackson-annotations-2.8.1.jar" value="${ext_libdir}/jackson/2.8.1/jackson-annotations-2.8.1.jar"/>
359+
<property name="jackson-core-2.8.1.jar" value="${ext_libdir}/jackson/2.8.1/jackson-core-2.8.1.jar"/>
360+
<property name="jackson-databind-2.8.1.jar" value="${ext_libdir}/jackson/2.8.1/jackson-databind-2.8.1.jar"/>
361361
<property name="axis.jar" value="${ext_libdir}/axis/1.3/axis.jar"/>
362362
<property name="commons-dbcp.jar" value="${ext_libdir}/commons-dbcp/commons-dbcp.jar"/>
363363
<property name="commons-discovery.jar" value="${ext_libdir}/commons-discovery/0.2/commons-discovery.jar"/>
@@ -442,7 +442,10 @@
442442
<property name="dom4j-1.6.1.jar" value="${poi_libdir}/ooxml-lib/dom4j-1.6.1.jar"/>
443443
<property name="xmlbeans-2.3.0.jar" value="${poi_libdir}/ooxml-lib/xmlbeans-2.3.0.jar"/>
444444

445-
<property name="java-jwt-1.0.0.jar" value="${ext_libdir}/jwt/java-jwt-1.0.0.jar"/>
445+
<property name="java-jwt-3.3.0.jar" value="${ext_libdir}/jwt/java-jwt-3.3.0.jar"/>
446+
<property name="jwks-rsa-0.3.0.jar" value="${ext_libdir}/jwt/jwks-rsa-0.3.0.jar"/>
447+
<property name="guava-19.0.jar" value="${ext_libdir}/jwt/guava-19.0.jar"/>
448+
<property name="commons-codec-1.9.jar" value="${ext_libdir}/jwt/commons-codec-1.9.jar"/>
446449

447450
<!-- Http Client libs -->
448451
<property name="httpclient_libdir" value="${ext_libdir}/httpclient"/>
@@ -641,16 +644,18 @@
641644
<pathelement location="${yuicompressor.jar}"/>
642645
<pathelement location="${jackson-core.jar}"/>
643646
<pathelement location="${jackson-mapper.jar}"/>
644-
<pathelement location="${jackson-annotations-2.3.0.jar}"/>
645-
<pathelement location="${jackson-core-2.3.2.jar}"/>
646-
<pathelement location="${jackson-databind-2.3.2.jar}"/>
647+
<pathelement location="${jackson-annotations-2.8.1.jar}"/>
648+
<pathelement location="${jackson-core-2.8.1.jar}"/>
649+
<pathelement location="${jackson-databind-2.8.1.jar}"/>
647650
<pathelement location="${scribe.jar}"/>
648651
<pathelement location="${jedis.jar}"/>
649652
<!--
650653
<pathelement location="${jsr311.jar}"/>
651654
<pathelement location="${cxf.jar}"/>
652655
-->
653-
<pathelement location="${java-jwt-1.0.0.jar}"/>
656+
<pathelement location="${java-jwt-3.3.0.jar}"/>
657+
<pathelement location="${jwks-rsa-0.3.0.jar}"/>
658+
<pathelement location="${guava-19.0.jar}"/>
654659
</path>
655660

656661
</project>

‎build.xml

+10-5
Original file line numberDiff line numberDiff line change
@@ -309,14 +309,17 @@
309309
</copy>
310310
<copy file="${jackson-core.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
311311
<copy file="${jackson-mapper.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
312-
<copy file="${jackson-annotations-2.3.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
313-
<copy file="${jackson-core-2.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
314-
<copy file="${jackson-databind-2.3.2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
312+
<copy file="${jackson-annotations-2.8.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
313+
<copy file="${jackson-core-2.8.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
314+
<copy file="${jackson-databind-2.8.1.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
315315
<copy file="${encoder.jar}" todir="${ear_shared_libdir}" overwrite="true" />
316316

317317
<copy file="${yuicompressor.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
318-
<copy file="${java-jwt-1.0.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
319-
318+
<copy file="${java-jwt-3.3.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
319+
<copy file="${jwks-rsa-0.3.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
320+
<copy file="${guava-19.0.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
321+
<copy file="${commons-codec-1.9.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
322+
320323
<!-- EJB components -->
321324
<copy file="${catalog_services_id_generator.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
322325
<copy file="${catalog_services.jar}" todir="${build_distdir}/ejb" overwrite="true"/>
@@ -569,6 +572,8 @@
569572
<include name="com/topcoder/management/payment/calculator/impl/ProjectPaymentAdjustmentCalculator.properties" />
570573
</fileset>
571574
</copy>
575+
576+
<copy file="${commons-codec-1.9.jar}" tofile="${jboss.home}/server/${server.name}/lib/commons-codec.jar" overwrite="true"/>
572577
<copy todir="${jboss.home}/server/${server.name}/lib" flatten="true" overwrite="true">
573578
<fileset dir="${ext_libdir}">
574579
<include name="aws-java-sdk/aws-java-sdk-1.0.004.jar" />

‎components/project_management/build.xml

+4
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@
138138
<property name="typesafe_enum.jar.name" value="typesafe_enum.jar" />
139139
<property name="typesafe_enum.path" value="typesafe_enum/${typesafe_enum.version}" />
140140
<property name="typesafe_enum.jar" value="${tcs_libdir}/${typesafe_enum.path}/${typesafe_enum.jar.name}" />
141+
<property name="shared.jar.name" value="shared.jar"/>
142+
<property name="shared.jar" value="${tcs_libdir}/${shared.jar.name}"/>
143+
141144
<!-- 3rd Party Dependencies -->
142145
<property name="jaxb-api.jar" value="${ext_libdir}/jaxb/2.1.7/jaxb-api.jar"/>
143146
<property name="junit.jar" value="${ext_libdir}/junit/3.8.2/junit.jar"/>
@@ -167,6 +170,7 @@
167170
<pathelement location="${data_validation.jar}" />
168171
<pathelement location="${configdir}" />
169172
<pathelement location="${testfiles}" />
173+
<pathelement location="${shared.jar}" />
170174
</path>
171175

172176
<path id="test.build.classpath">

‎components/project_management/src/java/main/com/topcoder/management/project/MMContest.java

+129
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
/*
2+
* Copyright (C) 2017 TopCoder Inc., All Rights Reserved.
3+
*/
4+
package com.topcoder.management.project;
5+
6+
import java.io.Serializable;
7+
import java.util.Date;
8+
9+
/**
10+
* <p>
11+
* This is a MMContest entity which represents the Marathon Match Contest entry.
12+
* </p>
13+
*
14+
* @author TCSCODER
15+
* @version 1.0
16+
*/
17+
public class MMContest implements Serializable {
18+
/**
19+
* Contest Id
20+
*/
21+
private long id = -1L;
22+
23+
/**
24+
* Contest name
25+
*/
26+
private String name;
27+
28+
/**
29+
* Contest start_date
30+
*/
31+
private Date startDate;
32+
33+
/**
34+
* Contest end_date
35+
*/
36+
private Date endDate;
37+
38+
/**
39+
* Contest registration end date
40+
*/
41+
private Date regEndDate;
42+
43+
/**
44+
* Default ctor
45+
*/
46+
public MMContest() {
47+
48+
}
49+
50+
/**
51+
* Getter contest_id
52+
* @return id
53+
*/
54+
public long getId() {
55+
return id;
56+
}
57+
58+
/**
59+
* Setter for contest id
60+
* @param id contest id
61+
*/
62+
public void setId(long id) {
63+
this.id = id;
64+
}
65+
66+
/**
67+
* Getter contest name
68+
* @return contest name
69+
*/
70+
public String getName() {
71+
return name;
72+
}
73+
74+
/**
75+
* Setter contest name
76+
* @param name contest name
77+
*/
78+
public void setName(String name) {
79+
this.name = name;
80+
}
81+
82+
/**
83+
* Getter contest start_date
84+
* @return contest start_date
85+
*/
86+
public Date getStartDate() {
87+
return startDate;
88+
}
89+
90+
/**
91+
* Setter contest start_Date
92+
* @param startDate contest start_Date
93+
*/
94+
public void setStartDate(Date startDate) {
95+
this.startDate = startDate;
96+
}
97+
98+
/**
99+
* Getter contest end_date
100+
* @return contest end_date
101+
*/
102+
public Date getEndDate() {
103+
return endDate;
104+
}
105+
106+
/**
107+
* Setter contest end date
108+
* @param endDate contest end_date
109+
*/
110+
public void setEndDate(Date endDate) {
111+
this.endDate = endDate;
112+
}
113+
114+
/**
115+
* Getter contest registration end_date
116+
* @return contest reg end_date
117+
*/
118+
public Date getRegEndDate() {
119+
return regEndDate;
120+
}
121+
122+
/**
123+
* Setter contest registration end_date
124+
* @param regEndDate contest reg end_date
125+
*/
126+
public void setRegEndDate(Date regEndDate) {
127+
this.regEndDate = regEndDate;
128+
}
129+
}

‎components/project_management/src/java/main/com/topcoder/management/project/MMProblem.java

+95
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
/*
2+
* Copyright (C) 2017 TopCoder Inc., All Rights Reserved.
3+
*/
4+
package com.topcoder.management.project;
5+
6+
import java.io.Serializable;
7+
8+
/**
9+
* <p>
10+
* This is a MMProblem entity which represents the Marathon Match Problem entry.
11+
* </p>
12+
*
13+
* @author TCSCODER
14+
* @version 1.0
15+
*/
16+
public class MMProblem implements Serializable {
17+
/**
18+
* Problem Id
19+
*/
20+
private long id = -1L;
21+
22+
/**
23+
* Problem name
24+
*/
25+
private String name;
26+
27+
/**
28+
* Problem full text
29+
*/
30+
private String problemText;
31+
32+
/**
33+
* Problem name default format
34+
*/
35+
public static final String DEFAULT_PROBLEM_NAME = "Match Problem: %s";
36+
37+
/**
38+
* Problem text default format
39+
*/
40+
public static final String DEFAULT_PROBLEM_TEXT = "Match Problem: <br/>%s <br/> Match Rule:<br/>%s";
41+
42+
/**
43+
* Getter for problem Id
44+
*
45+
* @return problem Id
46+
*/
47+
public long getId() {
48+
return id;
49+
}
50+
51+
/**
52+
* Setter for problem Id
53+
*
54+
* @param id problem Id
55+
*/
56+
public void setId(long id) {
57+
this.id = id;
58+
}
59+
60+
/**
61+
* Getter for problem name
62+
*
63+
* @return problem name
64+
*/
65+
public String getName() {
66+
return name;
67+
}
68+
69+
/**
70+
* Setter for problem name
71+
*
72+
* @param name problem name
73+
*/
74+
public void setName(String name) {
75+
this.name = name;
76+
}
77+
78+
/**
79+
* Getter for problem text
80+
*
81+
* @return problem text
82+
*/
83+
public String getProblemText() {
84+
return problemText;
85+
}
86+
87+
/**
88+
* Setter for problem text
89+
*
90+
* @param problemText problem text
91+
*/
92+
public void setProblemText(String problemText) {
93+
this.problemText = problemText;
94+
}
95+
}

0 commit comments

Comments
 (0)