Add support for java log formats

etc/documentation/userguide/changeLog.html

@@ -17,6 +17,8 @@ <h2>Version 1.10.1 2016-04-07</h2>
 			ProductBuilder (which includes EIDSInputWedge) or CLIProductBuilder</li>
 		<li>Update moment tensor indexer module to use derived-magnitude-type
 			property.</li>
+		<li>Add support for java's "simple" and "xml" log formatters
+				(as an alternative to the default "pdl" formatter).</li>
 	</ul>
 
 	<h2>Version 1.10.0 2016-02-11</h2>

etc/documentation/userguide/configuration.html

@@ -172,6 +172,10 @@ <h3>Global Properties</h3>
 				the "logfile" property.</em>
 		</dd>
 
+		<dt>logformat</dt>
+		<dd>format for logs.
+			Possible values are "pdl" (default), "simple", and "xml".</dd>
+
 		<dt>loglevel</dt>
 		<dd>How verbose of logging. Default is INFO. Possible values are
 			SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST.</dd>
@@ -282,7 +286,7 @@ <h3 id="NotificationListener">NotificationListener</h3>
 		<dd>(Optional, Default false) Flag to indicate scenario products
 			should be accepted. Set to &ldquo;true&rdquo; or &ldquo;yes&rdquo; to
 			enable.</dd>
-			
+
 		<dt>includeActuals</dt>
 		<dd>(Optional, Default true) Flag to indicate actual products
 			should be accepted. Set to &ldquo;false&rdquo; or &ldquo;no&rdquo; to

src/gov/usgs/earthquake/distribution/Bootstrap.java

@@ -1,6 +1,6 @@
 /*
  * Bootstrap
- * 
+ *
  * $Id: Bootstrap.java 22520 2014-12-30 19:29:45Z jmfee $
  * $URL: https://ghttrac.cr.usgs.gov/websvn/ProductDistribution/trunk/src/gov/usgs/earthquake/distribution/Bootstrap.java $
  */
@@ -20,19 +20,22 @@
 import java.io.PrintStream;
 import java.text.SimpleDateFormat;
 import java.util.logging.ConsoleHandler;
+import java.util.logging.Formatter;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
+import java.util.logging.XMLFormatter;
 
 /**
  * Bootstrap is a class used to start an application.
- * 
+ *
  * It loads a configuration file, sets up initial logging, and starts a
  * configurable main method.
- * 
+ *
  * @author jmfee
- * 
+ *
  */
 public class Bootstrap {
 
@@ -60,6 +63,17 @@ public class Bootstrap {
 	/** Whether to test config only. */
 	public static final String CONFIG_TEST_ARGUMENT = "--configTest";
 
+	/** Property for log format. */
+	public static final String LOGFORMAT_PROPERTY_NAME = "logformat";
+	/** log format value for "pdl" format */
+	public static final String LOGFORMAT_PDL = "pdl";
+	/** log format value for java "simple" format */
+	public static final String LOGFORMAT_SIMPLE = "simple";
+	/** log format value for java "xml" format */
+	public static final String LOGFORMAT_XML = "xml";
+	/** Default log format is "simple". */
+	public static final String DEFAULT_LOGFORMAT = LOGFORMAT_PDL;
+
 	/** Property for log level. */
 	public static final String LOGLEVEL_PROPERTY_NAME = "loglevel";
 	/** Default log level is "INFO". */
@@ -107,7 +121,7 @@ public Bootstrap() {
 
 	/**
 	 * Read configuration from inside jar file, and configFile.
-	 * 
+	 *
 	 * @param configFile
 	 *            config file to load.
 	 * @throws IOException
@@ -183,7 +197,19 @@ public void setupLogging(final Config config) {
 			rootLogger.addHandler(handler);
 		}
 
-		SimpleLogFormatter formatter = new SimpleLogFormatter();
+		Formatter formatter;
+		String logFormat = config.getProperty(
+				LOGFORMAT_PROPERTY_NAME, DEFAULT_LOGFORMAT);
+		if (logFormat.equals(LOGFORMAT_SIMPLE)) {
+			// built in simple formatter
+			formatter = new SimpleFormatter();
+		} else if (logFormat.equals(LOGFORMAT_XML)) {
+			// built in xml formatter
+			formatter = new XMLFormatter();
+		} else {
+			// pdl style simple formatter
+			formatter = new SimpleLogFormatter();
+		}
 		for (Handler handler : rootLogger.getHandlers()) {
 			handler.setFormatter(formatter);
 		}