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

Promote to prod #423

Merged
merged 18 commits into from
May 31, 2018
Merged

Promote to prod #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8c22e9c
increase max age for group members
skyhit May 17, 2018
8f8ffbd
- Remove static files versioning on jsp files
deedee May 18, 2018
4561f76
Merge pull request #416 from deedee/static_files_cache_busting
skyhit May 23, 2018
dad0c2e
Merge pull request #414 from skyhit/increase_cache_max_age_for_group_…
skyhit May 23, 2018
96b887b
Merge branch 'master' into dev
skyhit May 24, 2018
1a57376
fix null pointer exception
skyhit May 24, 2018
4301eb3
force override jq_1_11_1.jsp with the tokenized version
deedee May 24, 2018
ae46ee8
Merge pull request #418 from deedee/static_files_cache_busting
skyhit May 24, 2018
89bcfda
send info to segment
ajefts May 25, 2018
b111645
fixed segment identify
ajefts May 25, 2018
0e0065f
add ToolTip on estimate effort hours
deedee May 28, 2018
fd4fca1
Merge branch 'dev' of https://github.com/appirio-tech/direct-app into…
deedee May 28, 2018
8ec3762
add ToolTip on estimate effort hours on detail pages
deedee May 29, 2018
8ec0615
Merge pull request #417 from skyhit/fix_null_pointer_exception
ajefts May 29, 2018
a1e12e1
Merge pull request #420 from deedee/dev
ajefts May 29, 2018
4c99119
change effort hours estimate label
deedee May 31, 2018
0099fa0
Merge pull request #422 from deedee/dev
skyhit May 31, 2018
fe5f613
updated zendesk widget and segment includes
ajefts May 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion build-master-targets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,5 +580,14 @@
</path>
</foreach>
</target>


<target name="update-timestamp-version-numbers-for-jsp" description="update timestamp bersion number for javascript and css file">
<replaceregexp byline="true">
<regexp pattern='(href|src|default)="([^"]+)(\.js|\.css)'/>
<substitution expression='\1="\2\3?v=${timestamp}'/>
<fileset dir="${build_distdir}/direct.war">
<include name="**/*.jsp"/>
</fileset>
</replaceregexp>
</target>
</project>
42 changes: 38 additions & 4 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
<project name="TC Direct System Build" default="dist" basedir=".">
<property file="${basedir}/build.version"/>
<property file="topcoder_global.properties"/>
<!-- timestamp versioning, get flag from env var ADD_TIMESTAMP_VERSION
if ADD_TIMESTAMP_VERSION != true will disable it
-->
<property environment="env"/>
<property name="add.timestamp" value="${env.ADD_TIMESTAMP_VERSION}"/>
<tstamp>
<format property="timestamp" pattern="yyMdHm"/>
</tstamp>

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

<target name="ear" depends="war" description="create the ear tarball for direct application">
<target name="ear" depends="war, add-timestamp-versioning" description="create the ear tarball for direct application">
<!-- Copy the libraries -->
<mkdir dir="${build_distdir}"/>
<mkdir dir="${build_distdir}/lib"/>
Expand Down Expand Up @@ -469,6 +477,14 @@
</fileset>
</copy>
</target>

<target name="timestamp-version-deploy-jsp" depends="update-timestamp-version-numbers-for-jsp">
<copy todir="${jboss_deploy_dir}/direct.ear/direct.war" overwrite="true">
<fileset dir="${build_distdir}/direct.war">
<include name="**/*.jsp"/>
</fileset>
</copy>
</target>

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

<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">
Expand Down Expand Up @@ -662,7 +678,7 @@

<unzip src="temp.war" dest="${component.war}"/>
<delete file="temp.war"/>

<if>
<equals arg1="${version}" arg2="true"/>
<then>
Expand All @@ -671,6 +687,25 @@
</then>
</if>
</target>
<!-- timestamp versioning target -->
<target name="-check-add-ts-versioning-flag">
<condition property="do-add-ts">
<or>
<not>
<isset property="env.ADD_TIMESTAMP_VERSION"/>
</not>
<equals arg1="${add.timestamp}" arg2="true"/>
</or>
</condition>
</target>

<target name="-do-ts-versioning" if="do-add-ts">
<echo message="start adding timestamp version to the JSP files before war"/>
<antcall target="timestamp-version-deploy-jsp"/>
</target>

<target name="add-timestamp-versioning" depends="-check-add-ts-versioning-flag, -do-ts-versioning">
</target>

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

</project>
7 changes: 6 additions & 1 deletion ...acade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import com.topcoder.clientcockpit.phases.messagegenerators.DefaultEmailMessageGenerator;
import com.topcoder.clients.dao.DAOException;
import com.topcoder.clients.dao.ProjectDAO;
import com.topcoder.clients.model.Client;
import com.topcoder.clients.model.ProjectContestFee;
import com.topcoder.configuration.ConfigurationObject;
import com.topcoder.configuration.persistence.ConfigurationFileManager;
Expand Down Expand Up @@ -5953,7 +5954,11 @@ public SoftwareCompetition getSoftwareContestByProjectId(TCSubject tcSubject, lo

Boolean effortHoursEnabled = false;
try {
effortHoursEnabled = projectService.getClientByProject(fullProjectData.getProjectHeader().getTcDirectProjectId()).isEffortHoursEnabled();
Client client = projectService.getClientByProject(fullProjectData.getProjectHeader().getTcDirectProjectId());
if (client != null) {
effortHoursEnabled = client.isEffortHoursEnabled();
}

} catch (PersistenceFault e) {
effortHoursEnabled = false;
}
Expand Down
9 changes: 8 additions & 1 deletion src/java/main/com/topcoder/direct/services/view/action/contest/launch/CommonAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*/
package com.topcoder.direct.services.view.action.contest.launch;

import com.topcoder.clients.model.Client;
import com.topcoder.clients.model.Project;
import com.topcoder.clients.model.ProjectContestFee;
import com.topcoder.clients.model.ProjectContestFeePercentage;
Expand Down Expand Up @@ -397,7 +398,13 @@ public String getBillingAccountsForProject() {
billingAccount.put("name", billingAccountsByProject.get(i).getName());
billingAccount.put("cca", String.valueOf(requireCCAs[i]));
// Add enableEffortHours for each billing account
billingAccount.put("enableEffortHours", billingAccountsByProject.get(i).getClient().isEffortHoursEnabled());
Client client = billingAccountsByProject.get(i).getClient();
if (client != null) {
billingAccount.put("enableEffortHours", client.isEffortHoursEnabled());
} else {
billingAccount.put("enableEffortHours", false);
}

result.add(billingAccount);
}
setResult(result);
Expand Down
8 changes: 7 additions & 1 deletion src/java/main/com/topcoder/direct/services/view/action/contest/launch/GetContestAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*/
package com.topcoder.direct.services.view.action.contest.launch;

import com.topcoder.clients.model.Client;
import com.topcoder.clients.model.Project;
import com.topcoder.direct.services.exception.DirectException;
import com.topcoder.direct.services.project.milestone.model.Milestone;
Expand Down Expand Up @@ -569,7 +570,12 @@ protected void executeAction() throws Exception {
billingAccount.put("name", billingProjects.get(i).getName());
billingAccount.put("cca", String.valueOf(requireCCAs[i]));
// Add enableEffortHours for each billing account
billingAccount.put("enableEffortHours", billingProjects.get(i).getClient().isEffortHoursEnabled());
Client client = billingProjects.get(i).getClient();
if (client != null) {
billingAccount.put("enableEffortHours", client.isEffortHoursEnabled());
} else {
billingAccount.put("enableEffortHours", false);
}
billingAccountsForProject.add(billingAccount);
}

Expand Down
4 changes: 2 additions & 2 deletions ...va/main/com/topcoder/direct/services/view/action/contest/launch/GetGroupMemberAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public boolean evaluate(Object o) {
private List<? extends Map<String,String>> getData() throws Exception {
CacheClient cc = null;
List<? extends Map<String,String>> data = null;
SortedCacheAddress cacheAddress = new SortedCacheAddress("group_member", MaxAge.FIVE_MINUTES);
SortedCacheAddress cacheAddress = new SortedCacheAddress("group_member", MaxAge.HOUR);
cacheAddress.addAll(groupIds);
try{
cc = CacheClientFactory.create();
Expand All @@ -120,7 +120,7 @@ private List<? extends Map<String,String>> getData() throws Exception {
Set<Long> groupMembers = getGroupMembers();
data = DirectUtils.getUsersFromId(groupMembers.toArray(new Long[groupMembers.size()]));
try{
cc.set(cacheAddress, data, MaxAge.FIVE_MINUTES);
cc.set(cacheAddress, data, MaxAge.HOUR);
} catch (Exception e) {
logger.error("Failed to put group member into cache ", e);
}
Expand Down
38 changes: 19 additions & 19 deletions src/web/WEB-INF/asset/project/batchEditAssets.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,25 +56,25 @@
<![endif]-->

<script type="text/javascript" src="/scripts/jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="/scripts/jquery-ui-1.7.2.custom.min.js?v=179771"></script>
<script type="text/javascript" src="/scripts/thickbox-compressed.js?v=186145"></script>
<script type="text/javascript" src="/scripts/jquery.tablesorter.min.js?v=176771"></script>
<script type="text/javascript" src="/scripts/jquery.mousewheel.js?v=176771"></script>
<script type="text/javascript" src="/scripts/jquery.em.js?v=176771"></script>
<script type="text/javascript" src="/scripts/jScrollPane.js?v=176771"></script>
<script type="text/javascript" src="/scripts/jquery.scrollfollow.js?v=179771"></script>
<script type="text/javascript" src="/scripts/date.prev.js?v=179771"></script>
<script type="text/javascript" src="/scripts/common.js?v=215290"></script>
<script type="text/javascript" src="/scripts/jquery.datePicker.js?v=214829"></script>
<script type="text/javascript" src="/scripts/jquery.blockUI.js?v=179771"></script>
<script type="text/javascript" src="/scripts/ajaxupload2.js?v=209582"></script>
<script type="text/javascript" src="/scripts/jquery.validate.js?v=179836"></script>
<script type="text/javascript" src="/scripts/jquery.cookie.js?v=215325"></script>

<script type="text/javascript" src="/scripts/dashboard.js?v=215352"></script>
<script type="text/javascript" src="/scripts/loadHelps.js?v=215005"></script>
<script type="text/javascript" src="/scripts/modalWindows.js?v=211035"></script>
<script type="text/javascript" src="/scripts/maintenance.js?v=2146111"></script>
<script type="text/javascript" src="/scripts/jquery-ui-1.7.2.custom.min.js"></script>
<script type="text/javascript" src="/scripts/thickbox-compressed.js"></script>
<script type="text/javascript" src="/scripts/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="/scripts/jquery.mousewheel.js"></script>
<script type="text/javascript" src="/scripts/jquery.em.js"></script>
<script type="text/javascript" src="/scripts/jScrollPane.js"></script>
<script type="text/javascript" src="/scripts/jquery.scrollfollow.js"></script>
<script type="text/javascript" src="/scripts/date.prev.js"></script>
<script type="text/javascript" src="/scripts/common.js"></script>
<script type="text/javascript" src="/scripts/jquery.datePicker.js"></script>
<script type="text/javascript" src="/scripts/jquery.blockUI.js"></script>
<script type="text/javascript" src="/scripts/ajaxupload2.js"></script>
<script type="text/javascript" src="/scripts/jquery.validate.js"></script>
<script type="text/javascript" src="/scripts/jquery.cookie.js"></script>

<script type="text/javascript" src="/scripts/dashboard.js"></script>
<script type="text/javascript" src="/scripts/loadHelps.js"></script>
<script type="text/javascript" src="/scripts/modalWindows.js"></script>
<script type="text/javascript" src="/scripts/maintenance.js"></script>
<script type="text/javascript" src="/scripts/instantSearch.js"></script>

<!-- Table Data -->
Expand Down
72 changes: 36 additions & 36 deletions src/web/WEB-INF/asset/project/projectAssetUpload.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,31 +33,31 @@

<!-- External CSS -->
<link rel="stylesheet" type="text/css" media="screen" href="/css/direct/customFont.css"/>
<link rel="stylesheet" href="/css/direct/screen.css?v=214495" media="all" type="text/css" />
<link rel="stylesheet" href="/css/direct/launchcontest.css?v=215011" media="all" type="text/css"/>
<link rel="stylesheet" href="/css/direct/dashboard.css?v=215352" media="all" type="text/css" />
<link rel="stylesheet" href="/css/direct/thickbox.css?v=192822" media="all" type="text/css" />
<link rel="stylesheet" href="/css/direct/jScrollPane.css?v=176771" media="all" type="text/css"/>
<link rel="stylesheet" href="/css/direct/jquery-ui-1.7.2.custom.css?v=206355" media="all" type="text/css"/>
<link rel="stylesheet" href="/css/direct/modal.css?v=211772" media="all" type="text/css"/>
<link rel="stylesheet" href="/css/direct/datepicker.css?v=211688" media="all" type="text/css"/>
<link rel="stylesheet" href="/css/direct/screen.css" media="all" type="text/css" />
<link rel="stylesheet" href="/css/direct/launchcontest.css" media="all" type="text/css"/>
<link rel="stylesheet" href="/css/direct/dashboard.css" media="all" type="text/css" />
<link rel="stylesheet" href="/css/direct/thickbox.css" media="all" type="text/css" />
<link rel="stylesheet" href="/css/direct/jScrollPane.css" media="all" type="text/css"/>
<link rel="stylesheet" href="/css/direct/jquery-ui-1.7.2.custom.css" media="all" type="text/css"/>
<link rel="stylesheet" href="/css/direct/modal.css" media="all" type="text/css"/>
<link rel="stylesheet" href="/css/direct/datepicker.css" media="all" type="text/css"/>
<link rel="stylesheet" href="/css/direct/instantSearch.css" media="all" type="text/css" />

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

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

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

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

<!-- External javascript -->
Expand All @@ -68,31 +68,31 @@
</script>

<script type="text/javascript" src="/scripts/jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="/scripts/jquery-ui-1.7.2.custom.min.js?v=179771"></script>

<script type="text/javascript" src="/scripts/jquery.tablesorter.min.js?v=176771"></script>
<script type="text/javascript" src="/scripts/thickbox-compressed.js?v=186145"></script>
<script type="text/javascript" src="/scripts/jquery.mousewheel.js?v=176771"></script>
<script type="text/javascript" src="/scripts/jquery.em.js?v=176771"></script>
<script type="text/javascript" src="/scripts/jScrollPane.js?v=176771"></script>
<script type="text/javascript" src="/scripts/jquery.bgiframe.js?v=207894"></script>
<script type="text/javascript" src="/scripts/date.prev.js?v=179771"></script>
<script type="text/javascript" src="/scripts/date.js?v=185881"></script>
<script type="text/javascript" src="/scripts/common.js?v=215290"></script>
<script type="text/javascript" src="/scripts/jquery.datePicker.js?v=214829"></script>
<script type="text/javascript" src="/scripts/jquery.stylish-select.js?v=188719"></script>
<script type="text/javascript" src="/scripts/jquery.scrollfollow.js?v=179771"></script>
<script type="text/javascript" src="/scripts/jquery.blockUI.js?v=179771"></script>
<script type="text/javascript" src="/scripts/ajaxupload2.js?v=209582"></script>
<script type="text/javascript" src="/scripts/jquery.validate.js?v=179836"></script>
<script type="text/javascript" src="/scripts/jquery-ui-1.7.2.custom.min.js"></script>

<script type="text/javascript" src="/scripts/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="/scripts/thickbox-compressed.js"></script>
<script type="text/javascript" src="/scripts/jquery.mousewheel.js"></script>
<script type="text/javascript" src="/scripts/jquery.em.js"></script>
<script type="text/javascript" src="/scripts/jScrollPane.js"></script>
<script type="text/javascript" src="/scripts/jquery.bgiframe.js"></script>
<script type="text/javascript" src="/scripts/date.prev.js"></script>
<script type="text/javascript" src="/scripts/date.js"></script>
<script type="text/javascript" src="/scripts/common.js"></script>
<script type="text/javascript" src="/scripts/jquery.datePicker.js"></script>
<script type="text/javascript" src="/scripts/jquery.stylish-select.js"></script>
<script type="text/javascript" src="/scripts/jquery.scrollfollow.js"></script>
<script type="text/javascript" src="/scripts/jquery.blockUI.js"></script>
<script type="text/javascript" src="/scripts/ajaxupload2.js"></script>
<script type="text/javascript" src="/scripts/jquery.validate.js"></script>
<script type="text/javascript" src="/scripts/ckeditor/ckeditor/ckeditor.js"></script>
<script type="text/javascript" src="/scripts/jquery.autocomplete.js?v=183826"></script>
<script type="text/javascript" src="/scripts/jquery.hoverIntent.minified.js?v=215325"></script>
<script type="text/javascript" src="/scripts/jquery.cookie.js?v=215325"></script>
<script type="text/javascript" src="/scripts/jquery.autocomplete.js"></script>
<script type="text/javascript" src="/scripts/jquery.hoverIntent.minified.js"></script>
<script type="text/javascript" src="/scripts/jquery.cookie.js"></script>

<script type="text/javascript" src="/scripts/dashboard.js?v=215352"></script>
<script type="text/javascript" src="/scripts/loadHelps.js?v=215005"></script>
<script type="text/javascript" src="/scripts/maintenance.js?v=2146111"></script>
<script type="text/javascript" src="/scripts/dashboard.js"></script>
<script type="text/javascript" src="/scripts/loadHelps.js"></script>
<script type="text/javascript" src="/scripts/maintenance.js"></script>
<script type="text/javascript" src="/scripts/modalWindows.js"></script>
<script type="text/javascript" src="/scripts/instantSearch.js"></script>
<ui:projectPageType tab="assets"/>
Expand Down
Loading