/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 2995

Added by Duane Costa over 18 years ago

Two changes to Metacat Harvester implementation:

(1) Removed call to deprecated Thread.stop() method. Added boolean class variable, Harvester.keepRunning. When the thread is destroyed, set Harvester.keepRunning to false.

(2) Access the harvestList.xsd schema file by finding it locally in the web application rather than via a URL to cvs.ecoinformatics.org.

       private static final String CONFIG_DIR_TEST = "./build/war/WEB-INF";
       private static final String CONFIG_NAME = "metacat.properties";
       public static final String filler = "*";
       private static boolean keepRunning = true;
       public static final String marker =
     "*****************************************************************************";
       public static Options options = null;
-...
         if (args.length > 0) {
           schemaLocation = args[0];
           System.err.println("schemaLocation: " + schemaLocation);
           try {
             Thread.sleep(10000);
+          }
           catch (InterruptedException e) {
             e.printStackTrace();
+          }
+        }
         System.out.println(marker);
-...
         // Subtract delta from the time period so
         // that each harvest will start at a fixed interval.
         //
         while ((nHarvests < maxHarvests) || (maxHarvests <= 0)) {
         while (keepRunning && ((nHarvests < maxHarvests) || (maxHarvests <= 0))) {
           nHarvests++;
           startTime = System.currentTimeMillis();
           harvester = new Harvester();                // New object for this harvest
-...
+          }
+        }
+      }
       /**
        * Set the keepRunning flag. If set to false, the main program will end
        * the while loop that keeps harvester running every period number of hours.
        * The static method is intended to be called from the HarvesterServlet class
        * which creates a thread to run Harvester. When the thread is destroyed, the
        * thread's destroy() method calls Harvester.setKeepRunning(false).
+       *
        * @param keepRunning
        */
       static void setKeepRunning(boolean keepRunning) {
         Harvester.keepRunning = keepRunning;
+      }
       /*
        * Object fields
        */

     package edu.ucsb.nceas.metacat.harvesterClient;
     import java.io.File;
     import java.io.IOException;
     import javax.servlet.*;
     import javax.servlet.http.*;
     import edu.ucsb.nceas.utilities.Options;
     /**
      * HarvesterServlet class allows Harvester to be run as a background
      * process. This eliminates the need to run Harvester in a terminal window.
-...
      */
     public class HarvesterServlet extends HttpServlet implements Runnable {
       /*
        * Class fields
        */
       private static final String SCHEMA_DIR = "harvester";
       private static String SCHEMA_LOCATION;
       private static final String SCHEMA_NAME = "harvestList.xsd";
       static final long serialVersionUID = 0;  // Needed for Eclipse warning.
       /*
        * Object fields
        */
       Thread harvesterThread;                // background Harvester thread
       /**
        * Initializes the servlet by starting a separate thread in which to
        * run the Harvester main program.
        * When the thread is destroyed, sets the Harvester.keepRunning flag to false.
        */
       public void init() throws ServletException {
       public void destroy() {
         Harvester.setKeepRunning(false);
+      }
       /**
        * Initializes the servlet. Reads properties and initializes object fields.
+       *
        * @throws ServletException
        */
       public void init(ServletConfig config) throws ServletException {
         ServletContext context = null;
         String fileSeparator = System.getProperty("file.separator");
         String schemaPath;
         super.init(config);
         context = config.getServletContext();
         schemaPath = context.getRealPath(SCHEMA_DIR) + fileSeparator + SCHEMA_NAME;
         SCHEMA_LOCATION = "eml://ecoinformatics.org/harvestList " + schemaPath;
         harvesterThread = new Thread(this);
         harvesterThread.setPriority(Thread.MIN_PRIORITY);  // be a good citizen
         harvesterThread.start();
+      }
       /**
        * Runs the Harvester main program in a separate thread. First sleeps for
        * 30 seconds to give Metacat a chance to fully initialize.
        */
       public void run() {
           String[] args = new String[1];
           String schemaLocation = "eml://ecoinformatics.org/harvestList " +
            "http://cvs.ecoinformatics.org/cvs/cvsweb.cgi/~checkout~" +
            "/metacat/lib/harvester/harvestList.xsd?rev=1.1&content-type=text" +
            "/plain&only_with_tag=HEAD";
           args[0] = schemaLocation;
           args[0] = SCHEMA_LOCATION;
           try {
             Thread.sleep(30000);    // Sleep 30 seconds before starting Harvester
-...
           Harvester.main(args);
+      }
       /**
        * Stops the Harvester thread when the servlet shuts down.
        */
       public void destroy() {
         harvesterThread.stop();
+      }
+    }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 2995

Added by Duane Costa over 18 years ago