Project

General

Profile

« Previous | Next » 

Revision 4080

Added by daigle about 16 years ago

Merge 1.9 changes into Head

View differences:

AbstractDatabase.java
29 29
package edu.ucsb.nceas.dbadapter;
30 30

  
31 31
import java.sql.*;
32
import edu.ucsb.nceas.metacat.MetaCatUtil;
33 32

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

  
34 35
/**
35 36
 * Java offers uniform database access through the use of JDBC.
36 37
 * But many databases still use different SQL implementations and 
......
136 137
    // Determine our db adapter class and
137 138
    // create an instance of that class
138 139
    try {
139
      String dbAdapter = MetaCatUtil.getOption("dbAdapter");
140
      String dbAdapter = PropertyService.getProperty("database.adapter");
140 141
      AbstractDatabase dbAdapterObj = (AbstractDatabase)createObject(dbAdapter);
141 142
      
142 143
      // test if they work correctly

Also available in: Unified diff