Revision 5027
Added by daigle almost 15 years ago
SystemUtil.java | ||
---|---|---|
34 | 34 |
|
35 | 35 |
import org.apache.log4j.Logger; |
36 | 36 |
|
37 |
import edu.ucsb.nceas.metacat.MetaCatVersion;
|
|
37 |
import edu.ucsb.nceas.metacat.MetacatVersion;
|
|
38 | 38 |
import edu.ucsb.nceas.metacat.service.PropertyService; |
39 | 39 |
import edu.ucsb.nceas.metacat.service.ServiceService; |
40 | 40 |
import edu.ucsb.nceas.metacat.shared.MetacatUtilException; |
... | ... | |
48 | 48 |
|
49 | 49 |
private static Logger logMetacat = Logger.getLogger(SystemUtil.class); |
50 | 50 |
private static String METACAT_SERVLET = "metacat"; |
51 |
private static String METACAT_WEB_SERVLET = "metacatweb"; |
|
51 | 52 |
private static int OS_CLASS = 0; |
52 | 53 |
|
53 | 54 |
// Class of OS. If we need more granularity, we should create a version |
... | ... | |
222 | 223 |
public static String getServletURL() throws PropertyNotFoundException { |
223 | 224 |
return getContextURL() + "/" + METACAT_SERVLET; |
224 | 225 |
} |
226 |
|
|
227 |
/** |
|
228 |
* Get the web front end servlet URL. This is made up of the server URL with |
|
229 |
* context + file separator + the metacat web servlet name |
|
230 |
* |
|
231 |
* @return string holding the web servlet URL |
|
232 |
*/ |
|
233 |
public static String getWebServletURL() throws PropertyNotFoundException { |
|
234 |
return getContextURL() + "/" + METACAT_WEB_SERVLET; |
|
235 |
} |
|
225 | 236 |
|
226 | 237 |
/** |
227 | 238 |
* Get the style skins URL. This is made up of the server URL with context + |
... | ... | |
251 | 262 |
* |
252 | 263 |
* @return a MetaCatVersion object holding metacat version information |
253 | 264 |
*/ |
254 |
public static MetaCatVersion getMetacatVersion() throws PropertyNotFoundException {
|
|
265 |
public static MetacatVersion getMetacatVersion() throws PropertyNotFoundException {
|
|
255 | 266 |
String metacatVersionString = |
256 | 267 |
PropertyService.getProperty("application.metacatVersion"); |
257 |
return new MetaCatVersion(metacatVersionString);
|
|
268 |
return new MetacatVersion(metacatVersionString);
|
|
258 | 269 |
} |
259 | 270 |
|
260 | 271 |
/** |
Also available in: Unified diff
Change MetaCatVersion to MetacatVersion