Project

General

Profile

« Previous | Next » 

Revision 4335

Added by daigle over 15 years ago

Move the DBAdaptor accessor into a DatabaseService class

View differences:

MetacatReplication.java
36 36
import javax.servlet.*;
37 37
import javax.servlet.http.*;
38 38

  
39
import edu.ucsb.nceas.dbadapter.AbstractDatabase;
39
import edu.ucsb.nceas.metacat.service.DatabaseService;
40 40
import edu.ucsb.nceas.metacat.service.PropertyService;
41 41
import edu.ucsb.nceas.metacat.service.SessionService;
42 42
import edu.ucsb.nceas.metacat.util.LDAPUtil;
43 43
import edu.ucsb.nceas.metacat.util.MetaCatUtil;
44 44
import edu.ucsb.nceas.metacat.util.SessionData;
45 45
import edu.ucsb.nceas.metacat.util.SystemUtil;
46
import edu.ucsb.nceas.utilities.FileUtil;
47 46
import edu.ucsb.nceas.utilities.GeneralPropertyException;
48 47
import edu.ucsb.nceas.utilities.PropertyNotFoundException;
49 48

  
......
52 51

  
53 52
public class MetacatReplication extends HttpServlet implements Runnable
54 53
{
54

  
55
  private static final long serialVersionUID = -2898600143193513155L;
55 56
  private long timeInterval;
56 57
  private Date firstTime;
57 58
  private boolean timedReplicationIsOn = false;
58 59
  Timer replicationDaemon;
59 60
  private Vector fileLocks = new Vector();
60 61
  private Thread lockThread = null;
61
  private static final AbstractDatabase dbAdapter = MetaCatUtil.dbAdapter;
62 62
  public static final String FORCEREPLICATEDELETE = "forcereplicatedelete";
63 63
  private static final String TIMEREPLICATION = "replication.timedreplication";
64 64
  private static final String TIMEREPLICATIONINTERVAl = "replication.timedreplicationinterval";
......
407 407
        pstmt = dbConn.prepareStatement("INSERT INTO xml_replication " +
408 408
                  "(server, last_checked, replicate, datareplicate, hub) " +
409 409
                                      "VALUES ('" + server + "', "+
410
                                      dbAdapter.toDate("01/01/1980", "MM/DD/YYYY")
410
                                      DatabaseService.getDBAdapter().toDate("01/01/1980", "MM/DD/YYYY")
411 411
                                      + ", '" +
412 412
                                      replicate +"', '" +dataReplicate+"', '"
413 413
                                      + hub +"')");
......
1213 1213

  
1214 1214
      // Get correct docid that reside on this server according the requesting
1215 1215
      // server's replicate and data replicate value in xml_replication table
1216
      docsql.append(dbAdapter.getReplicationDocumentListSQL());
1216
      docsql.append(DatabaseService.getDBAdapter().getReplicationDocumentListSQL());
1217 1217
      //docsql.append("select docid, rev, doctype from xml_documents where (docid not in (select a.docid from xml_documents a, xml_revisions b where a.docid=b.docid and a.rev<=b.rev)) ");
1218 1218
      revisionSql.append("select docid, rev, doctype from xml_revisions ");
1219 1219
      // If the localhost is not a hub to the remote server, only replicate

Also available in: Unified diff