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

Commit f816621

Browse files
ajeftsajefts
authored
Merge pull request #423 from appirio-tech/dev
Promote to prod
2 parents 02385cf + fe5f613 commit f816621

File tree

86 files changed

+753
-634
lines changed

Some content is hidden

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

86 files changed

+753
-634
lines changed

‎build-master-targets.xml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,5 +580,14 @@
580580
</path>
581581
</foreach>
582582
</target>
583-
583+
584+
<target name="update-timestamp-version-numbers-for-jsp" description="update timestamp bersion number for javascript and css file">
585+
<replaceregexp byline="true">
586+
<regexp pattern='(href|src|default)="([^"]+)(\.js|\.css)'/>
587+
<substitution expression='\1="\2\3?v=${timestamp}'/>
588+
<fileset dir="${build_distdir}/direct.war">
589+
<include name="**/*.jsp"/>
590+
</fileset>
591+
</replaceregexp>
592+
</target>
584593
</project>

‎build.xml‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
<project name="TC Direct System Build" default="dist" basedir=".">
33
<property file="${basedir}/build.version"/>
44
<property file="topcoder_global.properties"/>
5+
<!-- timestamp versioning, get flag from env var ADD_TIMESTAMP_VERSION
6+
if ADD_TIMESTAMP_VERSION != true will disable it
7+
-->
8+
<property environment="env"/>
9+
<property name="add.timestamp" value="${env.ADD_TIMESTAMP_VERSION}"/>
10+
<tstamp>
11+
<format property="timestamp" pattern="yyMdHm"/>
12+
</tstamp>
513

614
<!-- Override these in ../topcoder_global.properties -->
715
<property name="javadoc.locale" value="en_US"/>
@@ -140,7 +148,7 @@
140148
<property name="temp_dist_ear" value="${build_distdir}/temp_dist_ear"/>
141149
<property name="ear_shared_libdir" value="${build_distdir}/lib"/>
142150

143-
<target name="ear" depends="war" description="create the ear tarball for direct application">
151+
<target name="ear" depends="war, add-timestamp-versioning" description="create the ear tarball for direct application">
144152
<!-- Copy the libraries -->
145153
<mkdir dir="${build_distdir}"/>
146154
<mkdir dir="${build_distdir}/lib"/>
@@ -469,6 +477,14 @@
469477
</fileset>
470478
</copy>
471479
</target>
480+
481+
<target name="timestamp-version-deploy-jsp" depends="update-timestamp-version-numbers-for-jsp">
482+
<copy todir="${jboss_deploy_dir}/direct.ear/direct.war" overwrite="true">
483+
<fileset dir="${build_distdir}/direct.war">
484+
<include name="**/*.jsp"/>
485+
</fileset>
486+
</copy>
487+
</target>
472488

473489
<target name="deploy-apache-static" if="is_vm" description="copies all static resources to Apache htdocs. Only used on a (unix) VM.">
474490
<mkdir dir="${apache_tcdocs}/images"/>
@@ -579,7 +595,7 @@
579595
<include name="jboss-cache/jgroups.jar" />
580596
</fileset>
581597
</copy>
582-
<copy todir="${jboss_deploy_dir}/${distfilename}.ear/${distfilename}.war/WEB-INF/includes" file="${tokenized_conf}/${jQ_1_11_1_jsp}"/>
598+
<copy todir="${jboss_deploy_dir}/${distfilename}.ear/${distfilename}.war/WEB-INF/includes" file="${tokenized_conf}/${jQ_1_11_1_jsp}" overwrite="true"/>
583599
</target>
584600

585601
<target name="first_deploy" depends="clean, deploy-jboss-files, deploy-static-files, deploy" description="setup the local clean jboss instance to run the direct application">
@@ -662,7 +678,7 @@
662678

663679
<unzip src="temp.war" dest="${component.war}"/>
664680
<delete file="temp.war"/>
665-
681+
666682
<if>
667683
<equals arg1="${version}" arg2="true"/>
668684
<then>
@@ -671,6 +687,25 @@
671687
</then>
672688
</if>
673689
</target>
690+
<!-- timestamp versioning target -->
691+
<target name="-check-add-ts-versioning-flag">
692+
<condition property="do-add-ts">
693+
<or>
694+
<not>
695+
<isset property="env.ADD_TIMESTAMP_VERSION"/>
696+
</not>
697+
<equals arg1="${add.timestamp}" arg2="true"/>
698+
</or>
699+
</condition>
700+
</target>
701+
702+
<target name="-do-ts-versioning" if="do-add-ts">
703+
<echo message="start adding timestamp version to the JSP files before war"/>
704+
<antcall target="timestamp-version-deploy-jsp"/>
705+
</target>
706+
707+
<target name="add-timestamp-versioning" depends="-check-add-ts-versioning-flag, -do-ts-versioning">
708+
</target>
674709

675710
<!-- ************************************************************************** -->
676711
<!-- ************ END DEPLOYMENT RELATED TARGETS *************************** -->
@@ -679,5 +714,4 @@
679714
<!-- Import the macro definitions used to override standard behaviour of
680715
some of the targets of this build file. -->
681716
<import file="${basedir}/build-override.xml" optional="true"/>
682-
683717
</project>

‎services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.topcoder.clientcockpit.phases.messagegenerators.DefaultEmailMessageGenerator;
2828
import com.topcoder.clients.dao.DAOException;
2929
import com.topcoder.clients.dao.ProjectDAO;
30+
import com.topcoder.clients.model.Client;
3031
import com.topcoder.clients.model.ProjectContestFee;
3132
import com.topcoder.configuration.ConfigurationObject;
3233
import com.topcoder.configuration.persistence.ConfigurationFileManager;
@@ -5953,7 +5954,11 @@ public SoftwareCompetition getSoftwareContestByProjectId(TCSubject tcSubject, lo
59535954

59545955
Boolean effortHoursEnabled = false;
59555956
try {
5956-
effortHoursEnabled = projectService.getClientByProject(fullProjectData.getProjectHeader().getTcDirectProjectId()).isEffortHoursEnabled();
5957+
Client client = projectService.getClientByProject(fullProjectData.getProjectHeader().getTcDirectProjectId());
5958+
if (client != null) {
5959+
effortHoursEnabled = client.isEffortHoursEnabled();
5960+
}
5961+
59575962
} catch (PersistenceFault e) {
59585963
effortHoursEnabled = false;
59595964
}

‎src/java/main/com/topcoder/direct/services/view/action/contest/launch/CommonAction.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44
package com.topcoder.direct.services.view.action.contest.launch;
55

6+
import com.topcoder.clients.model.Client;
67
import com.topcoder.clients.model.Project;
78
import com.topcoder.clients.model.ProjectContestFee;
89
import com.topcoder.clients.model.ProjectContestFeePercentage;
@@ -397,7 +398,13 @@ public String getBillingAccountsForProject() {
397398
billingAccount.put("name", billingAccountsByProject.get(i).getName());
398399
billingAccount.put("cca", String.valueOf(requireCCAs[i]));
399400
// Add enableEffortHours for each billing account
400-
billingAccount.put("enableEffortHours", billingAccountsByProject.get(i).getClient().isEffortHoursEnabled());
401+
Client client = billingAccountsByProject.get(i).getClient();
402+
if (client != null) {
403+
billingAccount.put("enableEffortHours", client.isEffortHoursEnabled());
404+
} else {
405+
billingAccount.put("enableEffortHours", false);
406+
}
407+
401408
result.add(billingAccount);
402409
}
403410
setResult(result);

‎src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetContestAction.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44
package com.topcoder.direct.services.view.action.contest.launch;
55

6+
import com.topcoder.clients.model.Client;
67
import com.topcoder.clients.model.Project;
78
import com.topcoder.direct.services.exception.DirectException;
89
import com.topcoder.direct.services.project.milestone.model.Milestone;
@@ -569,7 +570,12 @@ protected void executeAction() throws Exception {
569570
billingAccount.put("name", billingProjects.get(i).getName());
570571
billingAccount.put("cca", String.valueOf(requireCCAs[i]));
571572
// Add enableEffortHours for each billing account
572-
billingAccount.put("enableEffortHours", billingProjects.get(i).getClient().isEffortHoursEnabled());
573+
Client client = billingProjects.get(i).getClient();
574+
if (client != null) {
575+
billingAccount.put("enableEffortHours", client.isEffortHoursEnabled());
576+
} else {
577+
billingAccount.put("enableEffortHours", false);
578+
}
573579
billingAccountsForProject.add(billingAccount);
574580
}
575581

‎src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetGroupMemberAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public boolean evaluate(Object o) {
105105
private List<? extends Map<String,String>> getData() throws Exception {
106106
CacheClient cc = null;
107107
List<? extends Map<String,String>> data = null;
108-
SortedCacheAddress cacheAddress = new SortedCacheAddress("group_member", MaxAge.FIVE_MINUTES);
108+
SortedCacheAddress cacheAddress = new SortedCacheAddress("group_member", MaxAge.HOUR);
109109
cacheAddress.addAll(groupIds);
110110
try{
111111
cc = CacheClientFactory.create();
@@ -120,7 +120,7 @@ private List<? extends Map<String,String>> getData() throws Exception {
120120
Set<Long> groupMembers = getGroupMembers();
121121
data = DirectUtils.getUsersFromId(groupMembers.toArray(new Long[groupMembers.size()]));
122122
try{
123-
cc.set(cacheAddress, data, MaxAge.FIVE_MINUTES);
123+
cc.set(cacheAddress, data, MaxAge.HOUR);
124124
} catch (Exception e) {
125125
logger.error("Failed to put group member into cache ", e);
126126
}

‎src/web/WEB-INF/asset/project/batchEditAssets.jsp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -56,25 +56,25 @@
5656
<![endif]-->
5757

5858
<script type="text/javascript" src="/scripts/jquery-1.6.2.min.js"></script>
59-
<script type="text/javascript" src="/scripts/jquery-ui-1.7.2.custom.min.js?v=179771"></script>
60-
<script type="text/javascript" src="/scripts/thickbox-compressed.js?v=186145"></script>
61-
<script type="text/javascript" src="/scripts/jquery.tablesorter.min.js?v=176771"></script>
62-
<script type="text/javascript" src="/scripts/jquery.mousewheel.js?v=176771"></script>
63-
<script type="text/javascript" src="/scripts/jquery.em.js?v=176771"></script>
64-
<script type="text/javascript" src="/scripts/jScrollPane.js?v=176771"></script>
65-
<script type="text/javascript" src="/scripts/jquery.scrollfollow.js?v=179771"></script>
66-
<script type="text/javascript" src="/scripts/date.prev.js?v=179771"></script>
67-
<script type="text/javascript" src="/scripts/common.js?v=215290"></script>
68-
<script type="text/javascript" src="/scripts/jquery.datePicker.js?v=214829"></script>
69-
<script type="text/javascript" src="/scripts/jquery.blockUI.js?v=179771"></script>
70-
<script type="text/javascript" src="/scripts/ajaxupload2.js?v=209582"></script>
71-
<script type="text/javascript" src="/scripts/jquery.validate.js?v=179836"></script>
72-
<script type="text/javascript" src="/scripts/jquery.cookie.js?v=215325"></script>
73-
74-
<script type="text/javascript" src="/scripts/dashboard.js?v=215352"></script>
75-
<script type="text/javascript" src="/scripts/loadHelps.js?v=215005"></script>
76-
<script type="text/javascript" src="/scripts/modalWindows.js?v=211035"></script>
77-
<script type="text/javascript" src="/scripts/maintenance.js?v=2146111"></script>
59+
<script type="text/javascript" src="/scripts/jquery-ui-1.7.2.custom.min.js"></script>
60+
<script type="text/javascript" src="/scripts/thickbox-compressed.js"></script>
61+
<script type="text/javascript" src="/scripts/jquery.tablesorter.min.js"></script>
62+
<script type="text/javascript" src="/scripts/jquery.mousewheel.js"></script>
63+
<script type="text/javascript" src="/scripts/jquery.em.js"></script>
64+
<script type="text/javascript" src="/scripts/jScrollPane.js"></script>
65+
<script type="text/javascript" src="/scripts/jquery.scrollfollow.js"></script>
66+
<script type="text/javascript" src="/scripts/date.prev.js"></script>
67+
<script type="text/javascript" src="/scripts/common.js"></script>
68+
<script type="text/javascript" src="/scripts/jquery.datePicker.js"></script>
69+
<script type="text/javascript" src="/scripts/jquery.blockUI.js"></script>
70+
<script type="text/javascript" src="/scripts/ajaxupload2.js"></script>
71+
<script type="text/javascript" src="/scripts/jquery.validate.js"></script>
72+
<script type="text/javascript" src="/scripts/jquery.cookie.js"></script>
73+
74+
<script type="text/javascript" src="/scripts/dashboard.js"></script>
75+
<script type="text/javascript" src="/scripts/loadHelps.js"></script>
76+
<script type="text/javascript" src="/scripts/modalWindows.js"></script>
77+
<script type="text/javascript" src="/scripts/maintenance.js"></script>
7878
<script type="text/javascript" src="/scripts/instantSearch.js"></script>
7979

8080
<!-- Table Data -->

‎src/web/WEB-INF/asset/project/projectAssetUpload.jsp‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -33,31 +33,31 @@
3333

3434
<!-- External CSS -->
3535
<link rel="stylesheet" type="text/css" media="screen" href="/css/direct/customFont.css"/>
36-
<link rel="stylesheet" href="/css/direct/screen.css?v=214495" media="all" type="text/css" />
37-
<link rel="stylesheet" href="/css/direct/launchcontest.css?v=215011" media="all" type="text/css"/>
38-
<link rel="stylesheet" href="/css/direct/dashboard.css?v=215352" media="all" type="text/css" />
39-
<link rel="stylesheet" href="/css/direct/thickbox.css?v=192822" media="all" type="text/css" />
40-
<link rel="stylesheet" href="/css/direct/jScrollPane.css?v=176771" media="all" type="text/css"/>
41-
<link rel="stylesheet" href="/css/direct/jquery-ui-1.7.2.custom.css?v=206355" media="all" type="text/css"/>
42-
<link rel="stylesheet" href="/css/direct/modal.css?v=211772" media="all" type="text/css"/>
43-
<link rel="stylesheet" href="/css/direct/datepicker.css?v=211688" media="all" type="text/css"/>
36+
<link rel="stylesheet" href="/css/direct/screen.css" media="all" type="text/css" />
37+
<link rel="stylesheet" href="/css/direct/launchcontest.css" media="all" type="text/css"/>
38+
<link rel="stylesheet" href="/css/direct/dashboard.css" media="all" type="text/css" />
39+
<link rel="stylesheet" href="/css/direct/thickbox.css" media="all" type="text/css" />
40+
<link rel="stylesheet" href="/css/direct/jScrollPane.css" media="all" type="text/css"/>
41+
<link rel="stylesheet" href="/css/direct/jquery-ui-1.7.2.custom.css" media="all" type="text/css"/>
42+
<link rel="stylesheet" href="/css/direct/modal.css" media="all" type="text/css"/>
43+
<link rel="stylesheet" href="/css/direct/datepicker.css" media="all" type="text/css"/>
4444
<link rel="stylesheet" href="/css/direct/instantSearch.css" media="all" type="text/css" />
4545

4646
<!--[if IE 6]>
47-
<link rel="stylesheet" type="text/css" media="screen" href="/css/direct/dashboard-ie6.css?v=203928" />
48-
<link rel="stylesheet" type="text/css" media="screen" href="/css/direct/homepage-ie6.css?v=176771"/>
47+
<link rel="stylesheet" type="text/css" media="screen" href="/css/direct/dashboard-ie6.css" />
48+
<link rel="stylesheet" type="text/css" media="screen" href="/css/direct/homepage-ie6.css"/>
4949
<![endif]-->
5050

5151
<!--[if IE 7]>
52-
<link rel="stylesheet" type="text/css" media="screen" href="/css/direct/screen-ie7.css?v=215325"/>
52+
<link rel="stylesheet" type="text/css" media="screen" href="/css/direct/screen-ie7.css"/>
5353
<![endif]-->
5454

5555
<!--[if IE 8]>
56-
<link rel="stylesheet" type="text/css" media="screen" href="/css/direct/screen-ie8.css?v=203310"/>
56+
<link rel="stylesheet" type="text/css" media="screen" href="/css/direct/screen-ie8.css"/>
5757
<![endif]-->
5858

5959
<!--[if IE 9]>
60-
<link rel="stylesheet" type="text/css" media="screen" href="/css/direct/screen-ie9.css?v=203310"/>
60+
<link rel="stylesheet" type="text/css" media="screen" href="/css/direct/screen-ie9.css"/>
6161
<![endif]-->
6262

6363
<!-- External javascript -->
@@ -68,31 +68,31 @@
6868
</script>
6969

7070
<script type="text/javascript" src="/scripts/jquery-1.6.2.min.js"></script>
71-
<script type="text/javascript" src="/scripts/jquery-ui-1.7.2.custom.min.js?v=179771"></script>
72-
73-
<script type="text/javascript" src="/scripts/jquery.tablesorter.min.js?v=176771"></script>
74-
<script type="text/javascript" src="/scripts/thickbox-compressed.js?v=186145"></script>
75-
<script type="text/javascript" src="/scripts/jquery.mousewheel.js?v=176771"></script>
76-
<script type="text/javascript" src="/scripts/jquery.em.js?v=176771"></script>
77-
<script type="text/javascript" src="/scripts/jScrollPane.js?v=176771"></script>
78-
<script type="text/javascript" src="/scripts/jquery.bgiframe.js?v=207894"></script>
79-
<script type="text/javascript" src="/scripts/date.prev.js?v=179771"></script>
80-
<script type="text/javascript" src="/scripts/date.js?v=185881"></script>
81-
<script type="text/javascript" src="/scripts/common.js?v=215290"></script>
82-
<script type="text/javascript" src="/scripts/jquery.datePicker.js?v=214829"></script>
83-
<script type="text/javascript" src="/scripts/jquery.stylish-select.js?v=188719"></script>
84-
<script type="text/javascript" src="/scripts/jquery.scrollfollow.js?v=179771"></script>
85-
<script type="text/javascript" src="/scripts/jquery.blockUI.js?v=179771"></script>
86-
<script type="text/javascript" src="/scripts/ajaxupload2.js?v=209582"></script>
87-
<script type="text/javascript" src="/scripts/jquery.validate.js?v=179836"></script>
71+
<script type="text/javascript" src="/scripts/jquery-ui-1.7.2.custom.min.js"></script>
72+
73+
<script type="text/javascript" src="/scripts/jquery.tablesorter.min.js"></script>
74+
<script type="text/javascript" src="/scripts/thickbox-compressed.js"></script>
75+
<script type="text/javascript" src="/scripts/jquery.mousewheel.js"></script>
76+
<script type="text/javascript" src="/scripts/jquery.em.js"></script>
77+
<script type="text/javascript" src="/scripts/jScrollPane.js"></script>
78+
<script type="text/javascript" src="/scripts/jquery.bgiframe.js"></script>
79+
<script type="text/javascript" src="/scripts/date.prev.js"></script>
80+
<script type="text/javascript" src="/scripts/date.js"></script>
81+
<script type="text/javascript" src="/scripts/common.js"></script>
82+
<script type="text/javascript" src="/scripts/jquery.datePicker.js"></script>
83+
<script type="text/javascript" src="/scripts/jquery.stylish-select.js"></script>
84+
<script type="text/javascript" src="/scripts/jquery.scrollfollow.js"></script>
85+
<script type="text/javascript" src="/scripts/jquery.blockUI.js"></script>
86+
<script type="text/javascript" src="/scripts/ajaxupload2.js"></script>
87+
<script type="text/javascript" src="/scripts/jquery.validate.js"></script>
8888
<script type="text/javascript" src="/scripts/ckeditor/ckeditor/ckeditor.js"></script>
89-
<script type="text/javascript" src="/scripts/jquery.autocomplete.js?v=183826"></script>
90-
<script type="text/javascript" src="/scripts/jquery.hoverIntent.minified.js?v=215325"></script>
91-
<script type="text/javascript" src="/scripts/jquery.cookie.js?v=215325"></script>
89+
<script type="text/javascript" src="/scripts/jquery.autocomplete.js"></script>
90+
<script type="text/javascript" src="/scripts/jquery.hoverIntent.minified.js"></script>
91+
<script type="text/javascript" src="/scripts/jquery.cookie.js"></script>
9292

93-
<script type="text/javascript" src="/scripts/dashboard.js?v=215352"></script>
94-
<script type="text/javascript" src="/scripts/loadHelps.js?v=215005"></script>
95-
<script type="text/javascript" src="/scripts/maintenance.js?v=2146111"></script>
93+
<script type="text/javascript" src="/scripts/dashboard.js"></script>
94+
<script type="text/javascript" src="/scripts/loadHelps.js"></script>
95+
<script type="text/javascript" src="/scripts/maintenance.js"></script>
9696
<script type="text/javascript" src="/scripts/modalWindows.js"></script>
9797
<script type="text/javascript" src="/scripts/instantSearch.js"></script>
9898
<ui:projectPageType tab="assets"/>

0 commit comments

Comments
 (0)