Project

General

Profile

« Previous | Next » 

Revision 4619

Added by daigle over 15 years ago

Add release info property to provide a brief description of the release (release candidate info mostly)

View differences:

lib/metacat.properties
23 23

  
24 24
## one of the few places where we use ANT tokens
25 25
application.metacatVersion=@metacatVersion@
26
## This is autodiscovered and populated by the config utility
26
application.metacatReleaseInfo=@metacatReleaseInfo@
27 27

  
28 28
application.deployDir=
29 29
## This is autodiscovered and populated by the config utility
src/edu/ucsb/nceas/metacat/util/SystemUtil.java
206 206
	
207 207
	/**
208 208
	 * Get the metacat version by getting the string representation from
209
	 * metacat.properties and instantiating a MetaCatVersion object
209
	 * metacat.properties and instantiating a MetaCatVersion object.
210
	 * The info is set in build.properties and then populated into metacat.properties
211
	 * at build time using Ant token replacement.
210 212
	 * 
211 213
	 * @return a MetaCatVersion object holding metacat version information
212 214
	 */
......
215 217
			PropertyService.getProperty("application.metacatVersion");
216 218
		return new MetaCatVersion(metacatVersionString);
217 219
	}
220
	
221
	/**
222
	 * Gets a string that holds some description about the release. Typically this is 
223
	 * used during release candidates for display purposes and might hold something
224
	 * like "Release Candidate 1".  Normally it is empty for final production release.
225
	 * The info is set in build.properties and then populated into metacat.properties
226
	 * at build time using Ant token replacement.
227
	 * 
228
	 * @return a MetaCatVersion object holding metacat version information
229
	 */
230
	public static String getMetacatReleaseInfo() throws PropertyNotFoundException {
231
		return PropertyService.getProperty("application.metacatReleaseInfo");
232
	}
218 233

  
219 234
	/**
220 235
	 * Get the context directory. This is made up of the deployment directory + file
build.properties
1 1
# Ant build properties files for the metacat build
2 2

  
3
#Version of this build
3
#Version of this build.  This needs to be a dotted numeric version.  For
4
#instance 1.9.1 is okay.  1.9.1_rc1 is not.
4 5
metacat.version=1.9.0
5 6

  
7
#This is for display purposes.  leave it blank for final production release.
8
metacat.releaseInfo=Release Candidate 1
9

  
6 10
# Tomcat dev deployment directory
7 11
# build.tomcat.dir=/usr/local/tomcat
8 12
build.tomcat.dir=/usr/local/devtools/jakarta-tomcat
build.xml
141 141
      <filter token="adminname"            value="${adminname}"/>
142 142
      <filter token="recipient"            value="${recipient}"/>
143 143
   	  <filter token="metacatVersion"       value="${metacat.version}"/>
144
 	  <filter token="metacatReleaseInfo"       value="${metacat.releaseInfo}"/>
144 145

  
145 146
      <filter token="docrooturl"           value="./" />
146 147
      <filter token="mcuser"               value="${mcuser}"/>

Also available in: Unified diff