/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 4125

Added by daigle over 16 years ago

Replace Options class with PropertyService

     import edu.ucsb.nceas.metacat.*;
     import edu.ucsb.nceas.metacat.service.PropertyService;
     import edu.ucsb.nceas.metacat.util.SystemUtil;
     import edu.ucsb.nceas.utilities.Options;
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
     import edu.ucsb.nceas.morpho.framework.*;
     import junit.framework.Test;
-...
     public class MetaCatServletNetTest extends TestCase {
     	private static String metacatURL;
     	static {
     		try {
     			metacatURL = SystemUtil.getServletURL();
     			Options.initialize(new File("build/tests/metacat.properties"));
     		try {
     			PropertyService.getInstance("build/tests");
     			metacatURL = PropertyService.getProperty("test.metacat.url");
     		} catch (PropertyNotFoundException pnfe) {
     			System.err.println("could not find metacat URL in MetacatServletNetTest: "
     					+ pnfe.getMessage());
-...
     		//insert invalid xml document
     		number = Math.random() * 100000;
     		serial = Integer.toString(((new Double(number)).intValue()));
     		suite
     				.addTest(new MetaCatServletNetTest("testInsertInvalidateXMLDocument",
     		suite.addTest(new MetaCatServletNetTest("testInsertInvalidateXMLDocument",
     						serial));
     		//insert non well formed document
     		number = Math.random() * 100000;

     package edu.ucsb.nceas.metacat.clientview;
     import edu.ucsb.nceas.utilities.Options;
     import java.io.ByteArrayOutputStream;
     import java.io.File;
     import junit.framework.*;
     import com.oreilly.servlet.multipart.MultipartParser;
     import edu.ucsb.nceas.metacat.client.MetacatClient;
     import java.io.InputStream;
     import java.util.HashMap;
     import java.util.Stack;
-...
     import org.w3c.dom.Document;
     import org.w3c.dom.Node;
     import edu.ucsb.nceas.metacat.client.MetacatClient;
     import edu.ucsb.nceas.metacat.service.PropertyService;
     /**
      * ClientViewHelper JUnit tests
      * @author barteau
-...
         ClientViewHelper            instance;
         ClientView                  clientViewBean;
         final static String         PATH_TO_PROPERTIES = "projects/metacat/build/war/WEB-INF/metacat.properties";
     //    final static String         PATH_TO_PROPERTIES = "projects/metacat/build/war/WEB-INF/metacat.properties";
         final static String         PATH_TO_PROPERTIES = "projects/metacat/build/war/WEB-INF";
         final static String         USR = "";
         final static String         ORG = "NCEAS";
         final static String         PWD = "";
-...
             if (DOWNLOAD_DATA_DOCID.equals(""))
                 fail("Please set the class property DOWNLOAD_DATA_DOCID before running this test.");
             Options.initialize(new File(PATH_TO_PROPERTIES));
             PropertyService.getInstance(PATH_TO_PROPERTIES);
             clientViewBean = new ClientView();
             clientViewBean.setUsername(USR);

     package edu.ucsb.nceas.metacat.harvesterClient;
     import com.oreilly.servlet.MailMessage;
     import edu.ucsb.nceas.utilities.Options;
     import java.io.File;
     import java.io.IOException;
     import java.io.PrintStream;
     import java.sql.Connection;
-...
     import edu.ucsb.nceas.metacat.client.Metacat;
     import edu.ucsb.nceas.metacat.client.MetacatFactory;
     import edu.ucsb.nceas.metacat.client.MetacatInaccessibleException;
     import edu.ucsb.nceas.metacat.service.PropertyService;
     import edu.ucsb.nceas.metacat.service.ServiceException;
     import edu.ucsb.nceas.metacat.util.SystemUtil;
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
     /**
      * Harvester is the main class for the Harvester application. The main
-...
        */
       private static final String CONFIG_DIR = "../../build/war/WEB-INF";
       private static final String CONFIG_DIR_TEST = "./build/war/WEB-INF";
       private static final String CONFIG_NAME = "metacat.properties";
     //  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;
     //  public static PropertyService propertyService = null;
       private static String schemaLocation = null;
-...
       /**
        * Loads Harvester options from a configuration file.
        */
       public static void loadOptions(boolean test) {
       public static void loadProperties(boolean test) {
         String configDir = test ? CONFIG_DIR_TEST : CONFIG_DIR;
         File propertyFile = new File(configDir, CONFIG_NAME);
         try {
           options = Options.initialize(propertyFile);
         	PropertyService.getInstance(configDir);
+        }
         catch (IOException e) {
           System.out.println("Error in loading options: " + e.getMessage());
         catch (ServiceException e) {
           System.out.println("Error in loading properties: " + e.getMessage());
+        }
+      }
       /**
         * Harvester main method.
+        *
         * @param args        the command line arguments
         * @throws SAXException
         * @throws IOException
         * @throws ParserConfigurationException
         */
       public static void main(String[] args) {
         Integer delayDefault = new Integer(0); // Default number of hours delay
         int delay = delayDefault.intValue();  // Delay in hours before first harvest
         Integer d;                            // Used for determining delay
         long delta;                           // endTime - startTime
         long endTime;                         // time that a harvest completes
         Harvester harvester;                  // object for a single harvest run
         Integer maxHarvestsDefault = new Integer(0);     // Default max harvests
         int maxHarvests = maxHarvestsDefault.intValue(); // Max number of harvests
         Integer mh;                              // used in determining max harvests
         int nHarvests = 0;                      // counts the number of harvest runs
         final long oneHour = (60 * 60 * 1000);   // milliseconds in one hour
         Integer periodDefault = new Integer(24); // Default hours between harvests
         int period = periodDefault.intValue();   // Hours between harvests
         Integer p;                               // Used in determining the period
         long startTime;                          // time that a harvest run starts
         boolean test = false;                    // Passed to loadOption()
         if (args.length > 0) {
           schemaLocation = args[0];
           System.err.println("schemaLocation: " + schemaLocation);
           try {
             Thread.sleep(10000);
+          }
           catch (InterruptedException e) {
             e.printStackTrace();
+          }
+        }
         /**
     	 * Harvester main method.
+    	 *
     	 * @param args
     	 *            the command line arguments
     	 * @throws SAXException
     	 * @throws IOException
     	 * @throws ParserConfigurationException
     	 */
     	public static void main(String[] args) {
     		Integer delayDefault = new Integer(0); // Default number of hours delay
     		int delay = delayDefault.intValue(); // Delay in hours before first
     												// harvest
     		Integer d; // Used for determining delay
     		long delta; // endTime - startTime
     		long endTime; // time that a harvest completes
     		Harvester harvester; // object for a single harvest run
     		Integer maxHarvestsDefault = new Integer(0); // Default max harvests
     		int maxHarvests = maxHarvestsDefault.intValue(); // Max number of
     															// harvests
     		Integer mh; // used in determining max harvests
     		int nHarvests = 0; // counts the number of harvest runs
     		final long oneHour = (60 * 60 * 1000); // milliseconds in one hour
     		Integer periodDefault = new Integer(24); // Default hours between
     													// harvests
     		int period = periodDefault.intValue(); // Hours between harvests
     		Integer p; // Used in determining the period
     		long startTime; // time that a harvest run starts
     		boolean test = false; // Passed to loadOption()
         System.out.println(marker);
         System.out.println("Starting Harvester");
         Harvester.loadOptions(test);
     		if (args.length > 0) {
     			schemaLocation = args[0];
     			System.err.println("schemaLocation: " + schemaLocation);
         // Parse the delay property. Use default if necessary.
         try {
           d = Integer.valueOf(options.getOption("delay"));
           delay = d.intValue();
+        }
         catch (NumberFormatException e) {
           System.out.println("NumberFormatException: Error parsing delay: " +
                              e.getMessage());
           System.out.println("Defaulting to delay=" + delayDefault);
           delay = delayDefault.intValue();
+        }
     			try {
     				Thread.sleep(10000);
     			} catch (InterruptedException e) {
     				e.printStackTrace();
+    			}
+    		}
         // Parse the maxHarvests property. Use default if necessary.
         try {
           mh = Integer.valueOf(options.getOption("maxHarvests"));
           maxHarvests = mh.intValue();
+        }
         catch (NumberFormatException e) {
           System.out.println("NumberFormatException: Error parsing maxHarvests: " +
                              e.getMessage());
           System.out.println("Defaulting to maxHarvests=" + maxHarvestsDefault);
           maxHarvests = maxHarvestsDefault.intValue();
+        }
     		System.out.println(marker);
     		System.out.println("Starting Harvester");
     		Harvester.loadProperties(test);
         // Parse the period property. Use default if necessary.
         try {
           p = Integer.valueOf(options.getOption("period"));
           period = p.intValue();
+        }
         catch (NumberFormatException e) {
           System.out.println("NumberFormatException: Error parsing period: " +
                              e.getMessage());
           System.out.println("Defaulting to period=" + periodDefault);
           period = periodDefault.intValue();
+        }
         // Sleep for delay number of hours prior to starting first harvest
         if (delay > 0) {
           try {
             System.out.print("First harvest will begin in " + delay);
             if (delay == 1) {
               System.out.println(" hour.");
+            }
             else {
               System.out.println(" hours.");
+            }
             Thread.sleep(delay * oneHour);
+          }
           catch (InterruptedException e) {
             System.err.println("InterruptedException: " + e.getMessage());
             System.exit(1);
+          }
+        }
     		// Parse the delay property. Use default if necessary.
     		try {
     			d = Integer.valueOf(PropertyService.getProperty("delay"));
     			delay = d.intValue();
     		} catch (NumberFormatException e) {
     			System.out.println("NumberFormatException: Error parsing delay: "
     					+ e.getMessage());
     			System.out.println("Defaulting to delay=" + delayDefault);
     			delay = delayDefault.intValue();
     		} catch (PropertyNotFoundException pnfe) {
     			System.out.println("PropertyNotFoundException: Error finding delay: "
     					+ pnfe.getMessage());
     			System.out.println("Defaulting to delay=" + delayDefault);
     			delay = delayDefault.intValue();
+    		}
     		// Parse the maxHarvests property. Use default if necessary.
     		try {
     			mh = Integer.valueOf(PropertyService.getProperty("maxHarvests"));
     			maxHarvests = mh.intValue();
     		} catch (NumberFormatException e) {
     			System.out.println("NumberFormatException: Error parsing maxHarvests: "
     					+ e.getMessage());
     			System.out.println("Defaulting to maxHarvests=" + maxHarvestsDefault);
     			maxHarvests = maxHarvestsDefault.intValue();
     		} catch (PropertyNotFoundException pnfe) {
     			System.out.println("PropertyNotFoundException: Error finding maxHarvests: "
     					+ pnfe.getMessage());
     			System.out.println("Defaulting to maxHarvests=" + maxHarvestsDefault);
     			maxHarvests = maxHarvestsDefault.intValue();
+    		}
     		// Parse the period property. Use default if necessary.
     		try {
     			p = Integer.valueOf(PropertyService.getProperty("period"));
     			period = p.intValue();
     		} catch (NumberFormatException e) {
     			System.out.println("NumberFormatException: Error parsing period: "
     					+ e.getMessage());
     			System.out.println("Defaulting to period=" + periodDefault);
     			period = periodDefault.intValue();
     		} catch (PropertyNotFoundException pnfe) {
     			System.out.println("PropertyNotFoundException: Error finding period: "
     					+ pnfe.getMessage());
     			System.out.println("Defaulting to period=" + periodDefault);
     			period = periodDefault.intValue();
+    		}
     		// Sleep for delay number of hours prior to starting first harvest
     		if (delay > 0) {
     			try {
     				System.out.print("First harvest will begin in " + delay);
     				if (delay == 1) {
     					System.out.println(" hour.");
     				} else {
     					System.out.println(" hours.");
+    				}
     				Thread.sleep(delay * oneHour);
     			} catch (InterruptedException e) {
     				System.err.println("InterruptedException: " + e.getMessage());
     				System.exit(1);
+    			}
+    		}
         // Repeat a new harvest once every period number of hours, until we reach
         // the maximum number of harvests, or indefinitely if maxHarvests <= 0.
         // Subtract delta from the time period so
         // Subtract delta from the time period so
         // that each harvest will start at a fixed interval.
         //
         while (keepRunning && ((nHarvests < maxHarvests) || (maxHarvests <= 0))) {
           nHarvests++;
           startTime = System.currentTimeMillis();
           harvester = new Harvester();                // New object for this harvest
           harvester = new Harvester();                // New object for this
     													// harvest
           harvester.startup(nHarvests, maxHarvests);  // Start up Harvester
           harvester.readHarvestSiteSchedule();        // Read the database table
           harvester.harvest();                        // Harvest the documents
-...
        */
       public Connection getConnection() {
         String dbDriver = "";
         String defaultDB;
         String password;
         String user;
         String defaultDB = null;
         String password = null;
         String user = null;
         SQLWarning warn;
         if (conn == null) {
           dbDriver = options.getOption("database.driver");
           defaultDB = options.getOption("database.connectionURI");
           password = options.getOption("database.password");
           user = options.getOption("database.user");
         	try {
     			dbDriver = PropertyService.getProperty("database.driver");
     			defaultDB = PropertyService.getProperty("database.connectionURI");
     			password = PropertyService.getProperty("database.password");
     			user = PropertyService.getProperty("database.user");
     		} catch (PropertyNotFoundException pnfe) {
     			System.out.println("Can't find property " + pnfe);
     	        System.exit(1);
+    		}
           // Load the jdbc driver
           try {
-...
+      }
       /**
        * Initializes Harvester at startup. Connects to the database and to Metacat.
+       *
        * @param nHarvests        the nth harvest
        * @param maxHarvests      the maximum number of harvests that this process
        *                         can run
        */
       private void startup(int nHarvests, int maxHarvests) {
         Boolean ctm;
         Integer lp;
         String metacatURL;
         Date now = new Date();
         timestamp = now.toString();
         System.out.println(Harvester.marker);
         System.out.print(timestamp + ": Starting Next Harvest");
         if (maxHarvests > 0) {
           System.out.print(" (" + nHarvests + "/" + maxHarvests + ")");
+        }
         System.out.print("\n");
         ctm = Boolean.valueOf(options.getOption("connectToMetacat"));
         connectToMetacat = ctm.booleanValue();
         harvesterAdministrator = options.getOption("harvesterAdministrator");
         smtpServer = options.getOption("smtpServer");
         /**
     	 * Initializes Harvester at startup. Connects to the database and to Metacat.
+    	 *
     	 * @param nHarvests        the nth harvest
     	 * @param maxHarvests      the maximum number of harvests that this process
     	 *                         can run
     	 */
     	private void startup(int nHarvests, int maxHarvests) {
     		Boolean ctm;
     		Integer lp;
     		String metacatURL;
     		Date now = new Date();
         try {
           lp = Integer.valueOf(options.getOption("logPeriod"));
           logPeriod = lp.intValue();
+        }
         catch (NumberFormatException e) {
           System.err.println("NumberFormatException: Error parsing logPeriod " +
                              logPeriod + e.getMessage());
           System.err.println("Defaulting to logPeriod of 90 days");
           logPeriod = 90;
+        }
     		timestamp = now.toString();
     		System.out.println(Harvester.marker);
     		System.out.print(timestamp + ": Starting Next Harvest");
     		if (maxHarvests > 0) {
     			System.out.print(" (" + nHarvests + "/" + maxHarvests + ")");
+    		}
     		System.out.print("\n");
     		try {
     			ctm = Boolean.valueOf(PropertyService.getProperty("connectToMetacat"));
     			connectToMetacat = ctm.booleanValue();
     			harvesterAdministrator = PropertyService
     					.getProperty("harvesterAdministrator");
     			smtpServer = PropertyService.getProperty("smtpServer");
         conn = getConnection();
         initLogIDs();
         setHarvestStartTime(now);
         // Log startup operation
         addLogEntry(0, "Starting Up Harvester", "HarvesterStartup", 0, null, "");
         if (connectToMetacat()) {
           try {
             metacatURL = SystemUtil.getServletURL();
             System.out.println("Connecting to Metacat: " + metacatURL);
             metacat = MetacatFactory.createMetacatConnection(metacatURL);
+          }
           catch (MetacatInaccessibleException e) {
             System.out.println("Metacat connection failed." + e.getMessage());
+          }
           catch (Exception e) {
             System.out.println("Metacat connection failed." + e.getMessage());
+          }
+        }
+      }
     			lp = Integer.valueOf(PropertyService.getProperty("logPeriod"));
     			logPeriod = lp.intValue();
     		} catch (NumberFormatException e) {
     			System.err.println("NumberFormatException: Error parsing logPeriod "
     					+ logPeriod + e.getMessage());
     			System.err.println("Defaulting to logPeriod of 90 days");
     			logPeriod = 90;
     		} catch (PropertyNotFoundException pnfe) {
     			System.out.println("PropertyNotFoundException: Error getting property: "
     					+ pnfe.getMessage());
     			return;
+    		}
     		conn = getConnection();
     		initLogIDs();
     		setHarvestStartTime(now);
     		// Log startup operation
     		addLogEntry(0, "Starting Up Harvester", "HarvesterStartup", 0, null, "");
     		if (connectToMetacat()) {
     			try {
     				metacatURL = SystemUtil.getServletURL();
     				System.out.println("Connecting to Metacat: " + metacatURL);
     				metacat = MetacatFactory.createMetacatConnection(metacatURL);
     			} catch (MetacatInaccessibleException e) {
     				System.out.println("Metacat connection failed." + e.getMessage());
     			} catch (Exception e) {
     				System.out.println("Metacat connection failed." + e.getMessage());
+    			}
+    		}
+    	}
+    }

     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.

     package edu.ucsb.nceas.metacat.harvesterClient;
     import edu.ucsb.nceas.utilities.Options;
     import java.io.PrintStream;
     import java.sql.Connection;
     import java.sql.ResultSet;
-...
     import java.util.Date;
     import java.util.StringTokenizer;
     import edu.ucsb.nceas.metacat.service.PropertyService;
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
     /**
      * Manages log entries to be inserted to the HARVEST_LOG table.
-...
       String getHarvestOperation(String fieldName, String harvestOperationCode) {
         String explanation = "No explanation available";
         String harvestOperationCodeLevel = "debug";
         Options options = Harvester.options;
         String propertyValue;
         String propertyValue = null;
         String returnString = "";
         StringTokenizer stringTokenizer;
         propertyValue = options.getOption(harvestOperationCode);
         stringTokenizer = new StringTokenizer(propertyValue, ",");
         try {
     		propertyValue = PropertyService.getProperty(harvestOperationCode);
     	} catch (PropertyNotFoundException pnfe) {
     		System.out.println("Error trying to get property: " + harvestOperationCode
     					+ " : " + pnfe.getMessage());
+    	}
     	stringTokenizer = new StringTokenizer(propertyValue, ",");
         explanation = (String) stringTokenizer.nextElement();
         harvestOperationCodeLevel = (String) stringTokenizer.nextElement();

     package edu.ucsb.nceas.metacat.harvesterClient;
     import com.oreilly.servlet.ParameterParser;
     import edu.ucsb.nceas.utilities.Options;
     import java.io.File;
     import java.io.InputStream;
     import java.io.IOException;
     import java.io.PrintWriter;
     import java.sql.Connection;
-...
     import java.text.ParseException;
     import java.text.SimpleDateFormat;
     import java.util.Date;
     import java.util.Enumeration;
     import javax.servlet.ServletConfig;
     import javax.servlet.ServletContext;
     import javax.servlet.ServletException;
-...
     import javax.servlet.http.HttpServletResponse;
     import javax.servlet.http.HttpSession;
     import edu.ucsb.nceas.metacat.service.PropertyService;
     import edu.ucsb.nceas.metacat.service.ServiceException;
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
     /**
      * HarvesterRegistration is a servlet that implements harvester registration.
      * The servlet reads parameters that were entered in a harvester registration
-...
        * Class fields
        */
       private static final String CONFIG_DIR = "WEB-INF";
       private static final String CONFIG_NAME = "metacat.properties";
       private static final long serialVersionUID = 7390084694699704362L;
       /*
        * Object fields
        */
-...
+      }
       /**
        * Initializes the servlet. Reads properties and initializes object fields.
+       *
        * @throws ServletException
        */
       public void init(ServletConfig config) throws ServletException {
         String database;
         String dbDriver = "";
         String dirPath;
         Options options = null;
         /**
     	 * Initializes the servlet. Reads properties and initializes object fields.
+    	 *
     	 * @throws ServletException
     	 */
     	public void init(ServletConfig config) throws ServletException {
     		String database;
     		String dbDriver = "";
     		String dirPath;
         super.init(config);
         this.config = config;
         this.context = config.getServletContext();
         dirPath = context.getRealPath(CONFIG_DIR);
         File propertyFile = new File(dirPath, CONFIG_NAME);
         try {
           options = Options.initialize(propertyFile);
+        }
         catch (IOException e) {
           System.out.println("Error in loading options: " + e.getMessage());
+        }
         dbDriver = options.getOption("database.driver");
         defaultDB = options.getOption("database.connectionURI");
         password = options.getOption("database.password");
         user = options.getOption("database.user");
     		super.init(config);
     		this.config = config;
     		this.context = config.getServletContext();
     		dirPath = context.getRealPath(CONFIG_DIR);
         // Load the jdbc driver
         try {
           Class.forName(dbDriver);
+        }
         catch (ClassNotFoundException e) {
           System.out.println("Can't load driver " + e);
+        }
+      }
     		try {
     			PropertyService.getInstance(dirPath);
     			dbDriver = PropertyService.getProperty("database.driver");
     			defaultDB = PropertyService.getProperty("database.connectionURI");
     			password = PropertyService.getProperty("database.password");
     			user = PropertyService.getProperty("database.user");
     		} catch (ServiceException se) {
     			System.out.println("Error initializing PropertyService: " + se.getMessage());
     		} catch (PropertyNotFoundException pnfe) {
     			System.out.println("Error reading property: " + pnfe.getMessage());
+    		}
     		// Load the jdbc driver
     		try {
     			Class.forName(dbDriver);
     		} catch (ClassNotFoundException e) {
     			System.out.println("Can't load driver " + e);
+    		}
+    	}
       /**
        * Surrounds a string with single quotes.
        * @param str  the original string
        * @return     the quoted string
        */
     	 * Surrounds a string with single quotes.
+    	 *
     	 * @param str
     	 *            the original string
     	 * @return the quoted string
     	 */
       private String quoteString(String str) {
         return "'" + str + "'";
+      }

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 4125

Added by daigle over 16 years ago