Project

General

Profile

« Previous | Next » 

Revision 5035

Added by daigle almost 15 years ago

Change location of PropertyService to properties directory

View differences:

test/JDBCTest.java
30 30 
import java.sql.*;
31 31 
import edu.ucsb.nceas.metacat.*;
32 32 
import edu.ucsb.nceas.metacat.database.*;
33 
import edu.ucsb.nceas.metacat.service.PropertyService;
33 
import edu.ucsb.nceas.metacat.properties.PropertyService;
34 34 
import edu.ucsb.nceas.utilities.PropertyNotFoundException;
35 35 

  		




  36
  36
  
    
/**


  		












  

    
      test/edu/ucsb/nceas/metacatnettest/MetaCatServletNetTest.java
    
  





  28
  28
  
    

  		




  29
  29
  
    
import edu.ucsb.nceas.MCTestCase;


  		




  30
  30
  
    
import edu.ucsb.nceas.metacat.*;


  		




  31
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  31
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  32
  32
  
    
import edu.ucsb.nceas.utilities.PropertyNotFoundException;


  		




  33
  33
  
    

  		




  34
  34
  
    
import junit.framework.Test;


  		












  

    
      test/edu/ucsb/nceas/MCTestCase.java
    
  





  54
  54
  
    
import edu.ucsb.nceas.metacat.client.MetacatException;


  		




  55
  55
  
    
import edu.ucsb.nceas.metacat.client.MetacatFactory;


  		




  56
  56
  
    
import edu.ucsb.nceas.metacat.client.MetacatInaccessibleException;


  		




  57
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  57
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  58
  58
  
    
import edu.ucsb.nceas.metacat.shared.ServiceException;


  		




  59
  59
  
    
import edu.ucsb.nceas.metacat.util.RequestUtil;


  		




  60
  60
  
    
import edu.ucsb.nceas.utilities.IOUtil;


  		




  ......




  99
  99
  
    
				new SortedProperties("build/tests/test.properties");


  		




  100
  100
  
    
			testProperties.load();


  		




  101
  101
  
    
			String metacatContextDir = testProperties.getProperty("metacat.contextDir");


  		




  102
  
  
    
			PropertyService.getTestInstance(metacatContextDir + "/WEB-INF");


  		




  
  102
  
    
			PropertyService.getInstance(metacatContextDir + "/WEB-INF");


  		




  103
  103
  
    
//			PropertyService.getInstance();


  		




  104
  104
  
    
		    String printDebugString = PropertyService.getProperty("test.printdebug");


  		




  105
  105
  
    
		    printDebug = Boolean.parseBoolean(printDebugString);


  		












  

    
      test/edu/ucsb/nceas/metacat/clientview/ClientViewHelperTest.java
    
  





  23
  23
  
    
import org.w3c.dom.Node;


  		




  24
  24
  
    

  		




  25
  25
  
    
import edu.ucsb.nceas.metacat.client.MetacatClient;


  		




  26
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  26
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  27
  27
  
    

  		




  28
  28
  
    
/**


  		




  29
  29
  
    
 * ClientViewHelper JUnit tests


  		












  

    
      test/edu/ucsb/nceas/metacattest/OnlineDataAccessTest.java
    
  





  40
  40
  
    
import edu.ucsb.nceas.metacat.client.MetacatException;


  		




  41
  41
  
    
import edu.ucsb.nceas.metacat.client.MetacatFactory;


  		




  42
  42
  
    
import edu.ucsb.nceas.metacat.client.MetacatInaccessibleException;


  		




  43
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  43
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  44
  44
  
    
import edu.ucsb.nceas.utilities.IOUtil;


  		




  45
  45
  
    
import edu.ucsb.nceas.utilities.PropertyNotFoundException;


  		




  46
  46
  
    
import junit.framework.Test;


  		












  

    
      test/edu/ucsb/nceas/metacattest/PropertyServiceTest.java
    
  





  31
  31
  
    

  		




  32
  32
  
    
import edu.ucsb.nceas.MCTestCase;


  		




  33
  33
  
    

  		




  34
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  34
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  35
  35
  
    
import edu.ucsb.nceas.utilities.PropertyNotFoundException;


  		




  36
  36
  
    
import junit.framework.Test;


  		




  37
  37
  
    
import junit.framework.TestSuite;


  		












  

    
      test/edu/ucsb/nceas/metacattest/QuerySpecificationTest.java
    
  





  33
  33
  
    

  		




  34
  34
  
    
import edu.ucsb.nceas.MCTestCase;


  		




  35
  35
  
    
import edu.ucsb.nceas.metacat.QuerySpecification;


  		




  36
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  36
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  37
  37
  
    
import edu.ucsb.nceas.metacat.util.MetacatUtil;


  		




  38
  38
  
    
import edu.ucsb.nceas.utilities.PropertyNotFoundException;


  		




  39
  39
  
    

  		












  

    
      test/edu/ucsb/nceas/metacattest/SubTreeTest.java
    
  





  30
  30
  
    
import edu.ucsb.nceas.metacat.*;


  		




  31
  31
  
    
import edu.ucsb.nceas.metacat.database.*;


  		




  32
  32
  
    
import edu.ucsb.nceas.metacat.replication.*;


  		




  33
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  33
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  34
  34
  
    
import edu.ucsb.nceas.metacat.util.MetacatUtil;


  		




  35
  35
  
    

  		




  36
  36
  
    
import junit.framework.Test;


  		












  

    
      test/edu/ucsb/nceas/metacattest/QueryResultBuilderTest.java
    
  





  31
  31
  
    
import edu.ucsb.nceas.MCTestCase;


  		




  32
  32
  
    
import edu.ucsb.nceas.metacat.database.DBConnection;


  		




  33
  33
  
    
import edu.ucsb.nceas.metacat.database.DBConnectionPool;


  		




  34
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  34
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  35
  35
  
    

  		




  36
  36
  
    
import junit.framework.Test;


  		




  37
  37
  
    
import junit.framework.TestSuite;


  		












  

    
      test/edu/ucsb/nceas/metacattest/UploadIPCCDataTest.java
    
  





  30
  30
  
    
import edu.ucsb.nceas.metacat.client.Metacat;


  		




  31
  31
  
    
import edu.ucsb.nceas.metacat.client.MetacatFactory;


  		




  32
  32
  
    
import edu.ucsb.nceas.metacat.replication.*;


  		




  33
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  33
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  34
  34
  
    
import edu.ucsb.nceas.metacat.util.MetacatUtil;


  		




  35
  35
  
    
import edu.ucsb.nceas.utilities.IOUtil;


  		




  36
  36
  
    
import edu.ucsb.nceas.utilities.XMLUtilities;


  		












  

    
      test/edu/ucsb/nceas/metacattest/NonAsciiCharacterTest.java
    
  





  40
  40
  
    
import edu.ucsb.nceas.metacat.client.MetacatException;


  		




  41
  41
  
    
import edu.ucsb.nceas.metacat.client.MetacatFactory;


  		




  42
  42
  
    
import edu.ucsb.nceas.metacat.client.MetacatInaccessibleException;


  		




  43
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  43
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  44
  44
  
    
import edu.ucsb.nceas.utilities.IOUtil;


  		




  45
  45
  
    
import edu.ucsb.nceas.utilities.PropertyNotFoundException;


  		




  46
  46
  
    
import junit.framework.Test;


  		












  

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





  32
  32
  
    
import edu.ucsb.nceas.metacat.harvesterClient.HarvestDetailLog;


  		




  33
  33
  
    
import edu.ucsb.nceas.metacat.harvesterClient.HarvestDocument;


  		




  34
  34
  
    
import edu.ucsb.nceas.metacat.harvesterClient.HarvestSiteSchedule;


  		




  35
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  35
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  36
  36
  
    
import edu.ucsb.nceas.metacat.util.MetacatUtil;


  		




  37
  37
  
    

  		




  38
  38
  
    
import java.sql.Connection;


  		












  

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





  29
  29
  
    

  		




  30
  30
  
    
import edu.ucsb.nceas.MCTestCase;


  		




  31
  31
  
    
import edu.ucsb.nceas.metacat.harvesterClient.Harvester;


  		




  32
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  32
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  33
  33
  
    
import edu.ucsb.nceas.metacat.util.MetacatUtil;


  		




  34
  34
  
    
import edu.ucsb.nceas.utilities.PropertyNotFoundException;


  		




  35
  35
  
    

  		












  

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





  31
  31
  
    
import edu.ucsb.nceas.metacat.harvesterClient.HarvestDocument;


  		




  32
  32
  
    
import edu.ucsb.nceas.metacat.harvesterClient.HarvestSiteSchedule;


  		




  33
  33
  
    
import edu.ucsb.nceas.metacat.harvesterClient.Harvester;


  		




  34
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  34
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  35
  35
  
    
import edu.ucsb.nceas.metacat.util.MetacatUtil;


  		




  36
  36
  
    

  		




  37
  37
  
    
import java.io.StringReader;


  		












  

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





  35
  35
  
    
import edu.ucsb.nceas.metacat.harvesterClient.Harvester;


  		




  36
  36
  
    
import edu.ucsb.nceas.metacat.harvesterClient.HarvestDocument;


  		




  37
  37
  
    
import edu.ucsb.nceas.metacat.harvesterClient.HarvestLog;


  		




  38
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  38
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  39
  39
  
    
import edu.ucsb.nceas.metacat.util.MetacatUtil;


  		




  40
  40
  
    

  		




  41
  41
  
    
import junit.framework.Test;


  		












  

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





  30
  30
  
    
import edu.ucsb.nceas.MCTestCase;


  		




  31
  31
  
    
import edu.ucsb.nceas.metacat.harvesterClient.Harvester;


  		




  32
  32
  
    
import edu.ucsb.nceas.metacat.harvesterClient.HarvestSiteSchedule;


  		




  33
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  33
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  34
  34
  
    
import edu.ucsb.nceas.metacat.util.MetacatUtil;


  		




  35
  35
  
    

  		




  36
  36
  
    
import java.util.Date;


  		












  

    
      test/edu/ucsb/nceas/metacattest/QueryGroupTest.java
    
  





  29
  29
  
    
import edu.ucsb.nceas.MCTestCase;


  		




  30
  30
  
    
import edu.ucsb.nceas.metacat.QueryGroup;


  		




  31
  31
  
    
import edu.ucsb.nceas.metacat.QueryTerm;


  		




  32
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  32
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  33
  33
  
    
import edu.ucsb.nceas.metacat.util.MetacatUtil;


  		




  34
  34
  
    

  		




  35
  35
  
    
/**


  		












  

    
      test/edu/ucsb/nceas/metacattest/MetaCatServletTest.java
    
  





  27
  27
  
    
package edu.ucsb.nceas.metacattest;


  		




  28
  28
  
    

  		




  29
  29
  
    
import edu.ucsb.nceas.MCTestCase;


  		




  30
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  30
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  31
  31
  
    
import edu.ucsb.nceas.utilities.HttpMessage;


  		




  32
  32
  
    
import edu.ucsb.nceas.utilities.PropertyNotFoundException;


  		




  33
  33
  
    
import junit.framework.Test;


  		












  

    
      test/edu/ucsb/nceas/metacattest/VersionTest.java
    
  





  24
  24
  
    
package edu.ucsb.nceas.metacattest;


  		




  25
  25
  
    

  		




  26
  26
  
    
import edu.ucsb.nceas.MCTestCase;


  		




  27
  
  
    
import edu.ucsb.nceas.metacat.MetaCatVersion;


  		




  28
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  27
  
    
import edu.ucsb.nceas.metacat.MetacatVersion;


  		




  
  28
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  29
  29
  
    
import edu.ucsb.nceas.utilities.PropertyNotFoundException;


  		




  30
  30
  
    

  		




  31
  31
  
    

  		




  ......




  51
  51
  
    
    public void testGetVersion()


  		




  52
  52
  
    
    {


  		




  53
  53
  
    
    	try {


  		




  54
  
  
    
            assertTrue(PropertyService.getProperty("application.metacatVersion").equals(MetaCatVersion.getVersionID()));


  		




  55
  
  
    
            System.out.println(MetaCatVersion.getVersionID());


  		




  
  54
  
    
            assertTrue(PropertyService.getProperty("application.metacatVersion").equals(MetacatVersion.getVersionID()));


  		




  
  55
  
    
            System.out.println(MetacatVersion.getVersionID());


  		




  56
  56
  
    
    	} catch (PropertyNotFoundException pnfe) {


  		




  57
  57
  
    
    		fail ("Could not get metacat version property; " + pnfe.getMessage());


  		




  58
  58
  
    
    	}


  		




  ......




  65
  65
  
    
    public void testPrintVersionAsXml()


  		




  66
  66
  
    
    {


  		




  67
  67
  
    
    	try {


  		




  68
  
  
    
        System.out.println(MetaCatVersion.getVersionAsXml());


  		




  69
  
  
    
        assertTrue(MetaCatVersion.getVersionAsXml().indexOf(


  		




  
  68
  
    
        System.out.println(MetacatVersion.getVersionAsXml());


  		




  
  69
  
    
        assertTrue(MetacatVersion.getVersionAsXml().indexOf(


  		




  70
  70
  
    
                PropertyService.getProperty("application.metacatVersion")) != -1);


  		




  71
  71
  
    
    	} catch (PropertyNotFoundException pnfe) {


  		




  72
  72
  
    
    		fail ("Could not get metacat version property; " + pnfe.getMessage());


  		












  

    
      test/edu/ucsb/nceas/metacattest/BuildIndexTest.java
    
  





  44
  44
  
    
import edu.ucsb.nceas.metacat.client.MetacatFactory;


  		




  45
  45
  
    
import edu.ucsb.nceas.metacat.client.MetacatInaccessibleException;


  		




  46
  46
  
    
import edu.ucsb.nceas.metacat.database.DatabaseService;


  		




  47
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  47
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  48
  48
  
    
import edu.ucsb.nceas.metacat.shared.ServiceException;


  		




  49
  49
  
    
import edu.ucsb.nceas.metacat.util.MetacatUtil;


  		




  50
  50
  
    
import edu.ucsb.nceas.utilities.IOUtil;


  		












  

    
      test/edu/ucsb/nceas/metacattest/SchemaRegistryTest.java
    
  





  45
  45
  
    
import edu.ucsb.nceas.metacat.client.MetacatException;


  		




  46
  46
  
    
import edu.ucsb.nceas.metacat.client.MetacatFactory;


  		




  47
  47
  
    
import edu.ucsb.nceas.metacat.client.MetacatInaccessibleException;


  		




  48
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  48
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  49
  49
  
    
import edu.ucsb.nceas.utilities.FileUtil;


  		




  50
  50
  
    
import edu.ucsb.nceas.utilities.PropertyNotFoundException;


  		




  51
  51
  
    
import edu.ucsb.nceas.utilities.UtilException;


  		












  

    
      test/edu/ucsb/nceas/metacattest/InlineDataAccessTest.java
    
  





  40
  40
  
    
import edu.ucsb.nceas.metacat.client.MetacatException;


  		




  41
  41
  
    
import edu.ucsb.nceas.metacat.client.MetacatFactory;


  		




  42
  42
  
    
import edu.ucsb.nceas.metacat.client.MetacatInaccessibleException;


  		




  43
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  43
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  44
  44
  
    
import edu.ucsb.nceas.utilities.IOUtil;


  		




  45
  45
  
    
import edu.ucsb.nceas.utilities.PropertyNotFoundException;


  		




  46
  46
  
    
import junit.framework.Test;


  		












  

    
      test/edu/ucsb/nceas/metacattest/ReplicationServerListTest.java
    
  





  30
  30
  
    
import edu.ucsb.nceas.metacat.*;


  		




  31
  31
  
    
import edu.ucsb.nceas.metacat.database.*;


  		




  32
  32
  
    
import edu.ucsb.nceas.metacat.replication.*;


  		




  33
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  33
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  34
  34
  
    
import edu.ucsb.nceas.metacat.util.MetacatUtil;


  		




  35
  35
  
    
import junit.framework.Test;


  		




  36
  36
  
    
import junit.framework.TestSuite;


  		












  

    
      test/edu/ucsb/nceas/metacattest/client/MetacatClientTest.java
    
  





  46
  46
  
    
import edu.ucsb.nceas.metacat.client.MetacatException;


  		




  47
  47
  
    
import edu.ucsb.nceas.metacat.client.MetacatFactory;


  		




  48
  48
  
    
import edu.ucsb.nceas.metacat.client.MetacatInaccessibleException;


  		




  49
  
  
    
import edu.ucsb.nceas.metacat.service.PropertyService;


  		




  
  49
  
    
import edu.ucsb.nceas.metacat.properties.PropertyService;


  		




  50
  50
  
    
import edu.ucsb.nceas.utilities.FileUtil;


  		




  51
  51
  
    
import edu.ucsb.nceas.utilities.IOUtil;


  		




  52
  52
  
    
import edu.ucsb.nceas.utilities.PropertyNotFoundException;


  		












Also available in:  Unified diff