Project

General

Profile

« Previous | Next » 

Revision 5835

Added by ben leinfelder over 13 years ago

use local shape files if the Geoserver env variable is not set. They might also be the same

View differences:

src/edu/ucsb/nceas/metacat/spatial/SpatialFeatureSchema.java
44 44
45 45 
			String geoserverDataDir = System.getProperty("GEOSERVER_DATA_DIR");
46 46 
			if (geoserverDataDir != null) {
47 
				// use configured resource (might be same as local)
47 48 
				polygonShpUri = geoserverDataDir + "/data/metacat_shps/data_bounds.shp";
48 49 
				pointShpUri = geoserverDataDir + "/data/metacat_shps/data_points.shp";
49 50 
			} else {
51 
				// use local resource
50 52 
				String certPath = SystemUtil.getContextDir();
51 
				polygonShpUri = certPath + "/data/metacat_shps/data_bounds.shp";
52 
				pointShpUri = certPath + "/data/metacat_shps/data_points.shp";
53 
				polygonShpUri = certPath + "/spatial/geoserver/data/data/metacat_shps/data_bounds.shp";
54 
				pointShpUri = certPath + "/spatial/geoserver/data/data/metacat_shps/data_points.shp";
53 55 
			}
54 56
55 57 
		} catch (PropertyNotFoundException pnfe) {

Also available in: Unified diff