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

Commit 7001335

Browse files
deedeedeedee
committed
- Remove static files versioning on jsp files
- timestamp versioning while deploying for static files (js/css)
1 parent 5371a4b commit 7001335

File tree

74 files changed

+656
-613
lines changed

Some content is hidden

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

74 files changed

+656
-613
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: 37 additions & 3 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"/>
@@ -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>

‎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"/>

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,25 +53,25 @@
5353
<![endif]-->
5454

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

7777
<!-- Table Data -->

0 commit comments

Comments
 (0)