Project

General

Profile

« Previous | Next » 

Revision 4139

Added by daigle over 16 years ago

Use SystemUtil.getContextDir() instead of constructing directory path.

View differences:

src/edu/ucsb/nceas/metacat/MetacatReplication.java
542 542
			IOException, MalformedURLException, PropertyNotFoundException {
543 543
		
544 544
		// the path to be uploaded to
545
		String certPath = PropertyService.getProperty("application.deployDir")
546
				+ FileUtil.getFS() + PropertyService.getProperty("application.context"); 
545
		String certPath = SystemUtil.getContextDir(); 
547 546

  
548 547
		// get filename from the URL of the certificate
549 548
		String filename = certURL;
src/edu/ucsb/nceas/metacat/MetaCatServlet.java
77 77
import edu.ucsb.nceas.metacat.util.LDAPUtil;
78 78
import edu.ucsb.nceas.metacat.util.MetaCatUtil;
79 79
import edu.ucsb.nceas.metacat.util.RequestUtil;
80
import edu.ucsb.nceas.metacat.util.SystemUtil;
80 81
import edu.ucsb.nceas.metacat.util.SessionData;
81 82
import edu.ucsb.nceas.metacat.util.UtilException;
82 83
import edu.ucsb.nceas.utilities.FileUtil;
......
3683 3684
        	long sitemapInterval = 0;
3684 3685
        	
3685 3686
        	try {
3686
				directoryName = 
3687
					PropertyService.getProperty("application.deployDir") + FileUtil.getFS()
3688
					+ PropertyService.getProperty("application.context") + FileUtil.getFS() + "sitemaps";
3687
				directoryName = SystemUtil.getContextDir() + FileUtil.getFS() + "sitemaps";
3689 3688
				skin = PropertyService.getProperty("application.default-style");
3690 3689
				sitemapInterval = 
3691 3690
					Integer.parseInt(PropertyService.getProperty("sitemapInterval"));

Also available in: Unified diff