Project

General

Profile

« Previous | Next » 

Revision 4080

Added by daigle about 16 years ago

Merge 1.9 changes into Head

View differences:

UploadIPCCDataTest.java
29 29 
import edu.ucsb.nceas.metacat.*;
30 30 
import edu.ucsb.nceas.metacat.client.Metacat;
31 31 
import edu.ucsb.nceas.metacat.client.MetacatFactory;
32 
import edu.ucsb.nceas.metacat.service.PropertyService;
33 
import edu.ucsb.nceas.metacat.util.MetaCatUtil;
32 34 
import edu.ucsb.nceas.utilities.IOUtil;
33 35 
import edu.ucsb.nceas.utilities.Options;
34 36 
import edu.ucsb.nceas.utilities.XMLUtilities;
......
82 84 
		  {
83 85 
			  Options.initialize(new File("build/tests/metacat.properties"));
84 86 
			  MetaCatUtil.pathsForIndexing
85 
			         = MetaCatUtil.getOptionList(MetaCatUtil.getOption("indexPaths"));
87 
			         = MetaCatUtil.getOptionList(PropertyService.getProperty("indexPaths"));
86 88 
		  }
87 89 
		  catch(Exception e)
88 90 
		  {

Also available in: Unified diff