Revision 4132
Added by daigle almost 16 years ago
| MetaCatServlet.java | ||
|---|---|---|
| 79 | 79 |
import edu.ucsb.nceas.metacat.util.RequestUtil; |
| 80 | 80 |
import edu.ucsb.nceas.metacat.util.SessionData; |
| 81 | 81 |
import edu.ucsb.nceas.metacat.util.UtilException; |
| 82 |
import edu.ucsb.nceas.utilities.FileUtil; |
|
| 82 | 83 |
import edu.ucsb.nceas.utilities.GeneralPropertyException; |
| 83 | 84 |
import edu.ucsb.nceas.utilities.PropertyNotFoundException; |
| 84 | 85 |
|
| ... | ... | |
| 3072 | 3073 |
if (DocumentImpl.getDataFileLockGrant(docid)) |
| 3073 | 3074 |
{
|
| 3074 | 3075 |
// Save the data file to disk using "docid" as the name |
| 3075 |
String datafilepath = PropertyService.getProperty("datafilepath");
|
|
| 3076 |
String datafilepath = PropertyService.getProperty("application.datafilepath");
|
|
| 3076 | 3077 |
File dataDirectory = new File(datafilepath); |
| 3077 | 3078 |
dataDirectory.mkdirs(); |
| 3078 | 3079 |
File newFile = null; |
| ... | ... | |
| 3205 | 3206 |
//If document get lock data file grant |
| 3206 | 3207 |
if (DocumentImpl.getDataFileLockGrant(docid)) {
|
| 3207 | 3208 |
// Save the data file to disk using "docid" as the name |
| 3208 |
String datafilepath = PropertyService.getProperty("datafilepath");
|
|
| 3209 |
String datafilepath = PropertyService.getProperty("application.datafilepath");
|
|
| 3209 | 3210 |
File dataDirectory = new File(datafilepath); |
| 3210 | 3211 |
dataDirectory.mkdirs(); |
| 3211 | 3212 |
File newFile = null; |
| ... | ... | |
| 3683 | 3684 |
|
| 3684 | 3685 |
try {
|
| 3685 | 3686 |
directoryName = |
| 3686 |
PropertyService.getProperty("application.tomcatDir") + "/webapps/"
|
|
| 3687 |
+ PropertyService.getProperty("application.context") + "/sitemaps";
|
|
| 3687 |
PropertyService.getProperty("application.deployDir") + FileUtil.getFS()
|
|
| 3688 |
+ PropertyService.getProperty("application.context") + FileUtil.getFS() + "sitemaps";
|
|
| 3688 | 3689 |
skin = PropertyService.getProperty("application.default-style");
|
| 3689 | 3690 |
sitemapInterval = |
| 3690 | 3691 |
Integer.parseInt(PropertyService.getProperty("sitemapInterval"));
|
Also available in: Unified diff
Differentiate between tomcat directory and deployment directory.