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

Commit f137e98

Browse files
authored
Merge pull request #222 from appirio-tech/dev
Promote to prod - task fixes
2 parents 25d9446 + 924d8bd commit f137e98

File tree

27 files changed

+814
-2257
lines changed

27 files changed

+814
-2257
lines changed

.gitignore

+38-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,41 @@
1-
lib/tcs
1+
lib/tcs/auto_screening_management.jar
2+
lib/tcs/client_invoice_entities_dao.jar
3+
lib/tcs/cockpit_facade_util.jar
4+
lib/tcs/configuration_manager.jar
5+
lib/tcs/copilot_pool_and_profiles_services.jar
6+
lib/tcs/deliverable_management.jar
7+
lib/tcs/ejb/admin_service_facade.jar
8+
lib/tcs/ejb/catalog_services.jar
9+
lib/tcs/ejb/client_project_entities_dao.jar
10+
lib/tcs/ejb/cloud_vm_service.jar
11+
lib/tcs/ejb/contest_eligibility_persistence.jar
12+
lib/tcs/ejb/contest_eligibility_validation.jar
13+
lib/tcs/ejb/contest_service_facade.jar
14+
lib/tcs/ejb/game_plan_service.jar
15+
lib/tcs/ejb/permission_service_facade.jar
16+
lib/tcs/ejb/pipeline_service.jar
17+
lib/tcs/ejb/pipeline_service_facade.jar
18+
lib/tcs/ejb/project_service.jar
19+
lib/tcs/ejb/project_service_facade.jar
20+
lib/tcs/ejb/project_services.jar
21+
lib/tcs/ejb/specification_review_comment_service.jar
22+
lib/tcs/ejb/specification_review_service.jar
23+
lib/tcs/ejb/user_service.jar
24+
lib/tcs/ejb/user_service_facade.jar
25+
lib/tcs/online_review_upload_services.jar
26+
lib/tcs/phase_management.jar
27+
lib/tcs/project_management.jar
28+
lib/tcs/project_phases.jar
29+
lib/tcs/resource_management.jar
30+
lib/tcs/review_application_management.jar
31+
lib/tcs/review_management.jar
32+
lib/tcs/scorecard_management.jar
33+
lib/tcs/team_management.jar
34+
lib/tcs/topcoder_cockpit_asset_services.jar
35+
lib/tcs/topcoder_cockpit_project_metadata_services.jar
36+
lib/tcs/topcoder_cockpit_project_milestone_services.jar
37+
lib/tcs/topcoder_cockpit_task_management_services.jar
38+
lib/tcs/workdays.jar
239
build/
340
direct.ear
441
direct.jar

LOCAL_SETUP.md

-19
This file was deleted.

build-dependencies.xml

+666-660
Large diffs are not rendered by default.

build.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@
209209
<copy file="${spell_check.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
210210
<copy file="${shared.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
211211
<copy file="${tcwebcommon.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
212+
<copy file="${tccache.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
213+
212214
<copy file="${topcoder_security_groups.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
213215
<copy file="${review_application_management.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
214216
<copy file="${project_payment_calculator.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
@@ -236,6 +238,8 @@
236238
<copy file="${commons-dbcp.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
237239
<copy file="${commons-discovery.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
238240
<copy file="${commons-pool.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
241+
<copy file="${commons-pool2.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
242+
<copy file="${jedis.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
239243
<copy file="${confluence-service-axis-client.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
240244
<copy file="${httpProxyPackage.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
241245
<copy file="${ifxjdbcx.jar}" todir="${ear_shared_libdir}" overwrite="true"/>
@@ -712,4 +716,4 @@
712716
some of the targets of this build file. -->
713717
<import file="${basedir}/build-override.xml" optional="true"/>
714718

715-
</project>
719+
</project>

conf/cache.properties

+22-19
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
1-
cache.primary = @cache.primary@
2-
#cache.secondary = 63.118.154.182:8502
3-
4-
# allow at most 25000 items in the cache
5-
cache.size = 25000
6-
# sync every 10 seconds
7-
cache.synctime = 10000
8-
9-
# check every minute
10-
cache.expirecheck = 60000
11-
# expire after 10 hours
12-
cache.expiretime = 3600000
13-
14-
15-
host_url = @host_url@
16-
jndi_name = TCCache
17-
cache_admin_jndi_name = TCCacheAdmin
18-
cache_client_class=com.topcoder.web.common.cache.JbossCacheClient
19-
1+
cache.primary = @cache.primary@
2+
#cache.secondary = 63.118.154.182:8502
3+
4+
# allow at most 25000 items in the cache
5+
cache.size = 25000
6+
# sync every 10 seconds
7+
cache.synctime = 10000
8+
9+
# check every minute
10+
cache.expirecheck = 60000
11+
# expire after 10 hours
12+
cache.expiretime = 3600000
13+
14+
15+
host_url = @host_url@
16+
jndi_name = TCCache
17+
cache_admin_jndi_name = TCCacheAdmin
18+
19+
cache_client_class=@cache_client_class@
20+
21+
redis.uri=@redis_uri@
22+
redis.timeout=2000

conf/direct-ds.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<xa-datasource-property name="IfxIFXHOST">@database.server@</xa-datasource-property>
2222
<xa-datasource-property name="PortNumber">@database.port@</xa-datasource-property>
2323
<xa-datasource-property name="DatabaseName">tcs_catalog</xa-datasource-property>
24-
<xa-datasource-property name="ServerName">informixoltp_tcp</xa-datasource-property>
24+
<xa-datasource-property name="ServerName">@database.INFORMIXSERVER@</xa-datasource-property>
2525

2626
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.InformixExceptionSorter</exception-sorter-class-name>
2727
<!-- sql to call when connection is created -->
@@ -45,7 +45,7 @@
4545

4646
<no-tx-datasource>
4747
<jndi-name>OLTP</jndi-name>
48-
<connection-url>jdbc:informix-sqli://@database.server@:@database.port@/informixoltp:INFORMIXSERVER=informixoltp_tcp</connection-url>
48+
<connection-url>jdbc:informix-sqli://@database.server@:@database.port@/informixoltp:INFORMIXSERVER=@database.INFORMIXSERVER@</connection-url>
4949
<driver-class>com.informix.jdbc.IfxDriver</driver-class>
5050
<!-- sql to call when connection is created -->
5151
<new-connection-sql>set lock mode to wait 5</new-connection-sql>
@@ -79,7 +79,7 @@
7979

8080
<no-tx-datasource>
8181
<jndi-name>TCS_CATALOG</jndi-name>
82-
<connection-url>jdbc:informix-sqli://@database.server@:@database.port@/tcs_catalog:INFORMIXSERVER=informixoltp_tcp
82+
<connection-url>jdbc:informix-sqli://@database.server@:@database.port@/tcs_catalog:INFORMIXSERVER=@database.INFORMIXSERVER@
8383
</connection-url>
8484
<driver-class>com.informix.jdbc.IfxDriver</driver-class>
8585
<driver-class>com.informix.jdbc.IfxDriver</driver-class>
@@ -107,7 +107,7 @@
107107
<xa-datasource-property name="IfxIFXHOST">@database.server@</xa-datasource-property>
108108
<xa-datasource-property name="PortNumber">@database.port@</xa-datasource-property>
109109
<xa-datasource-property name="DatabaseName">informixoltp</xa-datasource-property>
110-
<xa-datasource-property name="ServerName">informixoltp_tcp</xa-datasource-property>
110+
<xa-datasource-property name="ServerName">@database.INFORMIXSERVER@</xa-datasource-property>
111111

112112
<new-connection-sql>set lock mode to wait 5</new-connection-sql>
113113
<check-valid-connection-sql>select '1' from dual</check-valid-connection-sql>
@@ -167,7 +167,7 @@
167167
<xa-datasource-property name="IfxIFXHOST">@database.server@</xa-datasource-property>
168168
<xa-datasource-property name="PortNumber">@database.port@</xa-datasource-property>
169169
<xa-datasource-property name="DatabaseName">corporate_oltp</xa-datasource-property>
170-
<xa-datasource-property name="ServerName">informixoltp_tcp</xa-datasource-property>
170+
<xa-datasource-property name="ServerName">@database.INFORMIXSERVER@</xa-datasource-property>
171171

172172
<!-- sql to call when connection is created -->
173173
<new-connection-sql>set lock mode to wait 5</new-connection-sql>
@@ -196,7 +196,7 @@
196196
<xa-datasource-property name="IfxIFXHOST">@database.server@</xa-datasource-property>
197197
<xa-datasource-property name="PortNumber">@database.port@</xa-datasource-property>
198198
<xa-datasource-property name="DatabaseName">corporate_oltp</xa-datasource-property>
199-
<xa-datasource-property name="ServerName">informixoltp_tcp</xa-datasource-property>
199+
<xa-datasource-property name="ServerName">@database.INFORMIXSERVER@</xa-datasource-property>
200200

201201
<!-- sql to call when connection is created -->
202202
<new-connection-sql>set lock mode to wait 5</new-connection-sql>
@@ -226,7 +226,7 @@
226226
<xa-datasource-property name="IfxIFXHOST">@database.server@</xa-datasource-property>
227227
<xa-datasource-property name="PortNumber">@database.port@</xa-datasource-property>
228228
<xa-datasource-property name="DatabaseName">common_oltp</xa-datasource-property>
229-
<xa-datasource-property name="ServerName">informixoltp_tcp</xa-datasource-property>
229+
<xa-datasource-property name="ServerName">@database.INFORMIXSERVER@</xa-datasource-property>
230230

231231
<!-- sql to call when connection is created -->
232232
<new-connection-sql>set lock mode to wait 5</new-connection-sql>
@@ -258,7 +258,7 @@
258258
<xa-datasource-property name="IfxIFXHOST">@database.server@</xa-datasource-property>
259259
<xa-datasource-property name="PortNumber">@database.port@</xa-datasource-property>
260260
<xa-datasource-property name="DatabaseName">time_oltp</xa-datasource-property>
261-
<xa-datasource-property name="ServerName">informixoltp_tcp</xa-datasource-property>
261+
<xa-datasource-property name="ServerName">@database.INFORMIXSERVER@</xa-datasource-property>
262262

263263
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.InformixExceptionSorter</exception-sorter-class-name>
264264
<!-- sql to call when connection is created -->

conf/token.properties

+1-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ j#######################################################
1414
@database.port@=2021
1515
@database.username@=coder
1616
@database.password@=c0d3r4T
17-
@database.INFORMIXSERVER@=informixoltp_tcp
17+
@database.INFORMIXSERVER@=informixoltp_tcp
1818

1919
###############################
2020
# bugs database configuration #
@@ -208,11 +208,6 @@ j#######################################################
208208

209209
@ApplicationServer.DIRECT_API_SERVICE_ENDPOINT@= direct.dev.topcoder.com/direct/api/v2/
210210

211-
###########################
212-
# Scorecard Configuration #
213-
###########################
214-
@scorecardUrl@=jdbc:informix-sqli://env.topcoder.com:2021/tcs_catalog:INFORMIXSERVER=informixoltp_tcp;DB_LOCALE=en_us.utf8
215-
216211
##############################
217212
# CockpitUserPersistence.xml #
218213
##############################

docker/local-setup/direct-app-base/Dockerfile

-61
This file was deleted.
-1.61 MB
Binary file not shown.

0 commit comments

Comments
 (0)