Project

General

Profile

« Previous | Next » 

Revision 2114

Rename url property to defaultDB

View differences:

Harvester.java
780 780
  private void startup(int nHarvests, int maxHarvests) {
781 781
    Boolean ctm;
782 782
    String dbDriver;
783
		String defaultDB;
783 784
    Integer lp;
784 785
    String metacatURL;
785 786
    Date now;
......
787 788
    Properties properties;
788 789
    //String response;
789 790
    String sessionId;
790
		String url;
791 791
    String user;
792 792
    String userName = System.getProperty("user.name");
793 793
    SQLWarning warn;
......
816 816
      logPeriod = 90;
817 817
    }
818 818

  
819
    defaultDB = properties.getProperty("defaultDB");
819 820
    metacatURL = properties.getProperty("metacatURL");
820 821
    password = properties.getProperty("password");
821 822
    smtpServer = properties.getProperty("smtpServer", "localhost");
822
    url = properties.getProperty("url");
823 823
    user = properties.getProperty("user");
824 824

  
825 825
    // Load the jdbc driver
......
834 834
    // Make the database connection
835 835
    try {
836 836
      System.out.println("Getting connection to Harvester tables");
837
      conn = DriverManager.getConnection(url, user, password);
837
      conn = DriverManager.getConnection(defaultDB, user, password);
838 838

  
839 839
      // If a SQLWarning object is available, print its warning(s).
840 840
      // There may be multiple warnings chained.

Also available in: Unified diff