Skip to content

Commit 64f0c2e

Browse files
standlovestandlove
authored
Merge pull request #166 from topcoder-platform/dev-maven
v1.1
2 parents 0ec2a84 + 92439c3 commit 64f0c2e

File tree

61 files changed

+968
-6310
lines changed

Some content is hidden

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

61 files changed

+968
-6310
lines changed

‎.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2
22
defaults: &defaults
33
docker:
4-
- image: maven:3.6.1-jdk-7
4+
- image: maven:3.6.1-jdk-8
55

66
deploy_defaults: &deploy_defaults
77
docker:
@@ -15,7 +15,7 @@ install_deploy_dependency: &install_deploy_dependency
1515
install_dependency: &install_dependency
1616
name: Installation of build dependencies.
1717
command: |
18-
sed -i '/jessie-updates/d' /etc/apt/sources.list
18+
# sed -i '/jessie-updates/d' /etc/apt/sources.list
1919
apt update
2020
apt install -y openssl git zip jq
2121
mkdir ~/awscli

‎Dockerfile

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
FROM maven:3.6.1-jdk-7
1+
FROM maven:3.6.1-jdk-8
22

33
RUN cd /root/ \
4-
&& wget http://downloads.sourceforge.net/project/jboss/JBoss/JBoss-4.0.2/jboss-4.0.2.tar.gz \
5-
&& tar xzf jboss-4.0.2.tar.gz \
6-
&& rm -rf jboss-4.0.2.tar.gz
4+
&& wget https://github.com/wildfly/wildfly/releases/download/26.0.1.Final/wildfly-26.0.1.Final.tar.gz \
5+
&& tar xzf wildfly-26.0.1.Final.tar.gz \
6+
&& rm -rf wildfly-26.0.1.Final.tar.gz
77

88
ENV JAVA_OPTS="-Xms1G -Xmx1G -XX:MaxPermSize=256M -server"
9-
ENV JBOSS_HOME=/root/jboss-4.0.2
10-
ENV PATH=$PATH:/root/jboss-4.0.2/bin
9+
ENV JBOSS_HOME=/root/wildfly-26.0.1.Final
10+
ENV PATH=$PATH:/root/wildfly-26.0.1.Final/bin
1111
ENV TZ=America/Indiana/Indianapolis
1212

13-
Add ./local/Docker_files/ifxjdbc.jar /root/jboss-4.0.2/server/default/lib/
14-
Add ./web/i /root/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/i
15-
Add ./web/css /root/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/css
16-
Add ./web/js /root/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/js
13+
Add ./local/Docker_files/ifxjdbc.jar /root/wildfly-26.0.1.Final/standalone/deployments/
14+
Add ./web/i /root/wildfly-26.0.1.Final/welcome-content/i
15+
Add ./web/css /root/wildfly-26.0.1.Final/welcome-content/css
16+
Add ./web/js /root/wildfly-26.0.1.Final/welcome-content/js
1717

18-
Add ./target/review /root/jboss-4.0.2/server/default/deploy/review.war
18+
Add ./target/review /root/wildfly-26.0.1.Final/standalone/deployments/review.war
19+
RUN touch /root/wildfly-26.0.1.Final/standalone/deployments/review.war.dodeploy
1920

2021
RUN mkdir -p /root/web/conf
2122
Add ./conf/distribution_scripts /root/web/conf/distribution_scripts
@@ -27,8 +28,12 @@ RUN mkdir -p /nfs_shares/tcs-downloads
2728
## tokenized
2829
Add ./jboss_files/deploy/tcs_informix-ds.xml /root/
2930
Add ./token.properties.local /root/token.properties
30-
RUN cat /root/token.properties | grep -v '^#' | grep -v '^$'| sed s/\\//\\\\\\//g | awk -F '=' '{print "s/@"$1"@/"$2"/g"}' | sed -f /dev/stdin /root/tcs_informix-ds.xml >> /root/jboss-4.0.2/server/default/deploy/informix-ds.xml
31+
RUN cat /root/token.properties | grep -v '^#' | grep -v '^$'| sed s/\\//\\\\\\//g | awk -F '=' '{print "s/@"$1"@/"$2"/g"}' | sed -f /dev/stdin /root/tcs_informix-ds.xml >> /root/wildfly-26.0.1.Final/standalone/deployments/informix-ds.xml
3132
RUN rm /root/token.properties
3233
RUN rm /root/tcs_informix-ds.xml
3334

34-
CMD ["/root/jboss-4.0.2/bin/run.sh","-DFOREGROUND"]
35+
## add admin account
36+
RUN /root/wildfly-26.0.1.Final/bin/add-user.sh -u 'admin' -p 'password1!'
37+
RUN sed -i 's/<cached-connection-manager\/>/<cached-connection-manager debug="true" error="false"\/>/' /root/wildfly-26.0.1.Final/standalone/configuration/standalone.xml
38+
39+
CMD ["/root/wildfly-26.0.1.Final/bin/standalone.sh", "-b", "0.0.0.0", "-bmanagement", "0.0.0.0","-DFOREGROUND"]

‎ECSDockerfile

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
FROM maven:3.6.1-jdk-7
1+
FROM maven:3.6.1-jdk-8
22

33
RUN cd /root/ \
4-
&& wget http://downloads.sourceforge.net/project/jboss/JBoss/JBoss-4.0.2/jboss-4.0.2.tar.gz \
5-
&& tar xzf jboss-4.0.2.tar.gz \
6-
&& rm -rf jboss-4.0.2.tar.gz
4+
&& wget https://github.com/wildfly/wildfly/releases/download/26.0.1.Final/wildfly-26.0.1.Final.tar.gz \
5+
&& tar xzf wildfly-26.0.1.Final.tar.gz \
6+
&& rm -rf wildfly-26.0.1.Final.tar.gz
77

8-
ENV JAVA_OPTS="-Xms4G -Xmx4G -XX:MaxPermSize=1G -server"
9-
ENV JBOSS_HOME=/root/jboss-4.0.2
10-
ENV PATH=$PATH:/root/jboss-4.0.2/bin
8+
ENV JAVA_OPTS="-Xms1G -Xmx1G -XX:MaxPermSize=256M -server"
9+
ENV JBOSS_HOME=/root/wildfly-26.0.1.Final
10+
ENV PATH=$PATH:/root/wildfly-26.0.1.Final/bin
1111
ENV TZ=America/Indiana/Indianapolis
1212

13-
Add ./jboss_files/lib/ifxjdbc.jar /root/jboss-4.0.2/server/default/lib/
14-
Add ./web/i /root/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/i
15-
Add ./web/css /root/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/css
16-
Add ./web/js /root/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/js
13+
Add ./local/Docker_files/ifxjdbc.jar /root/wildfly-26.0.1.Final/standalone/deployments/
14+
Add ./web/i /root/wildfly-26.0.1.Final/welcome-content/i
15+
Add ./web/css /root/wildfly-26.0.1.Final/welcome-content/css
16+
Add ./web/js /root/wildfly-26.0.1.Final/welcome-content/js
1717

18-
Add ./target/review /root/jboss-4.0.2/server/default/deploy/review.war
18+
Add ./target/review /root/wildfly-26.0.1.Final/standalone/deployments/review.war
19+
RUN touch /root/wildfly-26.0.1.Final/standalone/deployments/review.war.dodeploy
1920

2021
RUN mkdir -p /root/web/conf
2122
Add ./conf/distribution_scripts /root/web/conf/distribution_scripts
@@ -26,9 +27,13 @@ RUN mkdir -p /root/temp/dist-gen
2627

2728
## tokenized
2829
Add ./jboss_files/deploy/tcs_informix-ds.xml /root/
29-
Add ./token.properties /root/
30-
RUN cat /root/token.properties | grep -v '^#' | grep -v '^$'| sed s/\\//\\\\\\//g | awk -F '=' '{print "s/@"$1"@/"$2"/g"}' | sed -f /dev/stdin /root/tcs_informix-ds.xml >> /root/jboss-4.0.2/server/default/deploy/informix-ds.xml
30+
Add ./token.properties /root/token.properties
31+
RUN cat /root/token.properties | grep -v '^#' | grep -v '^$'| sed s/\\//\\\\\\//g | awk -F '=' '{print "s/@"$1"@/"$2"/g"}' | sed -f /dev/stdin /root/tcs_informix-ds.xml >> /root/wildfly-26.0.1.Final/standalone/deployments/informix-ds.xml
3132
RUN rm /root/token.properties
3233
RUN rm /root/tcs_informix-ds.xml
3334

34-
CMD ["/root/jboss-4.0.2/bin/run.sh","-DFOREGROUND"]
35+
## add admin account
36+
RUN /root/wildfly-26.0.1.Final/bin/add-user.sh -u 'admin' -p 'password1!'
37+
RUN sed -i 's/<cached-connection-manager\/>/<cached-connection-manager debug="true" error="false"\/>/' /root/wildfly-26.0.1.Final/standalone/configuration/standalone.xml
38+
39+
CMD ["/root/wildfly-26.0.1.Final/bin/standalone.sh", "-b", "0.0.0.0", "-bmanagement", "0.0.0.0","-DFOREGROUND"]

‎conf/META-INF/ContestEligibility.hbm.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎conf/META-INF/jboss-deployment-structure.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0">
2+
<deployment>
3+
<exclusions>
4+
<module name="org.jboss.resteasy.resteasy-json-binding-provider" />
5+
</exclusions>
6+
</deployment>
7+
</jboss-deployment-structure>

‎conf/META-INF/persistence.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<persistence-unit name="ContestEligibilityPersistence"
77
transaction-type="JTA">
88
<provider>org.hibernate.ejb.HibernatePersistence</provider>
9-
<jta-data-source>java:/DS</jta-data-source>
9+
<jta-data-source>java:jboss/datasources/DS</jta-data-source>
1010
<properties>
1111
<property name="hibernate.dialect" value="org.hibernate.dialect.InformixDialect" />
1212
<property name="hibernate.transaction.factory_class"

‎conf/MessageResources.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1351,6 +1351,7 @@ error.com.cronos.onlinereview.actions.editProject.Resource.MissingGroupTerms=* R
13511351
error.com.cronos.onlinereview.actions.editProject.Resource.NotEligible=*Resource is not eligible for the project.
13521352
error.com.cronos.onlinereview.actions.editProject.Resource.NotEligibleByUser=*Resource {0} is not eligible for the project.
13531353
error.com.cronos.onlinereview.actions.editProject.Resource.DuplicateSubmitterRole=*Duplicate submitter role assigned to user
1354+
error.com.cronos.onlinereview.actions.editProject.Resource.DuplicateSubmitterReviewerRole=*The reviewer or iterative reviewer role can not be assigned,<br />because this member has already submitted a solution for the challenge.
13541355
error.com.cronos.onlinereview.actions.editProject.explanation=*Explanation is a required field
13551356
error.com.cronos.onlinereview.actions.editProject.TimelineNotification.NotFound=*There''s no Timeline Notification notification type
13561357
error.com.cronos.onlinereview.actions.editProject.PhaseStartDateNotSet=Start date is required for {0} phase

‎conf/OnlineReview.xml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</Property>
1919
<Property name="parameters">
2020
<Property name="jndi_name">
21-
<Value>java:JTS_TCS_CATALOG</Value>
21+
<Value>java:jboss/datasources/JTS_TCS_CATALOG</Value>
2222
</Property>
2323
</Property>
2424
</Property>
@@ -28,7 +28,7 @@
2828
</Property>
2929
<Property name="parameters">
3030
<Property name="jndi_name">
31-
<Value>java:TimeDS</Value>
31+
<Value>java:jboss/datasources/TimeDS</Value>
3232
</Property>
3333
</Property>
3434
</Property>
@@ -38,7 +38,7 @@
3838
</Property>
3939
<Property name="parameters">
4040
<Property name="jndi_name">
41-
<Value>java:OLTP</Value>
41+
<Value>java:jboss/datasources/OLTP</Value>
4242
</Property>
4343
</Property>
4444
</Property>
@@ -5231,12 +5231,8 @@
52315231
<Property name="topcoder_api_base_url">
52325232
<Value>@topcoder_api_base_url@</Value>
52335233
</Property>
5234-
5235-
<Property name="user_group_membership_url">
5236-
<Value>@topcoder_api_base_url_v3@/groups?memberId=%s&amp;membershipType=User</Value>
5237-
</Property>
5238-
<Property name="parent_groups_url">
5239-
<Value>@topcoder_api_base_url_v3@/groups/%s/getParentGroup?oneLevel=false</Value>
5234+
<Property name="user_group_membership_url_v5">
5235+
<Value>@topcoder_api_base_url_v5@/groups/memberGroups/%s</Value>
52405236
</Property>
52415237
<Property name="v3jwt_cookie_name">
52425238
<Value>v3jwt</Value>
@@ -5441,7 +5437,7 @@
54415437
</Property>
54425438
<Property name="parameters">
54435439
<Property name="jndi_name">
5444-
<Value>java:JTS_TCS_CATALOG</Value>
5440+
<Value>java:jboss/datasources/JTS_TCS_CATALOG</Value>
54455441
</Property>
54465442
</Property>
54475443
</Property>
@@ -5484,7 +5480,7 @@
54845480
</Property>
54855481
<Property name="parameters">
54865482
<Property name="jndi_name">
5487-
<Value>java:JTS_TCS_CATALOG</Value>
5483+
<Value>java:jboss/datasources/JTS_TCS_CATALOG</Value>
54885484
</Property>
54895485
</Property>
54905486
</Property>
@@ -5533,7 +5529,7 @@
55335529
</Property>
55345530
<Property name="parameters">
55355531
<Property name="jndi_name">
5536-
<Value>java:JTS_TCS_CATALOG</Value>
5532+
<Value>java:jboss/datasources/JTS_TCS_CATALOG</Value>
55375533
</Property>
55385534
</Property>
55395535
</Property>
@@ -5566,7 +5562,7 @@
55665562
</Property>
55675563
<Property name="parameters">
55685564
<Property name="jndi_name">
5569-
<Value>java:JTS_TCS_CATALOG</Value>
5565+
<Value>java:jboss/datasources/JTS_TCS_CATALOG</Value>
55705566
</Property>
55715567
</Property>
55725568
</Property>

‎conf/TermsOfUse.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</Property>
1313
<Property name="parameters">
1414
<Property name="jndi_name">
15-
<Value>java:DS</Value>
15+
<Value>java:jboss/datasources/DS</Value>
1616
</Property>
1717
</Property>
1818
</Property>
@@ -39,7 +39,7 @@
3939
</Property>
4040
<Property name="parameters">
4141
<Property name="jndi_name">
42-
<Value>java:DS</Value>
42+
<Value>java:jboss/datasources/DS</Value>
4343
</Property>
4444
</Property>
4545
</Property>
@@ -63,7 +63,7 @@
6363
</Property>
6464
<Property name="parameters">
6565
<Property name="jndi_name">
66-
<Value>java:DS</Value>
66+
<Value>java:jboss/datasources/DS</Value>
6767
</Property>
6868
</Property>
6969
</Property>

‎conf/WEB-INF/applicationContext.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,8 @@
2525

2626
<bean id="contestEligibilityServiceLibrary"
2727
class="com.cronos.onlinereview.ejblibrary.ContestEligibilityServiceLibrary"/>
28-
29-
<bean id="entityManagerFactory" class="javax.persistence.Persistence" factory-method="createEntityManagerFactory">
30-
<constructor-arg type="java.lang.String" value="ContestEligibilityPersistence"/>
31-
</bean>
32-
3328
<bean id="contestEligibilityManagerLibrary"
3429
class="com.cronos.onlinereview.ejblibrary.ContestEligibilityManagerLibrary"/>
35-
3630
<bean id="contestEligibilityValidationManagerLibrary"
3731
class="com.cronos.onlinereview.ejblibrary.ContestEligibilityValidationManagerLibrary"/>
3832

@@ -41,7 +35,7 @@
4135

4236
<bean id="catalogDataAccess" class="com.cronos.onlinereview.dataaccess.CatalogDataAccess">
4337
<property name="idGeneratorDB" ref="catalogIdGeneratorDB"/>
44-
<property name="idGeneratorDataSourceName" value="java:TCS_CATALOG"/>
38+
<property name="idGeneratorDataSourceName" value="java:jboss/datasources/TCS_CATALOG"/>
4539
<property name="idGeneratorTableName" value="sequence_object"/>
4640
<property name="idGeneratorUserDefColumnName" value="name"/>
4741
<property name="idGeneratorHighValueColumnName" value="current_value"/>
@@ -51,7 +45,7 @@
5145
</bean>
5246

5347
<bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
54-
<property name="jndiName" value="java:TCS_CATALOG" />
48+
<property name="jndiName" value="java:jboss/datasources/TCS_CATALOG" />
5549
</bean>
5650

5751
<bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">

‎conf/WEB-INF/classes/ContestEligibilityValidationManagerBean.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,6 @@
1414
<Property name="type">
1515
<Value>com.topcoder.service.contest.eligibilityvalidation.GroupEligibilityValidator</Value>
1616
</Property>
17-
<Property name="params">
18-
<Property name="param1">
19-
<Property name="type">
20-
<Value>java.lang.String</Value>
21-
</Property>
22-
<Property name="value">
23-
<Value>ContestEligibilityPersistence</Value>
24-
</Property>
25-
</Property>
26-
</Property>
2717
</Property>
2818
</Property>
2919
</Config>

‎conf/WEB-INF/classes/securityGroupsHibernate.cfg.xml

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

55
<hibernate-configuration>
66
<session-factory>
7-
<property name="hibernate.connection.datasource">java:TCS_CATALOG</property>
7+
<property name="hibernate.connection.datasource">java:jboss/datasources/TCS_CATALOG</property>
88
<property name="use_sql_comments">false</property>
99
<property name="show_sql">false</property>
1010
<property name="dialect">org.hibernate.dialect.InformixDialect</property>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<jboss-web>
33
<resource-ref>
44
<res-ref-name>jdbc/DefaultDS</res-ref-name>
5-
<jndi-name>java:DS</jndi-name>
5+
<jndi-name>java:jboss/datasources/DS</jndi-name>
66
</resource-ref>
77
</jboss-web>

‎conf/WEB-INF/web.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
version="2.4">
77

88
<display-name>Online Review</display-name>
9-
<init-param>
10-
<param-name>convertNull</param-name>
11-
<param-value>true</param-value>
12-
</init-param>
139
<context-param>
1410
<param-name>contextConfigLocation</param-name>
1511
<param-value>
@@ -49,7 +45,7 @@
4945
<!-- Standard Struts 2 Configuration -->
5046
<filter>
5147
<filter-name>struts2</filter-name>
52-
<filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
48+
<filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
5349
</filter>
5450

5551
<filter-mapping>

‎conf/com/topcoder/management/payment/calculator/impl/DefaultProjectPaymentCalculator.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</Property>
2222
<Property name="parameters">
2323
<Property name="jndi_name">
24-
<Value>java:TCS_CATALOG</Value>
24+
<Value>java:jboss/datasources/TCS_CATALOG</Value>
2525
</Property>
2626
</Property>
2727
</Property>

‎conf/com/topcoder/management/payment/calculator/impl/ProjectPaymentAdjustmentCalculator.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</Property>
3434
<Property name="parameters">
3535
<Property name="jndi_name">
36-
<Value>java:TCS_CATALOG</Value>
36+
<Value>java:jboss/datasources/TCS_CATALOG</Value>
3737
</Property>
3838
</Property>
3939
</Property>

‎conf/com/topcoder/naming/jndiutility/JNDIUtils.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#context.test.factory=com.sun.jndi.fscontext.RefFSContextFactory
1111
#context.test.url=file://c:\\com\\topcoder\\test
1212

13-
context.default.factory=org.jnp.interfaces.NamingContextFactory
13+
context.default.factory=
1414
context.default.url=@context.security.url@
1515

16-
context.security.factory=org.jnp.interfaces.NamingContextFactory
16+
context.security.factory=
1717
context.security.url=@context.security.url@

0 commit comments

Comments
 (0)