Project

General

Profile

« Previous | Next » 

Revision 8099

Added by ben leinfelder over 11 years ago

use shared metacatContextDir variable for calls to Harvester.loadProperties(metacatContextDir);

View differences:

test/edu/ucsb/nceas/MCTestCase.java
95 95 
	protected static String anotheruser;
96 96 
	protected static String anotherpassword;
97 97
98 
	protected static String metacatContextDir;
99
98 100 
	static {
99 101 
		try {
100 102 
			SortedProperties testProperties =
101 103 
				new SortedProperties("build/tests/test.properties");
102 104 
			testProperties.load();
103 
			String metacatContextDir = testProperties.getProperty("metacat.contextDir");
105 
			metacatContextDir = testProperties.getProperty("metacat.contextDir");
104 106 
			PropertyService.getInstance(metacatContextDir + "/WEB-INF");
105 107 
//			PropertyService.getInstance();
106 108 
		    String printDebugString = PropertyService.getProperty("test.printdebug");
test/edu/ucsb/nceas/metacattest/harvesterClient/HarvestDetailLogTest.java
102 102 
    int updateFrequency = 1;
103 103
104 104 
    harvester = new Harvester();
105 
    Harvester.loadProperties(commandLineMode, test);
105 
    Harvester.loadProperties(metacatContextDir);
106 106 
    conn = harvester.getConnection();  // initializes the database connection
107 107 
    harvester.initLogIDs();
108 108 
    harvestLogID = harvester.getHarvestLogID();
test/edu/ucsb/nceas/metacattest/harvesterClient/HarvesterTest.java
111 111 
		String ctm = null;
112 112 
		boolean test = true;
113 113 

  		




  114
  
  
    
		Harvester.loadProperties(commandLineMode, test);


  		




  
  114
  
    
		Harvester.loadProperties(metacatContextDir);


  		




  115
  115
  
    
		try {


  		




  116
  116
  
    
			ctm = PropertyService.getProperty("harvester.connectToMetacat");


  		




  117
  117
  
    
		} catch (PropertyNotFoundException pnfe) {


  		












  

    
      test/edu/ucsb/nceas/metacattest/harvesterClient/HarvestDocumentTest.java
    
  





  104
  104
  
    
    int updateFrequency = 1;


  		




  105
  105
  
    

  		




  106
  106
  
    
    harvester = new Harvester();


  		




  107
  
  
    
    Harvester.loadProperties(commandLineMode, test);


  		




  
  107
  
    
    Harvester.loadProperties(metacatContextDir);


  		




  108
  108
  
    
    harvester.getConnection();  // initializes the database connection


  		




  109
  109
  
    
    harvester.initLogIDs();


  		




  110
  110
  
    
    harvester.setHarvestStartTime(new Date());


  		












  

    
      test/edu/ucsb/nceas/metacattest/harvesterClient/HarvestLogTest.java
    
  





  111
  111
  
    
    int updateFrequency = 1;


  		




  112
  112
  
    

  		




  113
  113
  
    
    harvester = new Harvester();


  		




  114
  
  
    
    Harvester.loadProperties(commandLineMode, test);


  		




  
  114
  
    
    Harvester.loadProperties(metacatContextDir);


  		




  115
  115
  
    
    conn = harvester.getConnection();  // initializes the database connection


  		




  116
  116
  
    
    harvester.initLogIDs();


  		




  117
  117
  
    
    harvestLogID = harvester.getHarvestLogID();


  		












  

    
      test/edu/ucsb/nceas/metacattest/harvesterClient/HarvestSiteScheduleTest.java
    
  





  95
  95
  
    
    int updateFrequency = 1;


  		




  96
  96
  
    

  		




  97
  97
  
    
    harvester = new Harvester();


  		




  98
  
  
    
    Harvester.loadProperties(commandLineMode, test);


  		




  
  98
  
    
    Harvester.loadProperties(metacatContextDir);


  		




  99
  99
  
    
    harvester.getConnection();  // initializes the database connection


  		




  100
  100
  
    
    harvester.initLogIDs();


  		




  101
  101
  
    
    harvester.setHarvestStartTime(new Date());


  		












Also available in:  Unified diff