Skip to content

Commit 1fd1dfe

Browse files
jpeg22jpeg22
authored
Merge pull request #135 from xxcxy/dev-maven
Dev maven
2 parents e5dbaa4 + 7de18c2 commit 1fd1dfe

File tree

3 files changed

+34
-48
lines changed

3 files changed

+34
-48
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN mkdir -p /nfs_shares/tcs-downloads
2626

2727
## tokenized
2828
Add ./jboss_files/deploy/tcs_informix-ds.xml /root/
29-
Add ./token.properties /root/
29+
Add ./token.properties.local /root/token.properties
3030
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
3131
RUN rm /root/token.properties
3232
RUN rm /root/tcs_informix-ds.xml

‎conf/OnlineReview.xml

Lines changed: 28 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
11
<?xml version="1.0" ?>
2-
<!DOCTYPE CMConfig [
3-
<!ENTITY localFileUploadDir "@localFileUploadDir@">
4-
<!ENTITY localStudioFileUploadDir "@localStudioFileUploadDir@">
5-
<!ENTITY catalogOutputDir "@catalogOutputDir@">
6-
<!ENTITY distributionToolOutputDir "@distributionToolOutputDir@">
7-
<!ENTITY distributionScriptsBase "@distributionScriptsBase@">
8-
<!ENTITY timelineTemplateDir "@exttemplatesdir@">
9-
<!ENTITY contactManagersTemplate "@exttemplatesdir@/contact_manager_template.txt">
10-
<!ENTITY notificationEmailFromAddress "@notificationEmailFromAddress@">
11-
<!ENTITY smtpServerAuthAddress "@emailengine_smtp_user@">
12-
<!ENTITY pactJNDIAddress "@pactJNDIAddress@">
13-
<!ENTITY lateDeliverableUpdatedByManagerTemplate "@exttemplatesdir@/late_deliverable_updated_by_manager_template.txt">
14-
<!ENTITY lateDeliverableUpdatedByMemberTemplate "@exttemplatesdir@/late_deliverable_updated_by_member_template.txt">
15-
<!ENTITY F2FSubmissionReuploadedTemplate "@exttemplatesdir@/f2f_submission_reuploaded_template.txt">
16-
]>
2+
173
<CMConfig>
184
<!-- [OR-584] don't need this anymore
195
<!ENTITY assignmentDocumentsFlag "false">
@@ -350,10 +336,10 @@
350336
<Value>-1</Value>
351337
</Property>
352338
<Property name="allowed_dirs">
353-
<Value>&localFileUploadDir;</Value>
339+
<Value>@localFileUploadDir@</Value>
354340
</Property>
355341
<Property name="default_dir">
356-
<Value>&localFileUploadDir;</Value>
342+
<Value>@localFileUploadDir@</Value>
357343
</Property>
358344
<Property name="overwrite">
359345
<Value>false</Value>
@@ -371,10 +357,10 @@
371357
<Value>-1</Value>
372358
</Property>
373359
<Property name="default_dir">
374-
<Value>&localStudioFileUploadDir;</Value>
360+
<Value>@localStudioFileUploadDir@</Value>
375361
</Property>
376362
<Property name="allowed_dirs">
377-
<Value>&localStudioFileUploadDir;</Value>
363+
<Value>@localStudioFileUploadDir@</Value>
378364
</Property>
379365
<Property name="overwrite">
380366
<Value>false</Value>
@@ -392,7 +378,7 @@
392378
<Value>@emailengine_smtp_port@</Value>
393379
</Property>
394380
<Property name="username">
395-
<Value>&smtpServerAuthAddress;</Value>
381+
<Value>@smtpServerAuthAddress@</Value>
396382
</Property>
397383
<Property name="password">
398384
<Value>@emailengine_smtp_password@</Value>
@@ -1025,14 +1011,14 @@
10251011
<Config name="com.topcoder.project.phases.template.persistence.XmlPhaseTemplatePersistence">
10261012
<!-- XML files from which the templates will be loaded. -->
10271013
<Property name="template_files">
1028-
<!-- <Value>&timelineTemplateDir;/ComponentTimeline.xml</Value> -->
1029-
<Value>&timelineTemplateDir;/TCSTemplate_Design.xml</Value>
1030-
<Value>&timelineTemplateDir;/TCSTemplate_Development.xml</Value>
1031-
<Value>&timelineTemplateDir;/TCSTemplate_Component_Testing.xml</Value>
1032-
<Value>&timelineTemplateDir;/TCSTemplate_Application.xml</Value>
1033-
<Value>&timelineTemplateDir;/TCSTemplate_Studio.xml</Value>
1034-
<Value>&timelineTemplateDir;/TCSTemplate_Security.xml</Value>
1035-
<Value>&timelineTemplateDir;/TCSTemplate_Studio_Checkpoint.xml</Value>
1014+
<!-- <Value>@exttemplatesdir@/ComponentTimeline.xml</Value> -->
1015+
<Value>@exttemplatesdir@/TCSTemplate_Design.xml</Value>
1016+
<Value>@exttemplatesdir@/TCSTemplate_Development.xml</Value>
1017+
<Value>@exttemplatesdir@/TCSTemplate_Component_Testing.xml</Value>
1018+
<Value>@exttemplatesdir@/TCSTemplate_Application.xml</Value>
1019+
<Value>@exttemplatesdir@/TCSTemplate_Studio.xml</Value>
1020+
<Value>@exttemplatesdir@/TCSTemplate_Security.xml</Value>
1021+
<Value>@exttemplatesdir@/TCSTemplate_Studio_Checkpoint.xml</Value>
10361022
</Property>
10371023
</Config>
10381024

@@ -3166,7 +3152,7 @@
31663152
-->
31673153
<Config name="com.cronos.onlinereview.phases.pacts.services">
31683154
<Property name="pacts_jndi_address">
3169-
<Value>&pactJNDIAddress;</Value>
3155+
<Value>@pactJNDIAddress@</Value>
31703156
</Property>
31713157
</Config>
31723158

@@ -3229,10 +3215,10 @@
32293215
<Value>48</Value>
32303216
</Property>
32313217
<Property name="distribution_tool_output_dir">
3232-
<Value>&distributionToolOutputDir;</Value>
3218+
<Value>@distributionToolOutputDir@</Value>
32333219
</Property>
32343220
<Property name="catalog_output_dir">
3235-
<Value>&catalogOutputDir;</Value>
3221+
<Value>@catalogOutputDir@</Value>
32363222
</Property>
32373223
<Property name="default_distribution_script">
32383224
<Value>other</Value>
@@ -5148,7 +5134,7 @@
51485134

51495135
<Property name="ContactManagerEmail">
51505136
<Property name="EmailTemplateName">
5151-
<Value>&contactManagersTemplate;</Value>
5137+
<Value>@exttemplatesdir@/contact_manager_template.txt</Value>
51525138
</Property>
51535139
<Property name="EmailFromAddress">
51545140
<Value>@contactPMEmailFromAddress@</Value>
@@ -5162,10 +5148,10 @@
51625148
</Property>
51635149
<Property name="ByManager">
51645150
<Property name="EmailTemplateName">
5165-
<Value>&lateDeliverableUpdatedByManagerTemplate;</Value>
5151+
<Value>@exttemplatesdir@/late_deliverable_updated_by_manager_template.txt</Value>
51665152
</Property>
51675153
<Property name="EmailFromAddress">
5168-
<Value>&notificationEmailFromAddress;</Value>
5154+
<Value>@notificationEmailFromAddress@</Value>
51695155
</Property>
51705156
<Property name="EmailSubject">
51715157
<Value>Late Deliverable Resolved: {0} {1}</Value>
@@ -5178,10 +5164,10 @@
51785164
</Property>
51795165
<Property name="ByMember">
51805166
<Property name="EmailTemplateName">
5181-
<Value>&lateDeliverableUpdatedByMemberTemplate;</Value>
5167+
<Value>@exttemplatesdir@/late_deliverable_updated_by_member_template.txt</Value>
51825168
</Property>
51835169
<Property name="EmailFromAddress">
5184-
<Value>&notificationEmailFromAddress;</Value>
5170+
<Value>@notificationEmailFromAddress@</Value>
51855171
</Property>
51865172
<Property name="EmailSubject">
51875173
<Value>Late Deliverable Explained: {0} {1}</Value>
@@ -5196,10 +5182,10 @@
51965182

51975183
<Property name="F2FSubmissionReuploadNotificationEmail">
51985184
<Property name="EmailTemplateName">
5199-
<Value>&F2FSubmissionReuploadedTemplate;</Value>
5185+
<Value>@exttemplatesdir@/f2f_submission_reuploaded_template.txt</Value>
52005186
</Property>
52015187
<Property name="EmailFromAddress">
5202-
<Value>&notificationEmailFromAddress;</Value>
5188+
<Value>@notificationEmailFromAddress@</Value>
52035189
</Property>
52045190
<Property name="EmailSubject">
52055191
<Value>F2F submission re-uploaded: {0} {1}</Value>
@@ -5343,7 +5329,7 @@
53435329
</Property>
53445330
<!-- Needs to be updated correctly -->
53455331
<Property name="fileStorageLocation">
5346-
<Value>&localFileUploadDir;</Value>
5332+
<Value>@localFileUploadDir@</Value>
53475333
</Property>
53485334
</Config>
53495335

@@ -5393,23 +5379,23 @@
53935379
<Value>java</Value>
53945380
</Property>
53955381
<Property name="script_path">
5396-
<Value>&distributionScriptsBase;/java/script.txt</Value>
5382+
<Value>@distributionScriptsBase@/java/script.txt</Value>
53975383
</Property>
53985384
</Property>
53995385
<Property name="script_dotnet">
54005386
<Property name="distribution_type">
54015387
<Value>dotnet</Value>
54025388
</Property>
54035389
<Property name="script_path">
5404-
<Value>&distributionScriptsBase;/dotnet/script.txt</Value>
5390+
<Value>@distributionScriptsBase@/dotnet/script.txt</Value>
54055391
</Property>
54065392
</Property>
54075393
<Property name="script_other">
54085394
<Property name="distribution_type">
54095395
<Value>other</Value>
54105396
</Property>
54115397
<Property name="script_path">
5412-
<Value>&distributionScriptsBase;/other/script.txt</Value>
5398+
<Value>@distributionScriptsBase@/other/script.txt</Value>
54135399
</Property>
54145400
</Property>
54155401
</Property>

‎token.properties.local

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ DOMAIN_AUTH0 = topcoder-dev.auth0.com
145145
########################################
146146
# The authenticator used in the login process - this object must be defined in the OnlineReview.xml file too
147147
# typical windows configuration
148-
login.authenticator=MockXMLAuthenticator
149-
localFileUploadDir=/root/downloads
150-
localStudioFileUploadDir=/root/downloads
151-
catalogOutputDir=/mnt/shared/temp_files
152-
distributionToolOutputDir=/mnt/shared/temp_files/tmp_dist
148+
login.authenticator=ORAuthenticator
149+
localFileUploadDir=/nfs_shares/tcssubmissions
150+
localStudioFileUploadDir=/nfs_shares/studiofiles/submissions
151+
catalogOutputDir=/nfs_shares/tcs-downloads
152+
distributionToolOutputDir=/root/temp/dist-gen
153153
#distributionScriptsBase=/root/jboss-4.0.2/server/default/deploy/review.war/WEB-INF/classes/distribution_scripts/unix
154154
distributionScriptsBase=/root/web/conf/distribution_scripts/unix
155155
exttemplatesdir=/root/jboss-4.0.2/server/default/deploy/review.war/WEB-INF/classes/templates

0 commit comments

Comments
 (0)