Project

General

Profile

« Previous | Next » 

Revision 2132

Replace Harvester dbDriver property with database property

View differences:

Harvester.java
779 779
   */
780 780
  private void startup(int nHarvests, int maxHarvests) {
781 781
    Boolean ctm;
782
    String dbDriver;
782
    String database;
783
    String dbDriver = "";
783 784
		String defaultDB;
784 785
    Integer lp;
785 786
    String metacatURL;
......
802 803
    properties = Harvester.properties;
803 804
    ctm = Boolean.valueOf(properties.getProperty("connectToMetacat", "true"));
804 805
    connectToMetacat = ctm.booleanValue();
805
    dbDriver = properties.getProperty("dbDriver");
806
    database = properties.getProperty("database");
807
    
808
    if (database.equalsIgnoreCase("oracle")) {
809
      dbDriver = "oracle.jdbc.driver.OracleDriver";
810
    }
811
    else if (database.equalsIgnoreCase("postgresql")) {
812
      dbDriver = "org.postgresql.Driver";
813
    }
814
    else if (database.equalsIgnoreCase("sqlserver")) {
815
      dbDriver = "com.microsoft.jdbc.sqlserver.SQLServerDriver";
816
    }
817

  
806 818
    harvesterAdministrator = properties.getProperty("harvesterAdministrator");
807 819

  
808 820
    try {

Also available in: Unified diff